From a0e46d75fd50924c8e9ac0cf24a8daa0471bbed2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 19 二月 2025 10:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-druid.yml | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 1e973b4..999115d 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,28 +6,30 @@
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: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://192.168.191.181:3308/smartor?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://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: hxsoft
- # password: Hxerp2000
- # driverClassName: com.mysql.cj.jdbc.Driver
+ # 鍏徃浜�
+ url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: hxsoft
+ password: Hxerp2000
+ driverClassName: com.mysql.cj.jdbc.Driver
# 浠庡簱鏁版嵁婧�
slave:
@@ -151,12 +153,12 @@
qrpath: D:\qrcode
#鍏徃鍐呭閾捐姹侷P鍜岀鍙ｅ彿
-req_path: 8095
-localIP: 192.168.2.13
+#req_path: 8095
+#localIP: 192.168.2.13
#鏂板崕鍖婚櫌澶栭摼璇锋眰IP鍜岀鍙ｅ彿
-#req_path: 8093
-#localIP: https://wx.lihusmart.com
+req_path: 8093
+localIP: https://wx.lihusmart.com
#鑾峰彇鎮ｈ�呬俊鎭疷RL(鍗庡崜鎻愪緵)
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
@@ -165,23 +167,23 @@
uploadSwitch: 1
## 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴)
-ASRCallBackPath: http://192.168.2.13:8095/smartor/serviceSubtask/phoneCallBackYQ
+#ASRCallBackPath: http://192.168.2.13:8095/smartor/serviceSubtask/phoneCallBackYQ
##鎸傛柇IP(鏈湴)
-hangup: http://192.168.2.13:8091/hangup
+#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
+ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ
#鎸傛柇IP(鏂板崕)
-#hangup: http://192.16.4.220:8091/hangup
+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.168.2.13:8092/sendSms
#鏂板崕鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
-#xhsmsPath: http://192.16.4.220:8092/sendSms
+xhsmsPath: http://192.16.4.220:8092/sendSms
#甯愬彿
xhsmsAccount: 911124
#鎺ュ彛瀵嗙爜
@@ -200,12 +202,14 @@
FTP_PASSWORD: xh@2023
#璇煶鍦板潃璁块棶鍓嶇紑(鏂板崕)
-#voicePathPrefix: http://192.168.191.181:8095/profile/upload/vadio/
+voicePathPrefix: http://192.168.191.181:8095/profile/upload/vadio/
#璇煶鍦板潃璁块棶鍓嶇紑(鍏徃)
-voicePathPrefix: http://192.168.2.13:8095/profile/upload/vadio/
+#voicePathPrefix: http://192.168.2.13:8095/profile/upload/vadio/
#鍏佽鑷姩鐢熸垚浠诲姟
createTaskServiceType: 2
#绗釜灏忔椂鐢佃瘽鎷ㄦ墦鐨勪笂闄�
-phoneUpEveryHour: 10
+phoneUpEveryHour: 12
+#鐢佃瘽姣忓ぉ缁撴潫鏃堕棿
+phoneEndHour: 20
--
Gitblit v1.9.3