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

Merge branch 'master' of https://github.com/elunez/eladmin

pull/630/head
Zheng Jie 2021-03-20 14:21:20 +08:00
parent e1c434b854 3b802fd770
commit e0ea026d43
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java
View File

@ -27,6 +27,8 @@ import me.zhengjie.modules.system.service.dto.UserDto;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -41,6 +43,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
private final RoleService roleService; private final RoleService roleService;
private final DataService dataService; private final DataService dataService;
private final LoginProperties loginProperties; private final LoginProperties loginProperties;
public void setEnableCache(boolean enableCache) { public void setEnableCache(boolean enableCache) {
this.loginProperties.setCacheEnable(enableCache); this.loginProperties.setCacheEnable(enableCache);
} }
@ -58,6 +61,10 @@ public class UserDetailsServiceImpl implements UserDetailsService {
JwtUserDto jwtUserDto = null; JwtUserDto jwtUserDto = null;
if (loginProperties.isCacheEnable() && userDtoCache.containsKey(username)) { if (loginProperties.isCacheEnable() && userDtoCache.containsKey(username)) {
jwtUserDto = userDtoCache.get(username); jwtUserDto = userDtoCache.get(username);
// 检查dataScope是否修改
List<Long> dataScopes = jwtUserDto.getDataScopes();
dataScopes.clear();
dataScopes.addAll(dataService.getDeptIds(jwtUserDto.getUser()));
searchDb = false; searchDb = false;
} }
if (searchDb) { if (searchDb) {

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

@ -113,6 +113,8 @@ public class DeptServiceImpl implements DeptService {
resources.setSubCount(0); resources.setSubCount(0);
// 清理缓存 // 清理缓存
updateSubCnt(resources.getPid()); updateSubCnt(resources.getPid());
// 清理自定义角色权限的datascope缓存
delCaches(resources.getPid());
} }
@Override @Override