From babb070a354a8ecf1473ff882e0dc8735ab59912 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期二, 10 六月 2025 15:37:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-druid.yml | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 71db201..c425b1f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -17,18 +17,28 @@
# 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
+ # password: 123456
+ # 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://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_lisui?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_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: hxsoft
+ password: Hxerp2000
+ driverClassName: com.mysql.cj.jdbc.Driver
+# # 楂樻柉鏁版嵁搴撻厤缃�
+# url: jdbc:postgresql://127.0.0.1:5432/smartorlishui
+# username: gaussdb
+# password: Ls@123456
+# driverClassName: org.postgresql.Driver
# 浠庡簱鏁版嵁婧�
slave:
@@ -86,6 +96,27 @@
wall:
config:
multi-statement-allow: true
+ # redis 閰嶇疆
+ redis:
+ host: 127.0.0.1
+ port: 6020
+
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # 瀵嗙爜
+ password: Smartor
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
magic-api:
web: /magic/web
@@ -101,12 +132,6 @@
page: page
default-page: 1
default-size: 10
-
- #寰俊鍏紬鍙风殑瀵嗛挜
-appid: wx1c5243d2337753f4
-appSecret: 84a2186a0d175e88345267c716516cd3
-#绗笁鏂瑰井淇″叕浼楀彿鍙戦�佸湴鍧�锛堟柊鍗庡尰闄級
-thirdWXUrl: http://192.16.4.220:8103/api
#閽夐拤鐨勫瘑閽�
dingAppid: dingn8iip5ubj7clrrsv
@@ -157,7 +182,9 @@
#鏂板崕鍖婚櫌澶栭摼璇锋眰IP鍜岀鍙ｅ彿
req_path: 8093
-localIP: https://wx.lihusmart.com
+#localIP: https://wx.lihusmart.com
+#涓芥按澶栭摼璇锋眰IP鍜岀鍙ｅ彿
+localIP: http://221.12.19.26
#鑾峰彇鎮ｈ�呬俊鎭疷RL(鍗庡崜鎻愪緵)
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
@@ -205,9 +232,6 @@
#璇煶鍦板潃璁块棶鍓嶇紑(鍏徃)
#voicePathPrefix: http://192.168.2.13:8095/profile/upload/vadio/
-#鍏佽鑷姩鐢熸垚浠诲姟
-createTaskServiceType: 2
-
#绗釜灏忔椂鐢佃瘽鎷ㄦ墦鐨勪笂闄�
phoneUpEveryHour: 12
#鐢佃瘽姣忓ぉ缁撴潫鏃堕棿
@@ -221,3 +245,6 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
+
+#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
+visitHosp: 2
--
Gitblit v1.9.3