From 7ae0a1d3f604b29dc42e4379ec72cfd1833915a9 Mon Sep 17 00:00:00 2001 From: zhengjie <201507802@qq.com> Date: Mon, 28 Dec 2020 11:57:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?= =?UTF-8?q?)=EF=BC=9Aupdate=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 26a795e4..acadc51b 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,11 @@ **账号密码：** `admin / 123456` +#### 活动福利 + +- 七牛云 2021 ECUG Con 全球技术大会内部票：给大家一共搞来五张小一千块钱的内部票。想要的加群【947578238】联系群主 +- 七牛云 2021 ECUG Con 全球技术大会早鸟特惠票：[http://www.huodongxing.com/event/1573487912300?coupon=EL666](点我抢购) + #### 项目源码 | | 后端源码 | 前端源码 | From 9e6c5d6d96d09182e87b9d4be21c7a31804f0f2a Mon Sep 17 00:00:00 2001 From: zhengjie <201507802@qq.com> Date: Mon, 28 Dec 2020 11:58:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?= =?UTF-8?q?)=EF=BC=9Aupdate=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index acadc51b..2c67d23f 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ #### 活动福利 - 七牛云 2021 ECUG Con 全球技术大会内部票：给大家一共搞来五张小一千块钱的内部票。想要的加群【947578238】联系群主 -- 七牛云 2021 ECUG Con 全球技术大会早鸟特惠票：[http://www.huodongxing.com/event/1573487912300?coupon=EL666](点我抢购) +- 七牛云 2021 ECUG Con 全球技术大会早鸟特惠票：[点我抢购](http://www.huodongxing.com/event/1573487912300?coupon=EL666) #### 项目源码 From 9fc052490159b2a586ed5878b1623108967cdf61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=86=E9=9D=9E?= <53246310+jie-fei30@users.noreply.github.com> Date: Sun, 17 Jan 2021 14:43:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?= =?UTF-8?q?):=20=E5=AE=8C=E5=96=84CacheKey=E4=B8=AD=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=91=BD=E5=90=8D=E4=BB=A5=E5=8F=8A=E8=B0=83=E7=94=A8?= =?UTF-8?q?=20(#568)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * correct variable name of String DATA_USER in CacheKey.java * complete other CacheKey name * add job CacheKey --- .../src/main/java/me/zhengjie/utils/CacheKey.java | 15 ++++++++++++++- .../system/service/impl/DeptServiceImpl.java | 4 ++-- .../service/impl/DictDetailServiceImpl.java | 7 ++----- .../system/service/impl/DictServiceImpl.java | 2 +- .../system/service/impl/JobServiceImpl.java | 2 +- .../system/service/impl/MenuServiceImpl.java | 6 +++--- .../system/service/impl/RoleServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 2 +- 8 files changed, 25 insertions(+), 15 deletions(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java b/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java index d1b4810b..7485713f 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java @@ -29,10 +29,11 @@ public interface CacheKey { /** * 数据 */ - String DATE_USER = "data::user:"; + String DATA_USER = "data::user:"; /** * 菜单 */ + String MENU_ID = "menu::id:"; String MENU_USER = "menu::user:"; /** * 角色授权 @@ -42,4 +43,16 @@ public interface CacheKey { * 角色信息 */ String ROLE_ID = "role::id:"; + /** + * 部门 + */ + String DEPT_ID = "dept::id:"; + /** + * 岗位 + */ + String JOB_ID = "job::id:"; + /** + * 数据字典 + */ + String DICT_NAME = "dict::name:"; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java index 1fc7dfef..12c13fed 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java @@ -275,7 +275,7 @@ public class DeptServiceImpl implements DeptService { public void delCaches(Long id){ List users = userRepository.findByDeptRoleId(id); // 删除数据权限 - redisUtils.delByKeys("data::user:",users.stream().map(User::getId).collect(Collectors.toSet())); - redisUtils.del("dept::id:" + id); + redisUtils.delByKeys(CacheKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet())); + redisUtils.del(CacheKey.DEPT_ID + id); } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java index 05d42e3f..3f5fc742 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java @@ -20,10 +20,7 @@ import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.repository.DictRepository; import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; -import me.zhengjie.utils.RedisUtils; -import me.zhengjie.utils.ValidationUtil; +import me.zhengjie.utils.*; import me.zhengjie.modules.system.repository.DictDetailRepository; import me.zhengjie.modules.system.service.DictDetailService; import me.zhengjie.modules.system.service.dto.DictDetailDto; @@ -93,6 +90,6 @@ public class DictDetailServiceImpl implements DictDetailService { public void delCaches(DictDetail dictDetail){ Dict dict = dictRepository.findById(dictDetail.getDict().getId()).orElseGet(Dict::new); - redisUtils.del("dict::name:" + dict.getName()); + redisUtils.del(CacheKey.DICT_NAME + dict.getName()); } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java index 0f64bc7f..b6429d25 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java @@ -115,6 +115,6 @@ public class DictServiceImpl implements DictService { } public void delCaches(Dict dict){ - redisUtils.del("dict::name:" + dict.getName()); + redisUtils.del(CacheKey.DICT_NAME + dict.getName()); } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java index b881b422..f98782ce 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java @@ -100,7 +100,7 @@ public class JobServiceImpl implements JobService { public void delete(Set ids) { jobRepository.deleteAllByIdIn(ids); // 删除缓存 - redisUtils.delByKeys("job::id:", ids); + redisUtils.delByKeys(CacheKey.JOB_ID, ids); } @Override diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java index e4656a63..c7e45499 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java @@ -344,12 +344,12 @@ public class MenuServiceImpl implements MenuService { */ public void delCaches(Long id){ List users = userRepository.findByMenuId(id); - redisUtils.del("menu::id:" +id); - redisUtils.delByKeys("menu::user:",users.stream().map(User::getId).collect(Collectors.toSet())); + redisUtils.del(CacheKey.MENU_ID + id); + redisUtils.delByKeys(CacheKey.MENU_USER, users.stream().map(User::getId).collect(Collectors.toSet())); // 清除 Role 缓存 List roles = roleService.findInMenuId(new ArrayList(){{ add(id); }}); - redisUtils.delByKeys("role::id:",roles.stream().map(Role::getId).collect(Collectors.toSet())); + redisUtils.delByKeys(CacheKey.ROLE_ID, roles.stream().map(Role::getId).collect(Collectors.toSet())); } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java index 4cfbc21f..f8690229 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java @@ -217,7 +217,7 @@ public class RoleServiceImpl implements RoleService { if (CollectionUtil.isNotEmpty(users)) { users.forEach(item -> userCacheClean.cleanUserCache(item.getUsername())); Set userIds = users.stream().map(User::getId).collect(Collectors.toSet()); - redisUtils.delByKeys(CacheKey.DATE_USER, userIds); + redisUtils.delByKeys(CacheKey.DATA_USER, userIds); redisUtils.delByKeys(CacheKey.MENU_USER, userIds); redisUtils.delByKeys(CacheKey.ROLE_AUTH, userIds); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index 145b8af7..f40e51f5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -115,7 +115,7 @@ public class UserServiceImpl implements UserService { } // 如果用户的角色改变 if (!resources.getRoles().equals(user.getRoles())) { - redisUtils.del(CacheKey.DATE_USER + resources.getId()); + redisUtils.del(CacheKey.DATA_USER + resources.getId()); redisUtils.del(CacheKey.MENU_USER + resources.getId()); redisUtils.del(CacheKey.ROLE_AUTH + resources.getId()); }