From 91f58ac34a01db7bb4e30a57af4454e0c36fd1c9 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 14 六月 2020 13:06:21 +0800
Subject: [PATCH] 处理服务启动失败问题
---
java110-core/src/main/java/com/java110/core/cache/RedisConfiguration.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/cache/RedisConfiguration.java b/java110-core/src/main/java/com/java110/core/cache/RedisConfiguration.java
index f18747f..8ccf8e3 100644
--- a/java110-core/src/main/java/com/java110/core/cache/RedisConfiguration.java
+++ b/java110-core/src/main/java/com/java110/core/cache/RedisConfiguration.java
@@ -1,15 +1,12 @@
package com.java110.core.cache;
-import com.java110.core.factory.AppFactory;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
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,12 +16,23 @@
@Configuration
public class RedisConfiguration extends CachingConfigurerSupport {
- @Bean(name= "jedis.pool")
+ @Bean(name= "jedisPool")
@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