github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

[代码优化](v2.6): 完善CacheKey中的变量命名以及调用 (#568) 

* correct variable name of String DATA_USER in CacheKey.java

* complete other CacheKey name

* add job CacheKey
pull/572/head
皆非 2021-01-17 14:43:45 +08:00 committed by GitHub
parent 9e6c5d6d96
commit 9fc0524901
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java
View File

@ -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:"; String MENU_USER = "menu::user:";
/** /**
* 角色授权 * 角色授权
@ -42,4 +43,16 @@ public interface CacheKey {
* 角色信息 * 角色信息
*/ */
String ROLE_ID = "role::id:"; String ROLE_ID = "role::id:";
/**
* 部门
*/
String DEPT_ID = "dept::id:";
/**
* 岗位
*/
String JOB_ID = "job::id:";
/**
* 数据字典
*/
String DICT_NAME = "dict::name:";
} }

4
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java
View File

@ -275,7 +275,7 @@ public class DeptServiceImpl implements DeptService {
public void delCaches(Long id){ public void delCaches(Long id){
List<User> users = userRepository.findByDeptRoleId(id); List<User> users = userRepository.findByDeptRoleId(id);
// 删除数据权限 // 删除数据权限
redisUtils.delByKeys("data::user:",users.stream().map(User::getId).collect(Collectors.toSet())); redisUtils.delByKeys(CacheKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
redisUtils.del("dept::id:" + id); redisUtils.del(CacheKey.DEPT_ID + id);
} }
} }

7
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java
View File

@ -20,10 +20,7 @@ import me.zhengjie.modules.system.domain.Dict;
import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.domain.DictDetail;
import me.zhengjie.modules.system.repository.DictRepository; import me.zhengjie.modules.system.repository.DictRepository;
import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria; import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria;
import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.*;
import me.zhengjie.utils.QueryHelp;
import me.zhengjie.utils.RedisUtils;
import me.zhengjie.utils.ValidationUtil;
import me.zhengjie.modules.system.repository.DictDetailRepository; import me.zhengjie.modules.system.repository.DictDetailRepository;
import me.zhengjie.modules.system.service.DictDetailService; import me.zhengjie.modules.system.service.DictDetailService;
import me.zhengjie.modules.system.service.dto.DictDetailDto; import me.zhengjie.modules.system.service.dto.DictDetailDto;
@ -93,6 +90,6 @@ public class DictDetailServiceImpl implements DictDetailService {
public void delCaches(DictDetail dictDetail){ public void delCaches(DictDetail dictDetail){
Dict dict = dictRepository.findById(dictDetail.getDict().getId()).orElseGet(Dict::new); Dict dict = dictRepository.findById(dictDetail.getDict().getId()).orElseGet(Dict::new);
redisUtils.del("dict::name:" + dict.getName()); redisUtils.del(CacheKey.DICT_NAME + dict.getName());
} }
} }

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
View File

@ -115,6 +115,6 @@ public class DictServiceImpl implements DictService {
} }
public void delCaches(Dict dict){ public void delCaches(Dict dict){
redisUtils.del("dict::name:" + dict.getName()); redisUtils.del(CacheKey.DICT_NAME + dict.getName());
} }
} }

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java
View File

@ -100,7 +100,7 @@ public class JobServiceImpl implements JobService {
public void delete(Set<Long> ids) { public void delete(Set<Long> ids) {
jobRepository.deleteAllByIdIn(ids); jobRepository.deleteAllByIdIn(ids);
// 删除缓存 // 删除缓存
redisUtils.delByKeys("job::id:", ids); redisUtils.delByKeys(CacheKey.JOB_ID, ids);
} }
@Override @Override

6
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
View File

@ -344,12 +344,12 @@ public class MenuServiceImpl implements MenuService {
*/ */
public void delCaches(Long id){ public void delCaches(Long id){
List<User> users = userRepository.findByMenuId(id); List<User> users = userRepository.findByMenuId(id);
redisUtils.del("menu::id:" +id); redisUtils.del(CacheKey.MENU_ID + id);
redisUtils.delByKeys("menu::user:",users.stream().map(User::getId).collect(Collectors.toSet())); redisUtils.delByKeys(CacheKey.MENU_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
// 清除 Role 缓存 // 清除 Role 缓存
List<Role> roles = roleService.findInMenuId(new ArrayList<Long>(){{ List<Role> roles = roleService.findInMenuId(new ArrayList<Long>(){{
add(id); 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()));
} }
} }

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
View File

@ -217,7 +217,7 @@ public class RoleServiceImpl implements RoleService {
if (CollectionUtil.isNotEmpty(users)) { if (CollectionUtil.isNotEmpty(users)) {
users.forEach(item -> userCacheClean.cleanUserCache(item.getUsername())); users.forEach(item -> userCacheClean.cleanUserCache(item.getUsername()));
Set<Long> userIds = users.stream().map(User::getId).collect(Collectors.toSet()); Set<Long> 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.MENU_USER, userIds);
redisUtils.delByKeys(CacheKey.ROLE_AUTH, userIds); redisUtils.delByKeys(CacheKey.ROLE_AUTH, userIds);
} }

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
View File

@ -115,7 +115,7 @@ public class UserServiceImpl implements UserService {
} }
// 如果用户的角色改变 // 如果用户的角色改变
if (!resources.getRoles().equals(user.getRoles())) { 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.MENU_USER + resources.getId());
redisUtils.del(CacheKey.ROLE_AUTH + resources.getId()); redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
} }