From ee96287d25370557fdeb2487b735f68d068d2267 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 13 Feb 2025 10:19:16 +0800
Subject: [PATCH] =?UTF-8?q?redis=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=EF=BC=9A=E5=8D=95=E6=9C=BA=E3=80=81=E5=93=A8=E5=85=B5=E3=80=81?=
 =?UTF-8?q?=E9=9B=86=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ChenfengRedisEncryptAutoConfiguration.java | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/config/ChenfengRedisEncryptAutoConfiguration.java b/cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/config/ChenfengRedisEncryptAutoConfiguration.java
index 490d1ad50..415725d3c 100644
--- a/cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/config/ChenfengRedisEncryptAutoConfiguration.java
+++ b/cf-framework/cf-spring-boot-starter-redis/src/main/java/com/cf/imes/framework/redis/config/ChenfengRedisEncryptAutoConfiguration.java
@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.cf.imes.framework.common.util.encrypt.AesUtils;
 import org.redisson.config.ClusterServersConfig;
 import org.redisson.config.Config;
-import org.redisson.config.MasterSlaveServersConfig;
-import org.redisson.config.ReplicatedServersConfig;
 import org.redisson.config.SentinelServersConfig;
 import org.redisson.config.SingleServerConfig;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
@@ -33,44 +31,31 @@ public class ChenfengRedisEncryptAutoConfiguration {
             BeanUtil.copyProperties(configuration, redissonConfig);
 
             String password;
-            SingleServerConfig singleServerConfig = redissonConfig.useSingleServer();
-            if (singleServerConfig != null) {
 
+            // 单机模式
+            if (redissonConfig.isSingleConfig()) {
+                SingleServerConfig singleServerConfig = redissonConfig.useSingleServer();
                 password = singleServerConfig.getPassword();
                 singleServerConfig.setPassword(
                         StringUtils.isEmpty(password) ? null : AesUtils.decrypt(password, publicKey));
                 return;
             }
 
-            MasterSlaveServersConfig masterSlaveServersConfig = redissonConfig.useMasterSlaveServers();
-            if (masterSlaveServersConfig != null) {
-                password = masterSlaveServersConfig.getPassword();
-                masterSlaveServersConfig.setPassword(
-                        StringUtils.isEmpty(password) ? null : AesUtils.decrypt(password, publicKey));
-                return;
-            }
-
-            SentinelServersConfig sentinelServersConfig = redissonConfig.useSentinelServers();
-            if (sentinelServersConfig != null) {
+            // 哨兵模式
+            if (redissonConfig.isSentinelConfig()) {
+                SentinelServersConfig sentinelServersConfig = redissonConfig.useSentinelServers();
                 password = sentinelServersConfig.getPassword();
                 sentinelServersConfig.setPassword(
                         StringUtils.isEmpty(password) ? null : AesUtils.decrypt(password, publicKey));
                 return;
             }
 
-            ClusterServersConfig clusterServersConfig = redissonConfig.useClusterServers();
-            if (clusterServersConfig != null) {
+            // 集群模式
+            if (redissonConfig.isClusterConfig()) {
+                ClusterServersConfig clusterServersConfig = redissonConfig.useClusterServers();
                 password = clusterServersConfig.getPassword();
                 clusterServersConfig.setPassword(
                         StringUtils.isEmpty(password) ? null : AesUtils.decrypt(password, publicKey));
-                return;
-            }
-
-            ReplicatedServersConfig replicatedServersConfig = redissonConfig.useReplicatedServers();
-            if (replicatedServersConfig != null) {
-                password = replicatedServersConfig.getPassword();
-                replicatedServersConfig.setPassword(
-                        StringUtils.isEmpty(password) ? null : AesUtils.decrypt(password, publicKey));
             }
         };
     }