From 3f367b7d7ee0f2297dc1e6ae7b181c74680b942b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 18:03:13 +0800
Subject: [PATCH] 修改redis连接问题

---
 ZuulAHTravel/src/main/java/com/sinata/zuul/util/RedisUtil.java     |   51 +++++++++++++------------
 ZuulAHTravel/src/main/resources/redis.properties                   |   11 -----
 ZuulAHTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java |    1 
 3 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/ZuulAHTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java b/ZuulAHTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java
index 895ffce..2e1d546 100644
--- a/ZuulAHTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java
+++ b/ZuulAHTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java
@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
diff --git a/ZuulAHTravel/src/main/java/com/sinata/zuul/util/RedisUtil.java b/ZuulAHTravel/src/main/java/com/sinata/zuul/util/RedisUtil.java
index 44bca09..c1cc4ee 100644
--- a/ZuulAHTravel/src/main/java/com/sinata/zuul/util/RedisUtil.java
+++ b/ZuulAHTravel/src/main/java/com/sinata/zuul/util/RedisUtil.java
@@ -19,6 +19,8 @@
 
     @Autowired
     private JedisPool jedisPool;
+    
+    private Jedis resource;
 
 
     /**
@@ -28,9 +30,10 @@
      */
     public void setStrValue(String key, String value){
         if(StringUtil.isNotEmpty(key)){
-            Jedis resource = jedisPool.getResource();
+            if(null == resource || !resource.isConnected()){
+                resource = jedisPool.getResource();
+            }
             String set = resource.set(key, value);
-            closeJedis(resource);
         }
     }
 
@@ -43,9 +46,10 @@
      */
     public void setStrValue(String key, String value, int time){
         if(StringUtil.isNotEmpty(key)){
-            Jedis resource = jedisPool.getResource();
+            if(null == resource || !resource.isConnected()){
+                resource = jedisPool.getResource();
+            }
             String setex = resource.setex(key, time, value);
-            closeJedis(resource);
         }
     }
 
@@ -57,9 +61,10 @@
      */
     public String getValue(String key){
         if(StringUtil.isNotEmpty(key)){
-            Jedis resource = jedisPool.getResource();
+            if(null == resource || !resource.isConnected()){
+                resource = jedisPool.getResource();
+            }
             String data = resource.get(key);
-            closeJedis(resource);
             return data;
         }
         return null;
@@ -73,14 +78,15 @@
      */
     public List<Object> getValues(List<String> kes){
         if(null != kes){
-            Jedis resource = jedisPool.getResource();
+            if(null == resource || !resource.isConnected()){
+                resource = jedisPool.getResource();
+            }
             Pipeline pipelined = resource.pipelined();
             for(String key : kes){
                 pipelined.get(key);
             }
             List<Object> list = pipelined.syncAndReturnAll();
 
-            closeJedis(resource);
             pipelined.clear();
             try {
                 pipelined.close();
@@ -104,9 +110,10 @@
      * @param value
      */
     public void addListRight(String key, String value){
-        Jedis resource = jedisPool.getResource();
+        if(null == resource || !resource.isConnected()){
+            resource = jedisPool.getResource();
+        }
         resource.rpush(key, value);
-        closeJedis(resource);
     }
     
     /**
@@ -115,9 +122,10 @@
      * @param value
      */
     public void addListLeft(String key, String value){
-        Jedis resource = jedisPool.getResource();
+        if(null == resource || !resource.isConnected()){
+            resource = jedisPool.getResource();
+        }
         resource.lpush(key, value);
-        closeJedis(resource);
     }
     
     
@@ -127,7 +135,9 @@
      * @return
      */
     public String getListFirstValue(String key){
-        Jedis resource = jedisPool.getResource();
+        if(null == resource || !resource.isConnected()){
+            resource = jedisPool.getResource();
+        }
         String lpop = resource.lpop(key);
         return lpop;
     }
@@ -140,20 +150,13 @@
      */
     public void remove(String key){
         if(StringUtil.isNotEmpty(key)){
-            Jedis resource = jedisPool.getResource();
+            if(null == resource || !resource.isConnected()){
+                resource = jedisPool.getResource();
+            }
             Long del = resource.del(key);
-            closeJedis(resource);
         }
     }
 
 
-    /**
-     * 删除资源
-     * @param jedis
-     */
-    public void closeJedis(Jedis jedis){
-        if(null != jedis){
-            jedis.close();
-        }
-    }
+
 }
diff --git a/ZuulAHTravel/src/main/resources/redis.properties b/ZuulAHTravel/src/main/resources/redis.properties
index 6314ab4..095a9fb 100644
--- a/ZuulAHTravel/src/main/resources/redis.properties
+++ b/ZuulAHTravel/src/main/resources/redis.properties
@@ -1,21 +1,10 @@
-#redis���ÿ�ʼ
-# Redis���ݿ�������Ĭ��Ϊ0��
 spring.redis.database=0
-# Redis��������ַ
 spring.redis.host=127.0.0.1
-# Redis���������Ӷ˿�
 spring.redis.port=6379
-# Redis�������������루Ĭ��Ϊ�գ�
 spring.redis.password=123456
-# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
 spring.redis.jedis.pool.max-active=1024
-# ���ӳ���������ȴ�ʱ�䣨ʹ�ø�ֵ��ʾû�����ƣ�
 spring.redis.jedis.pool.max-wait=10000
-# ���ӳ��е�����������
 spring.redis.jedis.pool.max-idle=200
-# ���ӳ��е���С��������
 spring.redis.jedis.pool.min-idle=50
-# ���ӳ�ʱʱ�䣨���룩
 spring.redis.timeout=10000
-#redis���ý���
 spring.redis.block-when-exhausted=true
\ No newline at end of file

--
Gitblit v1.7.1