From efd9ac5b88dfdb3c4d2e4bcc5e7a5258aa55542c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 21 四月 2025 20:29:15 +0800
Subject: [PATCH] 更换缓存连接方式

---
 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java |  145 ++++--------------------------------------------
 1 files changed, 13 insertions(+), 132 deletions(-)

diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
index 82190c1..2e15fec 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
@@ -1,23 +1,12 @@
 package com.stylefeng.guns.modular.system.util;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.stylefeng.guns.core.util.ToolUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
-import org.springframework.web.client.RestTemplate;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Pipeline;
-
-import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -27,9 +16,8 @@
 public class RedisUtil {
     
     @Autowired
-    private JedisPool jedisPool;
+    private RedisTemplate redisTemplate;
     
-    private Timer timer;
     
     
     /**
@@ -39,9 +27,7 @@
      */
     public void setStrValue(String key, String value){
         if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){
-            Jedis resource = jedisPool.getResource();
-            String set = resource.set(key, value);
-            closeJedis(resource);
+            redisTemplate.opsForValue().set(key, value);
         }
     }
     
@@ -54,9 +40,7 @@
      */
     public void setStrValue(String key, String value, int time){
         if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){
-            Jedis resource = jedisPool.getResource();
-            String setex = resource.setex(key, time, value);
-            closeJedis(resource);
+            redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
         }
     }
     
@@ -68,46 +52,15 @@
      */
     public String getValue(String key){
         if(ToolUtil.isNotEmpty(key)){
-            Jedis resource = jedisPool.getResource();
-            String data = resource.get(key);
-            closeJedis(resource);
-            return data;
+            System.err.println("查询缓存:" + key);
+            Object o = redisTemplate.opsForValue().get(key);
+            System.err.println(o);
+            return (String) o;
         }
         return null;
     }
     
-    
-    /**
-     * 批量获取
-     * @param kes
-     * @return
-     */
-    public List<Object> getValues(List<String> kes){
-        if(null != kes){
-            Jedis 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();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            List<Object> data = new ArrayList<>();
-            for(Object o : list){
-                if(null != o){
-                    data.add(o);
-                }
-            }
-            return data;
-        }
-        return null;
-    }
+
     
     
     /**
@@ -116,66 +69,14 @@
      */
     public void remove(String key){
         if(ToolUtil.isNotEmpty(key)){
-            Jedis resource = jedisPool.getResource();
-            Long del = resource.del(key);
-            closeJedis(resource);
+            redisTemplate.delete(key);
         }
     }
     
     
-    /**
-     * 向集合key添加数据
-     * @param key
-     * @param members
-     */
-    public void addSetValue(String key, String...members){
-        if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(members)){
-            Jedis resource = jedisPool.getResource();
-            Long sadd = resource.sadd(key, members);
-            resource.close();
-        }
-    }
     
     
-    /**
-     * 返回Set集合数据
-     * @param key
-     * @return
-     */
-    public Set<String> getSetAllValue(String key){
-        Set<String> smembers = new HashSet<>();
-        if(ToolUtil.isNotEmpty(key)){
-            Jedis resource = jedisPool.getResource();
-            smembers = resource.smembers(key);
-            resource.close();
-        }
-        return smembers;
-    }
     
-    
-    /**
-     * 删除Set集合中的值
-     * @param key
-     * @param members
-     */
-    public void delSetValue(String key, String...members){
-        if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(members)){
-            Jedis resource = jedisPool.getResource();
-            Long sadd = resource.srem(key, members);
-            resource.close();
-        }
-    }
-    
-    
-    /**
-     * 删除资源
-     * @param jedis
-     */
-    public void closeJedis(Jedis jedis){
-        if(null != jedis){
-            jedis.close();
-        }
-    }
     
     
     /**
@@ -188,23 +89,7 @@
     public boolean lock(String key, String value, int time){
         if(!StringUtils.isEmpty(key)){
             key += "_lock";
-            Jedis resource = jedisPool.getResource();
-            String set = resource.set(key, value, "nx", "ex", time);
-            if("OK".equals(set)){
-                String finalKey = key;
-                timer = new Timer();
-                timer.schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        System.err.println("定时任务启动");
-                        Jedis resource = jedisPool.getResource();
-                        resource.setex(finalKey, time, value);
-                        resource.close();
-                    }
-                }, 1000, 500);
-            }
-            resource.close();
-            return "OK".equals(set) ? true : false;
+            return redisTemplate.opsForValue().setIfAbsent(key, value);
         }
         return false;
     }
@@ -234,11 +119,7 @@
     public boolean unlock(String key){
         if(!StringUtils.isEmpty(key)){
             key += "_lock";
-            Jedis resource = jedisPool.getResource();
-            timer.cancel();//取消定时任务
-            Long del = resource.del(key);
-            resource.close();
-            return del != 0 ? true : false;
+            return redisTemplate.delete(key);
         }
         return false;
     }

--
Gitblit v1.7.1