jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 所有业务适配 RedisUtils 新工具

Browse Source
This commit is contained in:
疯狂的狮子li
2021-09-07 13:20:24 +08:00
parent 97cffa048e
commit 182edef28a
13 changed files with 58 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java vendored
View File

@ -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 @@ public class MybatisPlusRedisCache implements Cache {
private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock(true);
private RedisCache redisCache;
private String id;
public MybatisPlusRedisCache(final String id) {
@ -43,23 +41,16 @@ public class MybatisPlusRedisCache implements Cache {
@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) {
//由于启动期间注入失败，只能运行期间注入，这段代码可以删除
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 @@ public class MybatisPlusRedisCache implements Cache {
@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 @@ public class MybatisPlusRedisCache implements Cache {
@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);
}
}

12
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
View File

@ -3,8 +3,6 @@ package com.ruoyi.common.utils;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.spring.SpringUtils;
import java.util.Collection;
import java.util.List;
@ -29,7 +27,7 @@ public class DictUtils
*/
public static void setDictCache(String key, List<SysDictData> dictDatas)
{
SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas);
RedisUtils.setCacheObject(getCacheKey(key), dictDatas);
}
/**
@ -40,7 +38,7 @@ public class DictUtils
*/
public static List<SysDictData> getDictCache(String key)
{
Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
Object cacheObj = RedisUtils.getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(cacheObj))
{
List<SysDictData> dictDatas = (List<SysDictData>)cacheObj;
@ -160,7 +158,7 @@ public class DictUtils
*/
public static void removeDictCache(String key)
{
SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key));
RedisUtils.deleteObject(getCacheKey(key));
}
/**
@ -168,8 +166,8 @@ public class DictUtils
*/
public static void clearDictCache()
{
Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*");
SpringUtils.getBean(RedisCache.class).deleteObject(keys);
Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*");
RedisUtils.deleteObject(keys);
}
/**