From 2cb8d69254e70e45d8957f60a9055f80487e17b1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 16 四月 2026 09:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-druid.yml | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 1c9eda3..2989938 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- # 涔変箤浜岄櫌
+ # 涔変箤浜岄櫌
# url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: 123456
@@ -34,7 +34,7 @@
# password: Hxerp2000
# driverClassName: com.mysql.cj.jdbc.Driver
# 鍏徃鏈湴
- url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=120000
username: smartor
password: Smartor.2023
driverClassName: com.mysql.cj.jdbc.Driver
@@ -78,7 +78,11 @@
# 鏈�澶ц繛鎺ユ睜鏁伴噺
maxActive: 20
# 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
+ maxWait: 120000
+ # 閰嶇疆杩炴帴瓒呮椂鏃堕棿锛堟绉掞級锛岄槻姝㈡參鏌ヨ瀵艰嚧杩炴帴鏂紑
+ queryTimeout: 120
+ # 閰嶇疆杩炴帴鏈夋晥鎬ф娴嬭秴鏃�
+ validationQueryTimeout: 5
# 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
timeBetweenEvictionRunsMillis: 60000
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
@@ -105,8 +109,8 @@
stat:
enabled: false
# 鎱QL璁板綍
- log-slow-sql: false
- slow-sql-millis: 1000
+ log-slow-sql: true
+ slow-sql-millis: 3000
merge-sql: true
wall:
config:
@@ -118,7 +122,7 @@
database: 0
password: Smartor
# 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
+ timeout: 30s
lettuce:
pool:
# 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
@@ -148,7 +152,7 @@
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
# 璇锋眰鍓嶇紑
pathMapping: /dev-api
@@ -215,10 +219,9 @@
# 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴)
ASRCallBackPath: http://192.168.100.10:8095/smartor/serviceSubtask/phoneCallBackYQ
#鎸傛柇IP(鏈湴)
-hangup: http://192.168.100.6:8089/hangup
+hangup: http://192.168.100.10:8089/hangup
#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴)
app_key_yq: ZurNHpaQLq6P55YS
-
## 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏂板崕)
#ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ
##鎸傛柇IP(鏂板崕)
@@ -255,7 +258,7 @@
#绗釜灏忔椂鐢佃瘽鎷ㄦ墦鐨勪笂闄�
phoneUpEveryHour: 12
#鐢佃瘽姣忓ぉ缁撴潫鏃堕棿
-phoneEndHour: 20
+phoneEndHour: 23
#鏂板憳宸ラ粯璁ゅ瘑鐮�
defaultPwd: 123456
@@ -267,10 +270,12 @@
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-isEncryp:
+isEncryp: 0
dealDeptCode:
#鏂囦欢涓婁紶鍦板潃
fileUpload:
profile:
+
+ai_answer: http://localhost:8088/ai_answer
--
Gitblit v1.9.3