From 3c0558068f28c05e7a70a8c2164bd7d71287bf4d Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Tue, 17 Jan 2023 11:31:56 +0800
Subject: [PATCH] =?UTF-8?q?redisson=E7=89=88=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/hd/nladmin-system/pom.xml                 |  2 +-
 .../main/resources/config/application-dev.yml | 30 ++++++++-----------
 .../resources/config/application-prod.yml     | 29 +++++++-----------
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml
index a3058fb2..b8769900 100644
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.12.3</version>
+            <version>3.19.1</version>
             <exclusions>
                 <exclusion>
                     <artifactId>spring-boot-starter-actuator</artifactId>
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
index 4f8a8f96..0c47b8c2 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -70,30 +70,24 @@ spring:
             multi-statement-allow: true
   redis:
     #数据库索引
-    database: 1
+    database: 2
     # Redis服务器地址
     host: 47.96.133.178
     # Redis服务器连接端口
     port: 6479
     # Redis服务器连接密码（默认为空）
     password: 942464Yy
-redisson:
-  # redis key前缀
-  keyPrefix:
-  # 线程池数量
-  threads: 4
-  # Netty线程池数量
-  nettyThreads: 8
-  # 单节点配置
-  singleServerConfig:
-    # 最小空闲连接数
-    connectionMinimumIdleSize: 8
-    # 连接池大小
-    connectionPoolSize: 32
-    # 连接空闲超时，单位：毫秒
-    idleConnectionTimeout: 10000
-    # 命令等待超时，单位：毫秒
-    timeout: 3000
+    redisson:
+      config: |
+        threads: 4
+        nettyThreads: 4
+        singleServerConfig:
+          connectionMinimumIdleSize: 8
+          connectionPoolSize: 8
+          address: redis://47.96.133.178:6479
+          password: 942464Yy
+          idleConnectionTimeout: 10000
+          timeout: 3000
 # 登录相关配置
 login:
   # 登录缓存
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
index 7cbb6672..4fe46016 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
@@ -70,23 +70,16 @@ spring:
     port: ${REDIS_PORT:6379}
     #连接超时时间
     timeout: 5000
-redisson:
-  # redis key前缀
-  keyPrefix:
-  # 线程池数量
-  threads: 4
-  # Netty线程池数量
-  nettyThreads: 8
-  # 单节点配置
-  singleServerConfig:
-    # 最小空闲连接数
-    connectionMinimumIdleSize: 8
-    # 连接池大小
-    connectionPoolSize: 32
-    # 连接空闲超时，单位：毫秒
-    idleConnectionTimeout: 10000
-    # 命令等待超时，单位：毫秒
-    timeout: 3000
+    redisson:
+      config: |
+        threads: 4
+        nettyThreads: 4
+        singleServerConfig:
+          connectionMinimumIdleSize: 8
+          connectionPoolSize: 8
+          address: redis://10.16.1.25:6379
+          idleConnectionTimeout: 10000
+          timeout: 3000
 # 登录相关配置
 login:
   # 登录缓存
@@ -164,4 +157,4 @@ file:
 logging:
   file:
     path: /app/jar/logs
-  config: classpath:logback-spring.xml
\ No newline at end of file
+  config: classpath:logback-spring.xml