From e20b5a206889071b5f4ab26df8948e1a8653dccd Mon Sep 17 00:00:00 2001
From: wxz <ZHANGYUGE6666>
Date: Wed, 11 Jan 2023 14:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4RedissionConfig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/config/RedissonConfig.java  | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java
index 747deb0b2d..c745f4d9c5 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java
@@ -19,8 +19,6 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class RedissonConfig {
 
-    @Value("${spring.redis.cluster-enabled}")
-    private Boolean clusterEnabled;
     //@Value("${spring.redis.host}")
     //private String host;
     //@Value("${spring.redis.port}")
@@ -48,18 +46,17 @@ public class RedissonConfig {
             //redis://ip:port
             //redis的部署方式有单节点部署、主从方式部署、哨兵方式部署、集群方式部署
 
-            if (clusterEnabled == null || !clusterEnabled) {
-                //单机模式
-                //config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port));
-                //config.useSingleServer().setPassword(password);
-                //config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
-                //config.useSingleServer().setDatabase(NumConstant.TEN);
-            } else {
-                //集群模式
-                config.useClusterServers().addNodeAddress(getClusterNodes());
-                config.useClusterServers().setPassword(password);
-                config.useClusterServers().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
-            }
+            //单机模式
+            //config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port));
+            //config.useSingleServer().setPassword(password);
+            //config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
+            //config.useSingleServer().setDatabase(NumConstant.TEN);
+
+            //集群模式
+            config.useClusterServers().addNodeAddress(getClusterNodes());
+            config.useClusterServers().setPassword(password);
+            config.useClusterServers().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
+
             return Redisson.create(config);
         } catch (Exception e) {
             log.error("初始化redisson失败", e);