admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update LoginUser 增加角色缓存 优化角色权限代码

Browse Source
This commit is contained in:
疯狂的狮子li 2021-12-03 19:25:38 +08:00
parent d4f49b10d7
commit 8b9d3541dd
4 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
View File

@ -108,7 +108,7 @@ public class SysRoleController extends BaseController {
LoginUser loginUser = getLoginUser(); LoginUser loginUser = getLoginUser();
SysUser sysUser = userService.selectUserById(loginUser.getUserId()); SysUser sysUser = userService.selectUserById(loginUser.getUserId());
if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) { if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) {
loginUser.setPermissions(permissionService.getMenuPermission(sysUser)); loginUser.setMenuPermissions(permissionService.getMenuPermission(sysUser));
tokenService.setLoginUser(loginUser); tokenService.setLoginUser(loginUser);
} }
return AjaxResult.success(); return AjaxResult.success();

23
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
View File

@ -69,9 +69,14 @@ public class LoginUser implements UserDetails {
private String os; private String os;
/** /**
* 权限列表 * 菜单权限
*/ */
private Set<String> permissions; private Set<String> menuPermissions;
/**
* 角色权限
*/
private Set<String> rolePermissions;
/** /**
* 用户名 * 用户名
@ -83,20 +88,6 @@ public class LoginUser implements UserDetails {
*/ */
private String password; private String password;
public LoginUser(String username, String password, Set<String> permissions) {
this.username = username;
this.password = password;
this.permissions = permissions;
}
public LoginUser(Long userId, Long deptId, String username, String password, Set<String> permissions) {
this.userId = userId;
this.deptId = deptId;
this.username = username;
this.password = password;
this.permissions = permissions;
}
@JsonIgnore @JsonIgnore
@Override @Override
public String getPassword() { public String getPassword() {

29
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
View File

@ -1,12 +1,8 @@
package com.ruoyi.framework.web.service; package com.ruoyi.framework.web.service;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@ -44,10 +40,10 @@ public class PermissionService {
return false; return false;
} }
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) { if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getMenuPermissions())) {
return false; return false;
} }
return hasPermissions(loginUser.getPermissions(), permission); return hasPermissions(loginUser.getMenuPermissions(), permission);
} }
/** /**
@ -71,10 +67,10 @@ public class PermissionService {
return false; return false;
} }
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) { if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getMenuPermissions())) {
return false; return false;
} }
Set<String> authorities = loginUser.getPermissions(); Set<String> authorities = loginUser.getMenuPermissions();
for (String permission : permissions.split(PERMISSION_DELIMETER)) { for (String permission : permissions.split(PERMISSION_DELIMETER)) {
if (permission != null && hasPermissions(authorities, permission)) { if (permission != null && hasPermissions(authorities, permission)) {
return true; return true;
@ -97,12 +93,11 @@ public class PermissionService {
if (StringUtils.isNull(loginUser)) { if (StringUtils.isNull(loginUser)) {
return false; return false;
} }
SysUser sysUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId()); Set<String> rolePermissions = loginUser.getRolePermissions();
if (CollectionUtils.isEmpty(sysUser.getRoles())) { if (CollectionUtils.isEmpty(rolePermissions)) {
return false; return false;
} }
for (SysRole sysRole : sysUser.getRoles()) { for (String roleKey : rolePermissions) {
String roleKey = sysRole.getRoleKey();
if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) { if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) {
return true; return true;
} }
@ -134,13 +129,15 @@ public class PermissionService {
if (StringUtils.isNull(loginUser)) { if (StringUtils.isNull(loginUser)) {
return false; return false;
} }
SysUser sysUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId()); Set<String> rolePermissions = loginUser.getRolePermissions();
if (CollectionUtils.isEmpty(sysUser.getRoles())) { if (CollectionUtils.isEmpty(rolePermissions)) {
return false; return false;
} }
for (String role : roles.split(ROLE_DELIMETER)) { for (String role : roles.split(ROLE_DELIMETER)) {
if (hasRole(role)) { for (String roleKey : rolePermissions) {
return true; if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) {
return true;
}
} }
} }
return false; return false;

8
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
View File

@ -47,6 +47,12 @@ public class UserDetailsServiceImpl implements UserDetailsService {
} }
public UserDetails createLoginUser(SysUser user) { public UserDetails createLoginUser(SysUser user) {
return new LoginUser(user.getUserId(), user.getDeptId(), user.getUserName(), user.getPassword(), permissionService.getMenuPermission(user)); return new LoginUser()
.setUserId(user.getUserId())
.setDeptId(user.getDeptId())
.setUsername(user.getUserName())
.setPassword(user.getPassword())
.setMenuPermissions(permissionService.getMenuPermission(user))
.setRolePermissions(permissionService.getRolePermission(user));
} }
} }