zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: 优化登录用户信息角色相关信息命名

Browse Source 
1.roles => roleCodes
2.roleSet => roles
This commit is contained in:
Charles7c 2023-09-02 00:12:45 +08:00
parent d20aadfc93
commit be394f3de4
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java
View File

@ -108,7 +108,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
*/
private static Expression buildDataScopeFilter(LoginUser user, String tableAlias, Expression where) {
Expression expression = null;
for (RoleDTO role : user.getRoleSet()) {
for (RoleDTO role : user.getRoles()) {
DataScopeEnum dataScope = role.getDataScope();
if (DataScopeEnum.ALL.equals(dataScope)) {
return where;

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java
View File

@ -60,12 +60,12 @@ public class LoginUser implements Serializable {
/**
* 角色编码集合
*/
private Set<String> roles;
private Set<String> roleCodes;
/**
* 角色集合
*/
private Set<RoleDTO> roleSet;
private Set<RoleDTO> roles;
/**
* 令牌

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java
View File

@ -48,6 +48,6 @@ public class SaTokenPermissionImpl implements StpInterface {
@Override
public List<String> getRoleList(Object loginId, String loginType) {
LoginUser loginUser = LoginHelper.getLoginUser();
return new ArrayList<>(loginUser.getRoles());
return new ArrayList<>(loginUser.getRoleCodes());
}
}

4
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java
View File

@ -79,8 +79,8 @@ public class LoginServiceImpl implements LoginService {
// 登录
LoginUser loginUser = BeanUtil.copyProperties(user, LoginUser.class);
loginUser.setPermissions(permissionService.listPermissionByUserId(userId));
loginUser.setRoles(permissionService.listRoleCodeByUserId(userId));
loginUser.setRoleSet(roleService.listByUserId(userId));
loginUser.setRoleCodes(permissionService.listRoleCodeByUserId(userId));
loginUser.setRoles(roleService.listByUserId(userId));
LoginHelper.login(loginUser);
// 返回令牌

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java
View File

@ -85,7 +85,7 @@ public class OnlineUserServiceImpl implements OnlineUserService {
public void cleanByRoleId(Long roleId) {
List<LoginUser> loginUserList = this.list(new OnlineUserQuery());
loginUserList.parallelStream().forEach(u -> {
if (u.getRoleSet().stream().anyMatch(r -> r.getId().equals(roleId))) {
if (u.getRoles().stream().anyMatch(r -> r.getId().equals(roleId))) {
try {
StpUtil.logoutByTokenValue(u.getToken());
} catch (NotLoginException ignored) {

2
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java
View File

@ -101,7 +101,7 @@ public class LoginController {
UserDetailVO userDetailVO = userService.get(loginUser.getId());
UserInfoVO userInfoVO = BeanUtil.copyProperties(userDetailVO, UserInfoVO.class);
userInfoVO.setPermissions(loginUser.getPermissions());
userInfoVO.setRoles(loginUser.getRoles());
userInfoVO.setRoles(loginUser.getRoleCodes());
return R.ok(userInfoVO);
}