From 335dc35e2be11f7ebfa45e5334eb365f4ee229dc Mon Sep 17 00:00:00 2001
From: mxy <2522571037@qq.com>
Date: Thu, 24 Apr 2025 02:31:31 +0000
Subject: [PATCH] =?UTF-8?q?fix(cache/redisson):=20=E5=85=BC=E5=AE=B9redis?=
 =?UTF-8?q?=E6=B2=A1=E9=85=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E6=97=B6=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0redisson=E5=AE=9E=E4=BE=8B=E5=8C=96=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autoconfigure/RedissonAutoConfiguration.java     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java
index dcd80fde..5c461783 100644
--- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java
+++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java
@@ -102,8 +102,10 @@ public class RedissonAutoConfiguration {
             List<String> nodeList = redisProperties.getCluster().getNodes();
             nodeList.stream().map(node -> protocolPrefix + node).forEach(clusterServersConfig::addNodeAddress);
         }
+        // 兼容 Redis 没配置密码的情况
         if (CharSequenceUtil.isBlank(clusterServersConfig.getPassword())) {
-            clusterServersConfig.setPassword(redisProperties.getPassword());
+            String password = redisProperties.getPassword();
+            clusterServersConfig.setPassword(CharSequenceUtil.isNotBlank(password) ? password : null);
         }
         // Key 前缀
         if (CharSequenceUtil.isNotBlank(properties.getKeyPrefix())) {
@@ -129,8 +131,10 @@ public class RedissonAutoConfiguration {
             List<String> nodeList = redisProperties.getSentinel().getNodes();
             nodeList.stream().map(node -> protocolPrefix + node).forEach(sentinelServersConfig::addSentinelAddress);
         }
+        // 兼容 Redis 没配置密码的情况
         if (CharSequenceUtil.isBlank(sentinelServersConfig.getPassword())) {
-            sentinelServersConfig.setPassword(redisProperties.getPassword());
+            String password = redisProperties.getPassword();
+            sentinelServersConfig.setPassword(CharSequenceUtil.isNotBlank(password) ? password : null);
         }
         if (CharSequenceUtil.isBlank(sentinelServersConfig.getMasterName())) {
             sentinelServersConfig.setMasterName(redisProperties.getSentinel().getMaster());
@@ -155,8 +159,10 @@ public class RedissonAutoConfiguration {
         }
         // 下方配置如果为空，则使用 Redis 的配置
         singleServerConfig.setDatabase(redisProperties.getDatabase());
+        // 兼容 Redis 没配置密码的情况
         if (CharSequenceUtil.isBlank(singleServerConfig.getPassword())) {
-            singleServerConfig.setPassword(redisProperties.getPassword());
+            String password = redisProperties.getPassword();
+            singleServerConfig.setPassword(CharSequenceUtil.isNotBlank(password) ? password : null);
         }
         if (CharSequenceUtil.isBlank(singleServerConfig.getAddress())) {
             singleServerConfig.setAddress(protocolPrefix + redisProperties