From be394f3de4ea7ea692042db3556f706a3d141b51 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 2 Sep 2023 00:12:45 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E8=A7=92=E8=89=B2=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=A1=E6=81=AF=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.roles => roleCodes 2.roleSet => roles --- .../common/config/mybatis/DataPermissionHandlerImpl.java | 2 +- .../top/charles7c/cnadmin/common/model/dto/LoginUser.java | 4 ++-- .../cnadmin/auth/config/satoken/SaTokenPermissionImpl.java | 2 +- .../charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java | 4 ++-- .../cnadmin/auth/service/impl/OnlineUserServiceImpl.java | 2 +- .../cnadmin/webapi/controller/auth/LoginController.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java index 25a5808a..cc15349a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java @@ -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; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java index d0cab81d..dcf28807 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java @@ -60,12 +60,12 @@ public class LoginUser implements Serializable { /** * 角色编码集合 */ - private Set roles; + private Set roleCodes; /** * 角色集合 */ - private Set roleSet; + private Set roles; /** * 令牌 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java index 8163196b..cec92e0f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java @@ -48,6 +48,6 @@ public class SaTokenPermissionImpl implements StpInterface { @Override public List getRoleList(Object loginId, String loginType) { LoginUser loginUser = LoginHelper.getLoginUser(); - return new ArrayList<>(loginUser.getRoles()); + return new ArrayList<>(loginUser.getRoleCodes()); } } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java index e7b5b5e4..1effbaee 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java @@ -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); // 返回令牌 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java index 3752e4ec..160b952b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java @@ -85,7 +85,7 @@ public class OnlineUserServiceImpl implements OnlineUserService { public void cleanByRoleId(Long roleId) { List 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) { diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java index f0ee4131..e8226034 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java @@ -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); }