From 4c78bad14f01af80be0a189937344153f2a3589b Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 5 Apr 2023 11:45:23 +0800 Subject: [PATCH] =?UTF-8?q?[issue/4358]springCache=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=BC=93=E5=AD=98=E7=9A=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BA=86=E2=80=9Ckeys=E2=80=9D=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictController.java | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java index a722278e..c2ef4f29 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CacheConstant; @@ -19,10 +18,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictQuery; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.ImportExcelUtil; -import org.jeecg.common.util.SqlInjectionUtil; -import org.jeecg.common.util.TokenUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.*; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.system.entity.SysDict; import org.jeecg.modules.system.entity.SysDictItem; @@ -73,6 +69,8 @@ public class SysDictController { public RedisTemplate redisTemplate; @Autowired private DictQueryBlackListHandler dictQueryBlackListHandler; + @Autowired + private RedisUtil redisUtil; @RequestMapping(value = "/list", method = RequestMethod.GET) public Result> queryPageList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -459,22 +457,33 @@ public class SysDictController { public Result refleshCache() { Result result = new Result(); //清空字典缓存 - Set keys = redisTemplate.keys(CacheConstant.SYS_DICT_CACHE + "*"); - Set keys7 = redisTemplate.keys(CacheConstant.SYS_ENABLE_DICT_CACHE + "*"); - Set keys2 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_CACHE + "*"); - Set keys21 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE + "*"); - Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*"); - Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*"); - Set keys5 = redisTemplate.keys( "jmreport:cache:dict*"); - Set keys6 = redisTemplate.keys( "jmreport:cache:dictTable*"); - redisTemplate.delete(keys); - redisTemplate.delete(keys2); - redisTemplate.delete(keys21); - redisTemplate.delete(keys3); - redisTemplate.delete(keys4); - redisTemplate.delete(keys5); - redisTemplate.delete(keys6); - redisTemplate.delete(keys7); +// Set keys = redisTemplate.keys(CacheConstant.SYS_DICT_CACHE + "*"); +// Set keys7 = redisTemplate.keys(CacheConstant.SYS_ENABLE_DICT_CACHE + "*"); +// Set keys2 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_CACHE + "*"); +// Set keys21 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE + "*"); +// Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*"); +// Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*"); +// Set keys5 = redisTemplate.keys( "jmreport:cache:dict*"); +// Set keys6 = redisTemplate.keys( "jmreport:cache:dictTable*"); +// redisTemplate.delete(keys); +// redisTemplate.delete(keys2); +// redisTemplate.delete(keys21); +// redisTemplate.delete(keys3); +// redisTemplate.delete(keys4); +// redisTemplate.delete(keys5); +// redisTemplate.delete(keys6); +// redisTemplate.delete(keys7); + + //update-begin-author:liusq date:20230404 for: [issue/4358]springCache中的清除缓存的操作使用了“keys” + redisUtil.removeAll(CacheConstant.SYS_DICT_CACHE); + redisUtil.removeAll(CacheConstant.SYS_ENABLE_DICT_CACHE); + redisUtil.removeAll(CacheConstant.SYS_DICT_TABLE_CACHE); + redisUtil.removeAll(CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE); + redisUtil.removeAll(CacheConstant.SYS_DEPARTS_CACHE); + redisUtil.removeAll(CacheConstant.SYS_DEPART_IDS_CACHE); + redisUtil.removeAll("jmreport:cache:dict"); + redisUtil.removeAll("jmreport:cache:dictTable"); + //update-end-author:liusq date:20230404 for: [issue/4358]springCache中的清除缓存的操作使用了“keys” return result; }