Merge pull request #21 from Edinjohn/master

修复Redis密码不为空的问题
dolyw · May 10, 2019 · 0987af4 · 0987af4
2 parents 55f76bf + b010212
commit 0987af4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/com/wang/config/redis/JedisConfig.java b/src/main/java/com/wang/config/redis/JedisConfig.java
@@ -1,5 +1,6 @@
 package com.wang.config.redis;
 
+import com.wang.util.common.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,7 +58,8 @@ public JedisPool redisPoolFactory() {
             jedisPoolConfig.setMaxTotal(maxActive);
             jedisPoolConfig.setMinIdle(minIdle);
             // JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password);
-            JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, null);
+            String pwd = StringUtil.isBlank(password) ? null : password;
+            JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, pwd);
             LOGGER.info("初始化Redis连接池JedisPool成功!地址: " + host + ":" + port);
             return jedisPool;
         } catch (Exception e) {