ContiNew/continew-starter
1
1
Fork 0
mirror of https://github.com/continew-org/continew-starter.git synced 2025-09-09 20:57:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cache/redisson): 兼容redis没配置密码时出现redisson实例化失败的问题

Browse Source
This commit is contained in:
mxy
2025-04-24 02:31:31 +00:00
committed by Charles7c
parent 1b7f541e7d
commit 335dc35e2b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java vendored
View File

@@ -102,8 +102,10 @@ public class RedissonAutoConfiguration {
List<String> nodeList = redisProperties.getCluster().getNodes(); List<String> nodeList = redisProperties.getCluster().getNodes();
nodeList.stream().map(node -> protocolPrefix + node).forEach(clusterServersConfig::addNodeAddress); nodeList.stream().map(node -> protocolPrefix + node).forEach(clusterServersConfig::addNodeAddress);
} }
// 兼容 Redis 没配置密码的情况
if (CharSequenceUtil.isBlank(clusterServersConfig.getPassword())) { if (CharSequenceUtil.isBlank(clusterServersConfig.getPassword())) {
clusterServersConfig.setPassword(redisProperties.getPassword()); String password = redisProperties.getPassword();
clusterServersConfig.setPassword(CharSequenceUtil.isNotBlank(password) ? password : null);
} }
// Key 前缀 // Key 前缀
if (CharSequenceUtil.isNotBlank(properties.getKeyPrefix())) { if (CharSequenceUtil.isNotBlank(properties.getKeyPrefix())) {
@@ -129,8 +131,10 @@ public class RedissonAutoConfiguration {
List<String> nodeList = redisProperties.getSentinel().getNodes(); List<String> nodeList = redisProperties.getSentinel().getNodes();
nodeList.stream().map(node -> protocolPrefix + node).forEach(sentinelServersConfig::addSentinelAddress); nodeList.stream().map(node -> protocolPrefix + node).forEach(sentinelServersConfig::addSentinelAddress);
} }
// 兼容 Redis 没配置密码的情况
if (CharSequenceUtil.isBlank(sentinelServersConfig.getPassword())) { 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())) { if (CharSequenceUtil.isBlank(sentinelServersConfig.getMasterName())) {
sentinelServersConfig.setMasterName(redisProperties.getSentinel().getMaster()); sentinelServersConfig.setMasterName(redisProperties.getSentinel().getMaster());
@@ -155,8 +159,10 @@ public class RedissonAutoConfiguration {
} }
// 下方配置如果为空，则使用 Redis 的配置 // 下方配置如果为空，则使用 Redis 的配置
singleServerConfig.setDatabase(redisProperties.getDatabase()); singleServerConfig.setDatabase(redisProperties.getDatabase());
// 兼容 Redis 没配置密码的情况
if (CharSequenceUtil.isBlank(singleServerConfig.getPassword())) { 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())) { if (CharSequenceUtil.isBlank(singleServerConfig.getAddress())) {
singleServerConfig.setAddress(protocolPrefix + redisProperties singleServerConfig.setAddress(protocolPrefix + redisProperties