From d470e9a6938dee78e2724d20f7f8d3c2b5043808 Mon Sep 17 00:00:00 2001
From: blankhang <blankhang@gmail.com>
Date: Fri, 29 Sep 2023 16:28:06 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20qidian=E6=A8=A1=E5=9D=97starter?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=80=82=E9=85=8Dspringboot3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 2 +-
 .../qidian/config/WxQidianStorageAutoConfiguration.java  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 975da84f6..7d67b19c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,7 +280,7 @@
       <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
-        <version>3.3.0</version>
+        <version>4.3.2</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
diff --git a/spring-boot-starters/wx-java-qidian-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java b/spring-boot-starters/wx-java-qidian-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java
index 84163b005..80809fefc 100644
--- a/spring-boot-starters/wx-java-qidian-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-qidian-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java
@@ -21,9 +21,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolAbstract;
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.JedisSentinelPool;
+import redis.clients.jedis.util.Pool;
 
 import java.util.Set;
 
@@ -80,7 +80,7 @@ public class WxQidianStorageAutoConfiguration {
   }
 
   private WxQidianConfigStorage jedisConfigStorage() {
-    JedisPoolAbstract jedisPool;
+    Pool jedisPool;
     if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) {
       jedisPool = getJedisPool();
     } else {
@@ -136,7 +136,7 @@ public class WxQidianStorageAutoConfiguration {
     }
   }
 
-  private JedisPoolAbstract getJedisPool() {
+  private Pool getJedisPool() {
     WxQidianProperties.ConfigStorage storage = wxQidianProperties.getConfigStorage();
     RedisProperties redis = storage.getRedis();
 
@@ -156,8 +156,9 @@ public class WxQidianStorageAutoConfiguration {
     config.setTestOnBorrow(true);
     config.setTestWhileIdle(true);
     if (StringUtils.isNotEmpty(redis.getSentinelIps())) {
+
       Set<String> sentinels = Sets.newHashSet(redis.getSentinelIps().split(","));
-      return new JedisSentinelPool(redis.getSentinelName(), sentinels);
+      return new JedisSentinelPool(redis.getSentinelName(), sentinels,config);
     }
 
     return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(),