BitFact
diff --git a/‎springboot-jedis-sample/pom.xml‎
Lines changed: 17 additions & 1 deletion b/‎springboot-jedis-sample/pom.xml‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎springboot-jedis-sample/src/main/java/com/ipman/springboot/redis/jedis/sample/SpringbootJedisSampleApplication.java‎
Lines changed: 7 additions & 1 deletion b/‎springboot-jedis-sample/src/main/java/com/ipman/springboot/redis/jedis/sample/SpringbootJedisSampleApplication.java‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎springboot-jedis-sample/src/main/java/com/ipman/springboot/redis/jedis/sample/config/RedisConfig.java‎
Lines changed: 11 additions & 10 deletions b/‎springboot-jedis-sample/src/main/java/com/ipman/springboot/redis/jedis/sample/config/RedisConfig.java‎
Lines changed: 11 additions & 10 deletions
@@ -30,17 +30,33 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>2.9.0</version>
+			<version>2.6.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
+			<version>2.6.2</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
 
@@ -2,12 +2,18 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+import javax.annotation.processing.SupportedSourceVersion;
 
 @SpringBootApplication
 public class SpringbootJedisSampleApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SpringbootJedisSampleApplication.class, args);
+		ApplicationContext context = SpringApplication.run(SpringbootJedisSampleApplication.class, args);
 	}
 
 }
@@ -1,6 +1,7 @@
 package com.ipman.springboot.redis.jedis.sample.config;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import redis.clients.jedis.JedisPool;
@@ -36,17 +37,17 @@ public class RedisConfig {
     private String password;
 
     @Value("${spring.redis.block-when-exhausted}")
-    private boolean  blockWhenExhausted;
+    private boolean blockWhenExhausted;
 
     @Bean
-    public JedisPool redisPoolFactory()  throws Exception{
-        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
-        jedisPoolConfig.setMaxIdle(maxIdle);
-        jedisPoolConfig.setMaxWaitMillis(maxWaitMillis);
-        // 连接耗尽时是否阻塞, false报异常,ture阻塞直到超时, 默认true
-        jedisPoolConfig.setBlockWhenExhausted(blockWhenExhausted);
-        // 是否启用pool的jmx管理功能, 默认true
-        jedisPoolConfig.setJmxEnabled(true);
-        return new JedisPool(jedisPoolConfig, host, port, timeout, password);
+    @ConfigurationProperties("redis")
+    public JedisPoolConfig jedisPoolConfig() {
+        return new JedisPoolConfig();
+    }
+
+    @Bean(destroyMethod = "close")
+    public JedisPool jedisPool() {
+        JedisPool jedisPool = new JedisPool(jedisPoolConfig(), host, port, timeout * 1000);
+        return jedisPool;
     }
 }