diff --git a/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java index e52f58977cea00218c20a78376e3910d28eff376..6e536cc67a2bb9d748c42388ebda5e9768b374c7 100644 --- a/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java @@ -53,6 +53,9 @@ public class RedisConfig extends CachingConfigurerSupport { @Value("${spring.redis.password}") private String password; + @Value("${spring.redis.database}") + private int database; + /** * 配置 redis 连接池 * @return @@ -62,11 +65,8 @@ public class RedisConfig extends CachingConfigurerSupport { JedisPoolConfig jedisPoolConfig = new JedisPoolConfig(); jedisPoolConfig.setMaxIdle(maxIdle); jedisPoolConfig.setMaxWaitMillis(maxWaitMillis); - if (StringUtils.isNotBlank(password)) { - return new JedisPool(jedisPoolConfig, host, port, timeout, password); - } else { - return new JedisPool(jedisPoolConfig, host, port,timeout); - } + String pwd = StringUtils.isBlank(password) ? null : password; + return new JedisPool(jedisPoolConfig, host, port, timeout, pwd, database); } /**