From 38935637de34ea2465374529c9ee13a16efde667 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sat, 4 Aug 2018 16:12:00 +0800 Subject: [PATCH] upd --- .../src/main/java/com/simple/config/RedisConfig.java | 5 ++++- .../src/main/java/com/simple/config/ShiroConfig.java | 5 ++++- mallinkAdmin/src/main/resources/application-dev.yml | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java b/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java index b4187b35c..4c5551668 100644 --- a/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java +++ b/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java @@ -29,6 +29,9 @@ public class RedisConfig extends CachingConfigurerSupport { @Value("${spring.redis.pool.max-wait}") private long maxWaitMillis; + + @Value("${spring.redis.password}") + private String password; @Bean public JedisPool redisPoolFactory() { @@ -38,7 +41,7 @@ public class RedisConfig extends CachingConfigurerSupport { jedisPoolConfig.setMaxIdle(maxIdle); jedisPoolConfig.setMaxWaitMillis(maxWaitMillis); - JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout); + JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout,password); return jedisPool; } diff --git a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java index 8a23c2ce1..c5db6ea35 100644 --- a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java @@ -40,6 +40,9 @@ public class ShiroConfig { @Value("${spring.redis.expire}") private int expire; + + @Value("${spring.redis.password}") + private String password; @Bean public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() { @@ -170,7 +173,7 @@ public class ShiroConfig { redisManager.setPort(port); redisManager.setExpire(expire);// 配置缓存过期时间 redisManager.setTimeout(timeout); - // redisManager.setPassword(password); + redisManager.setPassword(password); return redisManager; } diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 1b8e7a0f8..ccf2ef864 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -24,8 +24,9 @@ spring: # REDIS redis: - host: 127.0.0.1 - port: 6379 + host: 202.165.179.86 + port: 6789 + password: JGtest123 timeout: 0 expire: 1800 #30分钟 pool: