From 9dd748e0352f31b6255be2860c177db0d20ac40e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:41:35 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
ruoyi-admin/src/main/resources/application-druid.yml | 102 +++++++++++++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 40 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index c425b1f..3676437 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,17 +6,17 @@
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
# 鍏徃
# url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# 涓芥按
-# url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: smartor
-# password: Smartor.2023
-# driverClassName: com.mysql.cj.jdbc.Driver
+ # url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # username: smartor
+ # password: Smartor.2023
+ # driverClassName: com.mysql.cj.jdbc.Driver
# 娌冲崡
# url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
@@ -29,25 +29,40 @@
# 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
- username: hxsoft
- password: Hxerp2000
+# 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://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: smartor
+ password: Smartor.2023
driverClassName: com.mysql.cj.jdbc.Driver
-# # 楂樻柉鏁版嵁搴撻厤缃�
-# url: jdbc:postgresql://127.0.0.1:5432/smartorlishui
-# username: gaussdb
-# password: Ls@123456
-# driverClassName: org.postgresql.Driver
+ # # 楂樻柉鏁版嵁搴撻厤缃�
+ # url: jdbc:postgresql://127.0.0.1:5432/smartorlishui
+ # username: gaussdb
+ # password: Ls@123456
+ # driverClassName: org.postgresql.Driver
# 浠庡簱鏁版嵁婧�
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
@@ -71,8 +86,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
@@ -98,12 +113,9 @@
multi-statement-allow: true
# redis 閰嶇疆
redis:
- host: 127.0.0.1
+ host: 192.168.100.10
port: 6020
-
- # 鏁版嵁搴撶储寮�
database: 0
- # 瀵嗙爜
password: Smartor
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
@@ -133,9 +145,17 @@
default-page: 1
default-size: 10
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+ # 璇锋眰鍓嶇紑
+ pathMapping: /dev-api
+
#閽夐拤鐨勫瘑閽�
dingAppid: dingn8iip5ubj7clrrsv
dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
+
# websocket瓒呮椂鏃堕棿
server:
@@ -190,30 +210,30 @@
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
# 0浠ｈ〃璧伴粯璁ょ殑涓婁紶 1 浠ｇ爜璧版柊鍗庡尰闄㈢殑涓婁紶
-uploadSwitch: 1
+uploadSwitch: 0
-## 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴)
-#ASRCallBackPath: http://192.168.2.13:8095/smartor/serviceSubtask/phoneCallBackYQ
-##鎸傛柇IP(鏈湴)
-#hangup: http://192.168.2.13:8091/hangup
-##fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴)
-#app_key_yq: ZurNHpaQLq6P55YS
-
-# 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏂板崕)
-ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ
-#鎸傛柇IP(鏂板崕)
-hangup: http://192.16.4.220:8091/hangup
-#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏂板崕)
+# 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴)
+ASRCallBackPath: http://192.168.100.10:8095/smartor/serviceSubtask/phoneCallBackYQ
+#鎸傛柇IP(鏈湴)
+hangup: http://192.168.100.6:8089/hangup
+#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴)
app_key_yq: ZurNHpaQLq6P55YS
+
+## 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏂板崕)
+#ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ
+##鎸傛柇IP(鏂板崕)
+#hangup: http://192.16.4.220:8091/hangup
+##fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏂板崕)
+#app_key_yq: ZurNHpaQLq6P55YS
#鏈� 鍦� 鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
#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
@@ -248,3 +268,5 @@
#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
visitHosp: 2
+
+isEncryp:
--
Gitblit v1.9.3