From c7bc8e415fa6cf5e3dec7059e900008b2b2bc1df Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 14 二月 2020 13:27:09 +0800
Subject: [PATCH] 集成 Lombok + MybatisPlus 3.3.0

---
 ruoyi/src/main/resources/application-dev.yml |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ruoyi/src/main/resources/application-druid.yml b/ruoyi/src/main/resources/application-dev.yml
similarity index 70%
copy from ruoyi/src/main/resources/application-druid.yml
copy to ruoyi/src/main/resources/application-dev.yml
index 13e1a5c..29bed64 100644
--- a/ruoyi/src/main/resources/application-druid.yml
+++ b/ruoyi/src/main/resources/application-dev.yml
@@ -6,9 +6,9 @@
         druid:
             # 涓诲簱鏁版嵁婧�
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.0.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: root
             # 浠庡簱鏁版嵁婧�
             slave:
                 # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -54,4 +54,24 @@
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true
+    # redis 閰嶇疆
+    redis:
+        # 鍦板潃
+        host: 192.168.0.222
+        # 绔彛锛岄粯璁や负6379
+        port: 6379
+        # 瀵嗙爜
+        password:
+        # 杩炴帴瓒呮椂鏃堕棿
+        timeout: 10s
+        lettuce:
+            pool:
+                # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+                min-idle: 0
+                # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+                max-idle: 8
+                # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+                max-active: 8
+                # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+                max-wait: -1ms
\ No newline at end of file

--
Gitblit v1.9.3