From 182edef28a7b1d1d980687b17a7fe3a127a2a0ca Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 九月 2021 13:20:24 +0800
Subject: [PATCH] update 所有业务适配 RedisUtils 新工具

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java |   27 ++++++---------------------
 1 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java
index 633a0b5..51b9ec3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java
@@ -1,7 +1,7 @@
 package com.ruoyi.common.core.mybatisplus.cache;
 
 import cn.hutool.extra.spring.SpringUtil;
-import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.cache.Cache;
 import org.springframework.data.redis.connection.RedisServerCommands;
@@ -25,8 +25,6 @@
 
 	private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock(true);
 
-	private RedisCache redisCache;
-
 	private String id;
 
 	public MybatisPlusRedisCache(final String id) {
@@ -43,23 +41,16 @@
 
 	@Override
 	public void putObject(Object key, Object value) {
-		if (redisCache == null) {
-			redisCache = SpringUtil.getBean(RedisCache.class);
-		}
 		if (value != null) {
-			redisCache.setCacheObject(key.toString(), value);
+			RedisUtils.setCacheObject(key.toString(), value);
 		}
 	}
 
 	@Override
 	public Object getObject(Object key) {
-		if (redisCache == null) {
-			//鐢变簬鍚姩鏈熼棿娉ㄥ叆澶辫触锛屽彧鑳借繍琛屾湡闂存敞鍏ワ紝杩欐浠g爜鍙互鍒犻櫎
-			redisCache = SpringUtil.getBean(RedisCache.class);
-		}
 		try {
 			if (key != null) {
-				return redisCache.getCacheObject(key.toString());
+				return RedisUtils.getCacheObject(key.toString());
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -70,11 +61,8 @@
 
 	@Override
 	public Object removeObject(Object key) {
-		if (redisCache == null) {
-			redisCache = SpringUtil.getBean(RedisCache.class);
-		}
 		if (key != null) {
-			redisCache.deleteObject(key.toString());
+			RedisUtils.deleteObject(key.toString());
 		}
 		return null;
 	}
@@ -82,12 +70,9 @@
 	@Override
 	public void clear() {
 		log.debug("娓呯┖缂撳瓨");
-		if (redisCache == null) {
-			redisCache = SpringUtil.getBean(RedisCache.class);
-		}
-		Collection<String> keys = redisCache.keys("*:" + this.id + "*");
+		Collection<String> keys = RedisUtils.keys("*:" + this.id + "*");
 		if (!CollectionUtils.isEmpty(keys)) {
-			redisCache.deleteObject(keys);
+			RedisUtils.deleteObject(keys);
 		}
 	}
 

--
Gitblit v1.9.3