From b79a49fa76116fbc2be1de7465d933209b0c99ee Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 23 九月 2022 22:45:23 +0800
Subject: [PATCH] dialog去除以及异常情况处理优化

---
 src/main/resources/all-application.yml |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 1233a89..ed025b9 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -32,7 +32,7 @@
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false
+        url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
         username: root
         password: root123
         druid:
@@ -48,7 +48,7 @@
             poolPreparedStatements: false         # 鏄惁闁嬪暉PSCache锛屼甫涓旀寚瀹氭瘡鍊嬮�g窔涓奝SCache鐨勫ぇ灏�
             timeBetweenEvictionRunsMillis: 60000  # 閰嶇疆闁撻殧澶氫箙鎵嶉�茶涓�娆℃娓紝妾㈡脯闇�瑕侀棞闁夌殑绌洪枓閫g窔锛屽柈浣嶆槸姣
             minEvictableIdleTimeMillis: 300000    # 閰嶇疆涓�鍊嬮�g窔鍦ㄦ睜涓渶灏忕敓瀛樼殑鏅傞枔锛屽柈浣嶆槸姣
-            filters: stat,wall,slf4j             # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁$敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j, 闃插尽sql娉ㄥ叆鐨刦ilter:wall
+            filters: stat,slf4j             # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁$敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j
             useGlobalDataSourceStat: true         # 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
             # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
             connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000
@@ -79,9 +79,14 @@
         # [鍙�塢 璇佷功鏂囦欢璺緞锛屾斁缃湪resource/鐩綍涓嬪嵆鍙紝淇敼xxx涓烘枃浠跺悕
         key-store: classpath:xxx.jks
         # [鍙�塢 璇佷功瀵嗙爜
-        key-password: password
+        key-store-password: password
         # [鍙�塢 璇佷功绫诲瀷锛� 榛樿涓簀ks锛屾牴鎹疄闄呬慨鏀�
         key-store-type: JKS
+        # 閰嶇疆璇佷功鍙互浣跨敤濡備笅涓ら」锛屽涓婇潰浜岄�変竴鍗冲彲
+        # PEM 缂栫爜璇佷功
+        certificate: xx.pem
+        #   绉侀挜鏂囦欢
+        certificate-private-key: xx.key
 
 # 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
 sip:
@@ -149,7 +154,7 @@
         enable: true
         # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�, 蹇呴』鎻愬墠鍦▃lm涓婇厤缃灞炴�э紝涓嶇劧鑷姩閰嶇疆姝ゅ睘鎬у彲鑳戒笉鎴愬姛
         port-range: 30000,30500 # 绔彛鑼冨洿
-        # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
+        # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦
         send-port-range: 30000,30500 # 绔彛鑼冨洿
     # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
     record-assist-port: 0
@@ -174,8 +179,6 @@
     platform-play-timeout: 60000
     # 鏄惁寮�鍚帴鍙i壌鏉�
     interface-authentication: true
-    # 鑷姩閰嶇疆redis 鍙互杩囨湡浜嬩欢
-    redis-config: true
     # 鎺ュ彛閴存潈渚嬪鐨勬帴鍙�, 鍗充笉杩涜鎺ュ彛閴存潈鐨勬帴鍙�,灏介噺璇︾粏涔﹀啓锛屽敖閲忎笉鐢�/**锛岃嚦灏戜袱绾х洰褰�
     interface-authentication-excludes:
         - /api/v1/**
@@ -185,15 +188,12 @@
     record-sip: true
     # 鏄惁灏嗘棩蹇楀瓨鍌ㄨ繘鏁版嵁搴�
     logInDatebase: true
-    # 绗笁鏂瑰尮閰嶏紝鐢ㄤ簬浠巗tream閽熻幏鍙栨湁鏁堜俊鎭�
-    thirdPartyGBIdReg: "[\\s\\S]*"
+    # 浣跨敤鎺ㄦ祦鐘舵�佷綔涓烘帹娴侀�氶亾鐘舵��
+    use-pushing-as-status: true
 
-# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
-swagger-ui:
-    enabled: true
-
-# 鐗堟湰淇℃伅锛� 涓嶉渶淇敼
-version:
-    version: "@project.version@"
-    description: "@project.description@"
-    artifact-id: "@project.artifactId@"
+# 鍏抽棴鍦ㄧ嚎鏂囨。锛堢敓浜х幆澧冨缓璁叧闂級
+springdoc:
+    api-docs:
+        enabled: false
+    swagger-ui:
+        enabled: false

--
Gitblit v1.8.0