From cffeaee57e4bd7f4c7c1ec479a43952c3c84d728 Mon Sep 17 00:00:00 2001
From: zhuon <zhuonai@hotmail.com>
Date: Wed, 15 May 2019 16:39:14 +0800
Subject: [PATCH] =?UTF-8?q?redis=20databse=20=E5=80=BC=20=E5=9C=A8api/redi?=
 =?UTF-8?q?s=E6=8E=A5=E5=8F=A3=E4=B8=AD=E6=B2=A1=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/me/zhengjie/redis/RedisConfig.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 e52f589..6e536cc 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);
     }
 
     /**
-- 
GitLab