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 | 93 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 4f19050..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
@@ -28,13 +28,13 @@
# password: Smartor.2023
# driverClassName: com.mysql.cj.jdbc.Driver
- # # 鍏徃浜�
- # url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # 鍏徃浜�
+ # url: jdbc:mysql://116.62.18.175:6002/smartor_xinhua?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: hxsoft
# password: Hxerp2000
# driverClassName: com.mysql.cj.jdbc.Driver
# 鍏徃鏈湴
- url: jdbc:mysql://192.168.100.10:3306/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
@@ -47,12 +47,22 @@
# 浠庡簱鏁版嵁婧�
slave:
+ enabled: true
+ url: jdbc:oracle:thin:@//192.200.85.40:1521/hzsyhis
+ username: wssf
+ password: Hzsywssf
+ driver-class-name: oracle.jdbc.OracleDriver
+ # enabled: true
+ # url: jdbc:mysql://192.168.100.10:3306/emr?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # username: smartor
+ # password: Smartor.2023
+ # driverClassName: com.mysql.cj.jdbc.Driver
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(鍏徃)
- # enabled: true
- # url: jdbc:sqlserver://116.62.18.175:6001;DatabaseName=iv-ywey;encrypt=false;SelectMethod=cursor
- # username: sa
- # password: Hxerp2000
- # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ # enabled: true
+ # url: jdbc:sqlserver://116.62.18.175:6001;DatabaseName=iv-ywey;encrypt=false;SelectMethod=cursor
+ # username: sa
+ # password: Hxerp2000
+ # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(涔変箤浜岄櫌)
# enabled: true
@@ -68,7 +78,11 @@
# 鏈�澶ц繛鎺ユ睜鏁伴噺
maxActive: 20
# 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
+ maxWait: 120000
+ # 閰嶇疆杩炴帴瓒呮椂鏃堕棿锛堟绉掞級锛岄槻姝㈡參鏌ヨ瀵艰嚧杩炴帴鏂紑
+ queryTimeout: 120
+ # 閰嶇疆杩炴帴鏈夋晥鎬ф娴嬭秴鏃�
+ validationQueryTimeout: 5
# 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
timeBetweenEvictionRunsMillis: 60000
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
@@ -76,8 +90,8 @@
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
maxEvictableIdleTimeMillis: 900000
# 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- # validationQuery: SELECT 1 FROM DUAL
- validationQuery: SELECT 1
+ validationQuery: SELECT 1 FROM DUAL
+ #validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
@@ -93,10 +107,10 @@
login-password: Lihu@1363419#$
filter:
stat:
- enabled: true
+ enabled: false
# 鎱QL璁板綍
log-slow-sql: true
- slow-sql-millis: 1000
+ slow-sql-millis: 3000
merge-sql: true
wall:
config:
@@ -105,13 +119,10 @@
redis:
host: 127.0.0.1
port: 6020
-
- # 鏁版嵁搴撶储寮�
database: 0
- # 瀵嗙爜
password: Smartor
# 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
+ timeout: 30s
lettuce:
pool:
# 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
@@ -131,7 +142,7 @@
prefix: /api
readonly: false
sql-column-case: camel
- show-sql: true #閰嶇疆鎵撳嵃SQL
+ show-sql: false #閰嶇疆鎵撳嵃SQL
page-config:
size: size
page: page
@@ -141,7 +152,7 @@
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
# 璇锋眰鍓嶇紑
pathMapping: /dev-api
@@ -149,25 +160,6 @@
dingAppid: dingn8iip5ubj7clrrsv
dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
-# 娌冲崡SSO閰嶇疆锛堜附姘寸敤涓嶅埌锛�
-sso:
- enabled: true
- client_id: "mbglxt" # 淇￠�氶櫌鎻愪緵
- client_secret: "mbglxt" # 淇￠�氶櫌鎻愪緵
- # 鍐呯綉閰嶇疆
- internal:
- authorize_url: "http://10.10.13.112:37727/connect/authorize"
- token_url: "http://10.10.13.112:37727/connect/token"
- userinfo_url: "http://10.10.13.112:37727/connect/userinfo"
- redirect_uri: "http://10.10.13.142:8096/sso/callback"
- # 澶栫綉閰嶇疆
- external:
- authorize_url: "http://172.20.111.142:37727/connect/authorize"
- token_url: "http://172.20.111.142:37727/connect/token"
- userinfo_url: "http://172.20.111.142:37727/connect/userinfo"
- redirect_uri: "http://172.20.111.142:8096/sso/callback"
- state: "smartor" # 浣犱滑绯荤粺鏍囪瘑
- scope: "openid roles profile"
# websocket瓒呮椂鏃堕棿
server:
@@ -227,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(鏂板崕)
@@ -241,11 +232,11 @@
#鏈� 鍦� 鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
#xhsmsPath: http://192.168.2.13:8092/sendSms
#鏂板崕鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
-xhsmsPath: http://192.16.4.220:8092/sendSms
+xhsmsPath: http://121.41.98.232:8001/sms/api/sendMessageMass
#甯愬彿
-xhsmsAccount: 911124
+xhsmsAccount: 300044
#鎺ュ彛瀵嗙爜
-xhsmsPwd: zW5eXe
+xhsmsPwd: qj0NHDegxWhj
#铏氭嫙鎺ュ叆鐮�
xhsmsjrm: 1069055
@@ -267,7 +258,7 @@
#绗釜灏忔椂鐢佃瘽鎷ㄦ墦鐨勪笂闄�
phoneUpEveryHour: 12
#鐢佃瘽姣忓ぉ缁撴潫鏃堕棿
-phoneEndHour: 20
+phoneEndHour: 23
#鏂板憳宸ラ粯璁ゅ瘑鐮�
defaultPwd: 123456
@@ -278,5 +269,13 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
-visitHosp: 2
+
+isEncryp: 0
+
+dealDeptCode:
+
+#鏂囦欢涓婁紶鍦板潃
+fileUpload:
+profile:
+
+ai_answer: http://localhost:8088/ai_answer
--
Gitblit v1.9.3