From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/resources/application.yml |   49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 66da24d..1176469 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
 
 spring:
   datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
+#    driver-class-name: com.mysql.cj.jdbc.Driver
     #driver-class-name: org.postgresql.Driver
     #driver-class-name: oracle.jdbc.OracleDriver
     #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -25,8 +25,8 @@
       # Oracle校验
       #validation-query: select 1 from dual
       validation-query-timeout: 2000
-      initial-size: 5
-      max-active: 20
+      initial-size: 20
+      max-active: 100
       min-idle: 5
       max-wait: 60000
       test-on-borrow: false
@@ -44,6 +44,12 @@
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
         session-stat-enable: true
         session-stat-max-count: 10
+      # 超过时间限制是否回收
+      remove-abandoned: true
+      # 超时时间；单位为秒。180秒=3分钟
+      remove-abandoned-timeout: 180
+      # 关闭abanded连接时输出错误日志
+      log-abandoned: true
   main:
     allow-circular-references: true
   #邮件配置
@@ -144,7 +150,7 @@
   async-executor-activate: false
   async-history-executor-activate: false
 
-#报表配置
+#报表配置--有漏洞关闭--20240613
 report:
   enabled: false
   database:
@@ -192,6 +198,7 @@
   token:
     #是否有状态
     state: false
+    sign-key: CJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJ1c2VyX25hbWUiOiIxNTE3MDcyMDY5NSIsInJlYWxfbmFtZSI6Inpob25nIiwidG9rZW5fdHlwZSI6ImFjY2Vzc190b2tlbiIsInJvbGVfbmFtZSI
   #redis序列化方式
   redis:
     serializer-type: protostuff
@@ -237,7 +244,19 @@
       - /blade-topics/topics/lists
       - /blade-household/household/getHouseholdOtherInfo
       - /blade-resource/oss/endpoint/put-file
+      - /blade-resource/oss/endpoint/put-file-attach-by-prefix-path
       - /blade-hiddenDangerRecord/**
+      - /blade-system/user/getPoliceUser
+      - /blade-policeAlarmRecords/policeAlarmRecords/save
+      - /blade-smsSend/smsSend/send
+      - /blade-system/user/register-user
+      - /blade-eCallEventTwo/eCallEventTwo/synchronizeData
+      - /jmreport/**
+      - /public_discuss/publicDiscuss/publicDiscussTotal
+      - /public_discuss/publicDiscuss/managementProtocol
+      - /blade-place/place/getNearbyPlaceList
+#      - /blade-householdLabel/**
+#      - /blade-system/**
 #      - /blade-doorplateAddress/doorplateAddress/**
 #      - /blade-house/house/**
 #      - /blade-household/household/**
@@ -256,6 +275,8 @@
 #      - /blade-propertyCompanyComment/**
 #      - /blade-policeStation/**
 #      - /blade-policeAffairsGrid/**
+#      - /blade-category/**
+      - /blade-disputeRecord/**
     #授权认证配置
     auth:
       - method: ALL
@@ -301,3 +322,23 @@
     #排除多租户逻辑
     exclude-tables:
       - blade_user
+sms:
+  url: https://mas.jx139.com:8443/sopA/
+  appId: 202403288666059313538996533
+  privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCCL4tz9BbUz+z3vs/eFwmUmQhsTiP3ZLwruTMJuEhsTEsT58PrdUOKGipwhKF88zj8SCk/Tn8izvDXj5IzqHEWjSEkfivYHx/6cE3VdHc6vvpvpeC06264d5NN4T6hwYH9CYz9iSmx9HFxADlg5zxj0lHqLSFf25cmEPF3F7PvAzj1cmYrKjet1HtCKaAyKADD+ojHHRjNLXZg3E5CINUqRYlLi+OKQph3VdrfokkO8efe8CR2wdiGU78mV1/UtTaiSYOEwv7pkbGECkqIXp+xYzaAVNCxikIWkc+qKmvvJXKsQVOKqv5b7/FQ/ag8trWPe8JLcQCN/Zg7DXSTc9YHAgMBAAECggEAENI73punZ5AGOmy5RyUK49xyLixakVi+x5eCdLsPAI9LFCNaOU5Jj8qZuTgp9Y8nydE5IyjtXH4IuJGgfnRBSHyrz59N4vsCksV4CSCnVzvd+Bci1b2l7MfmjKWSBiyOszdMtGXIsWm4TrWMtGysbOl8FBoIue4RtaVyzcSOR0+gDCIkn2XGqh3FhSIIApYm+eTOPDLZuSOsrgoTrppTOVUCXGN+/cSBAegWQnCES0b49F2EIRCAtSybc52N7zFPB9f8Kzzmgozilf00uS27HLZplwyLA6FMargdOi619x3T/XY52a55r4ldu/aZF2EbD1RpvMi9aGH/O77HtmLfAQKBgQC/32H0ibR5BgqfUjOWS0v+GRqG0gXr4x2R/oY9Pym16F5gEFKDYauBfEK4GYDtTEahB0Wo0n57StSZ3fX6yy9uBsPxywy0yUvzkxwe2th8fBg5czEBbLzHz4RMqo7LkfwKBatKMJLCOLdecSV2uJlDt/AIRFx5ymypiVLyYHb4IQKBgQCtsjv0ThHMM861CEfe9FZ2B4LFGfCptcek95ilARc7r3RpZpSSi+K0mF2992JVen+dkPh3FuG5NM5VSJeFyReNj5RxVz8A+4d9w3fxrqi2qfC1TFHR7IRv4JzPeZ+7wkMSc7rwkJ9UBSOdecXm2FV7BOivtnf7bGWIGLJNUb7pJwKBgCu0ZkudUk5+4cyInNePLzAh57jt/gtNIF8w6sLosEePNnALR8BFbxt/gnMM3CExTqU/Us6xo73RvbuOo4kM3zDguaFJ7wr/Dx3cVHtyvf0dByeO5Yq9igK5chlEgGI+Tnq579pmVgeHg70vaKkyQzb5nuNDLw1O3pF/hjVPY8oBAoGAFLW5nElqqdRLgx43o4eyf2Qp3WJYZYO9CBhVZOcaZA1pbd/DOy3em/XGx42lddejO6A7X8ekpjZ7m4OKPXNakZBa/KCQbIeRAhe6R2Cx0QW2I4e0AbmXmNdJGxu/Rd3FrX+K/H/h31y1gGMyi3Gjz4UoUTsKVzn3aSC4satbfeUCgYEAmpIo2ZO4hQ9THCOdgR5udXRG5s5JjGEct2QSxXntRyJm3RAkPA3/mEDVlI6X5UNIn7BKeThCFo5eM2bbFFF4sFeNV0W4uP8p9dsOnpwU7FzT++16WNiBopQpff72MNzjnt/k/KLlX/zV60zbMJ1R6McYsv0LP9Zuv9RAo8v8ZDU=
+  sopCreateBy: 106575361457
+
+wxpay:
+  api-v3-key: qqwuMJcCPRhcNcmFlqb6ucxdH
+  appid: wxeeab25f4f176f1fc
+  domain: https://srgdjczzxtpt.com:2080
+  mch-id: 1600701071
+  mch-serial-no: 4C19EAFA9E0AD598DDE3D7399B47C3D5C85
+  notify-domain: https://srgdjczzxtpt.com:2080/wxPay/native/notify
+  partnerKey: qqwuMJcCPRhcNcmFlqb6ucxd
+  private-key-path: /www/wwwroot/apiclient_key.pem
+  private-cert-path: /www/wwwroot/apiclient_cert.p12
+wxmini:
+  appid: wxeeab25f4f176f1fc
+  secret: 0a0e0d0a0c0b0a09080706050403020100
+  jscode2sessionUrl: https://api.weixin.qq.com/sns/jscode2session?appid={}&secret={}&js_code={}&grant_type=authorization_code

--
Gitblit v1.9.3