github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

!2 redis databse 值 在api/redis接口中没生效 

Merge pull request !2 from Edin/master
pull/127/head
Edin 2019-05-16 10:47:42 +08:00 committed by Elune
parent 83fe8fabaa cffeaee57e
commit 31e4a08a31
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java
View File

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