From 3d274e016ae6f40cea86254af6c6f32691978ab8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 30 四月 2026 15:40:47 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
ruoyi-admin/src/main/resources/application-ls.yml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-ls.yml b/ruoyi-admin/src/main/resources/application-ls.yml
index 95cabf1..f4479cd 100644
--- a/ruoyi-admin/src/main/resources/application-ls.yml
+++ b/ruoyi-admin/src/main/resources/application-ls.yml
@@ -11,14 +11,14 @@
# username: smartor
# password: Smartor.2023
# driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://9.208.7.13:2883/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root@sfxx#other_cluster
+ url: jdbc:mysql://9.209.1.5:2883/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=120000
+ username: root@sfxx#other_cluster02
password: Y5oapyS8
driverClassName: com.mysql.cj.jdbc.Driver
- # url: jdbc:mysql://cluster02.db.lsjky.cn:2883/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: root@sfxx#other_cluster02
- # password: Y5oapyS8
- # driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://9.208.7.13:2883/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: root@sfxx#other_cluster
+# password: Y5oapyS8
+# driverClassName: com.mysql.cj.jdbc.Driver
# # 楂樻柉鏁版嵁搴撻厤缃�
# url: jdbc:postgresql://127.0.0.1:5432/smartorlishui
@@ -92,7 +92,7 @@
# 瀵嗙爜
password: Smartor
# 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
+ timeout: 30s
lettuce:
pool:
# 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
@@ -185,7 +185,7 @@
req_path: 8093
#localIP: https://wx.lihusmart.com
#涓芥按澶栭摼璇锋眰IP鍜岀鍙ｅ彿
-localIP: https://221.12.19.26
+localIP: https://lishuisf.health-y.cn
#鑾峰彇鎮ｈ�呬俊鎭疷RL(鍗庡崜鎻愪緵)
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
--
Gitblit v1.9.3