update 增加redis空密码兼容性
This commit is contained in:
parent
d9dd76f2ae
commit
83ba79dca2
|
@ -1,5 +1,6 @@
|
||||||
package com.ruoyi.framework.config;
|
package com.ruoyi.framework.config;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.ruoyi.framework.config.properties.RedissonProperties;
|
import com.ruoyi.framework.config.properties.RedissonProperties;
|
||||||
import org.redisson.Redisson;
|
import org.redisson.Redisson;
|
||||||
import org.redisson.api.RedissonClient;
|
import org.redisson.api.RedissonClient;
|
||||||
|
@ -52,7 +53,7 @@ public class RedisConfig extends CachingConfigurerSupport {
|
||||||
.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
|
.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
|
||||||
.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
|
.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
|
||||||
.setDatabase(redisProperties.getDatabase())
|
.setDatabase(redisProperties.getDatabase())
|
||||||
.setPassword(redisProperties.getPassword())
|
.setPassword(StrUtil.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
|
||||||
.setTimeout(singleServerConfig.getTimeout())
|
.setTimeout(singleServerConfig.getTimeout())
|
||||||
.setRetryAttempts(singleServerConfig.getRetryAttempts())
|
.setRetryAttempts(singleServerConfig.getRetryAttempts())
|
||||||
.setRetryInterval(singleServerConfig.getRetryInterval())
|
.setRetryInterval(singleServerConfig.getRetryInterval())
|
||||||
|
|
Loading…
Reference in New Issue