From af16d4b63bafd5ac7ccabdabc6a8017abf081759 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 01 八月 2019 16:35:15 +0800
Subject: [PATCH] 优化 添加房屋选择小区楼后，在添加时 floorId 无法覆盖的问题
---
java110-cacheAgent/src/main/java/com/java110/cache/RedisConfiguration.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/java110-cacheAgent/src/main/java/com/java110/cache/RedisConfiguration.java b/java110-cacheAgent/src/main/java/com/java110/cache/RedisConfiguration.java
index d8668b0..760c68f 100644
--- a/java110-cacheAgent/src/main/java/com/java110/cache/RedisConfiguration.java
+++ b/java110-cacheAgent/src/main/java/com/java110/cache/RedisConfiguration.java
@@ -6,6 +6,7 @@
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;
@@ -19,8 +20,19 @@
@Autowired
public JedisPool jedisPool(@Qualifier("jedis.pool.config") JedisPoolConfig config,
@Value("${jedis.pool.host}")String host,
- @Value("${jedis.pool.port}")int port) {
- return new JedisPool(config, host, port);
+ @Value("${jedis.pool.port}")int port,
+ @Value("${jedis.pool.timeout}")int timeout,
+ @Value("${jedis.pool.password}") String password) {
+ //娌℃湁閰嶇疆鏀逛负榛樿鍊�
+ if(timeout == 0){
+ timeout = 2000;
+ }
+
+ if(StringUtils.isEmpty(password)) {
+ return new JedisPool(config, host, port,timeout);
+ }else{
+ return new JedisPool(config,host,port,timeout,password);
+ }
}
@Bean(name= "jedis.pool.config")
--
Gitblit v1.8.0