From 33c23179242edf5aa0cb7dd04f8a35b2c188eb52 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期四, 12 六月 2025 15:19:21 +0800
Subject: [PATCH] 06-11 zhs

---
 ruoyi-admin/src/main/resources/application-druid.yml |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 980a88d..c425b1f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -13,9 +13,14 @@
         #        鍏徃
         #        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
+#        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: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
@@ -28,6 +33,12 @@
         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:
@@ -85,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
@@ -150,7 +182,9 @@
 
 #鏂板崕鍖婚櫌澶栭摼璇锋眰IP鍜岀鍙e彿
 req_path: 8093
-localIP: https://wx.lihusmart.com
+#localIP: https://wx.lihusmart.com
+#涓芥按澶栭摼璇锋眰IP鍜岀鍙e彿
+localIP: http://221.12.19.26
 
 #鑾峰彇鎮h�呬俊鎭疷RL(鍗庡崜鎻愪緵)
 hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange

--
Gitblit v1.9.3