From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
ruoyi-admin/src/main/resources/application-ls.yml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-ls.yml b/ruoyi-admin/src/main/resources/application-ls.yml
index ab23ded..0f1d9d5 100644
--- a/ruoyi-admin/src/main/resources/application-ls.yml
+++ b/ruoyi-admin/src/main/resources/application-ls.yml
@@ -7,9 +7,13 @@
# 涓诲簱鏁版嵁婧�
master:
# 涓芥按
- 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
+ # 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://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
# # 楂樻柉鏁版嵁搴撻厤缃�
@@ -107,7 +111,7 @@
pagehelper:
helperDialect: mysql
supportMethodsArguments: true
- params: count=countSql
+# params: countSql;pageSizeZero=true
magic-api:
web: /magic/web
@@ -177,7 +181,7 @@
req_path: 8093
#localIP: https://wx.lihusmart.com
#涓芥按澶栭摼璇锋眰IP鍜岀鍙ｅ彿
-localIP: http://221.12.19.26
+localIP: https://221.12.19.26
#鑾峰彇鎮ｈ�呬俊鎭疷RL(鍗庡崜鎻愪緵)
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange
@@ -239,6 +243,11 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
+#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3鐪佺珛鍚屽痉
visitHosp: 2
+#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
+dealDeptCode:
+
+#鏄惁鍔犲瘑 0涓嶅姞 1鍔犲瘑
+isEncryp: 0
--
Gitblit v1.9.3