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 | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index b31ef4f..3676437 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -29,19 +29,15 @@
# driverClassName: com.mysql.cj.jdbc.Driver
# 鍏徃浜�
- # url: jdbc:mysql://116.62.18.175:6002/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: hxsoft
- # password: Smartor.2023
- # driverClassName: com.mysql.cj.jdbc.Driver
+# 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:mysql://127.0.0.1:2881/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: root@sys
- # password:
- # driverClassName: com.mysql.cj.jdbc.Driver
# # 楂樻柉鏁版嵁搴撻厤缃�
# url: jdbc:postgresql://127.0.0.1:5432/smartorlishui
@@ -62,11 +58,11 @@
# 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
@@ -117,7 +113,7 @@
multi-statement-allow: true
# redis 閰嶇疆
redis:
- host: 127.0.0.1
+ host: 192.168.100.10
port: 6020
database: 0
password: Smartor
@@ -144,7 +140,6 @@
sql-column-case: camel
show-sql: true #閰嶇疆鎵撳嵃SQL
page-config:
- enabled: false #绂佺敤鍒嗛〉
size: size
page: page
default-page: 1
@@ -207,9 +202,9 @@
#鏂板崕鍖婚櫌澶栭摼璇锋眰IP鍜岀鍙ｅ彿
req_path: 8093
-localIP: https://wx.lihusmart.com
+#localIP: https://wx.lihusmart.com
#涓芥按澶栭摼璇锋眰IP鍜岀鍙ｅ彿
-#localIP: http://221.12.19.26
+localIP: http://221.12.19.26
#鑾峰彇鎮ｈ�呬俊鎭疷RL(鍗庡崜鎻愪緵)
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
@@ -218,9 +213,9 @@
uploadSwitch: 0
# 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴)
-ASRCallBackPath: http://192.168.100.127:8095/smartor/serviceSubtask/phoneCallBackYQ
+ASRCallBackPath: http://192.168.100.10:8095/smartor/serviceSubtask/phoneCallBackYQ
#鎸傛柇IP(鏈湴)
-hangup: http://192.168.100.33:5060/hangup
+hangup: http://192.168.100.6:8089/hangup
#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴)
app_key_yq: ZurNHpaQLq6P55YS
@@ -272,11 +267,6 @@
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
-visitHosp: 1
+visitHosp: 2
isEncryp:
-
-dealDeptCode:
-
-# 鍓嶇ip
-qdip: 192.168.100.132
--
Gitblit v1.9.3