From c56d417dbea3b61ac409ef38ad5187cfac8d272b Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Fri, 6 Dec 2024 17:31:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=A4=E8=AF=81=E4=BF=A1=E6=81=AF=E7=9A=84=20perms?= =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=EF=BC=88=E6=8E=A5=E5=8F=A3=E9=89=B4?= =?UTF-8?q?=E6=9D=83=E6=A0=B9=E6=8D=AE=E5=85=A8=E5=B1=80=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A7=84=E5=88=99=E7=9A=84=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/core/security/model/SysUserDetails.java | 3 --- .../com/youlai/boot/system/model/dto/UserAuthInfo.java | 5 ----- .../boot/system/service/impl/UserServiceImpl.java | 10 ---------- 3 files changed, 18 deletions(-) diff --git a/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java b/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java index 5fbf1f6c..633dbb0d 100644 --- a/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java +++ b/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java @@ -36,8 +36,6 @@ public class SysUserDetails implements UserDetails { private Collection authorities; - private Set perms; - private Long deptId; private Integer dataScope; @@ -57,7 +55,6 @@ public class SysUserDetails implements UserDetails { this.username = user.getUsername(); this.password = user.getPassword(); this.enabled = ObjectUtil.equal(user.getStatus(), 1); - this.perms = user.getPerms(); this.deptId = user.getDeptId(); this.dataScope = user.getDataScope(); } diff --git a/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java b/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java index fff8242d..49fde52a 100644 --- a/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java @@ -48,11 +48,6 @@ public class UserAuthInfo { */ private Set roles; - /** - * 用户拥有的权限集合 - */ - private Set perms; - /** * 数据权限范围，用于控制用户可以访问的数据级别 * diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index a94b220b..c2abd1e9 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -202,11 +202,6 @@ public class UserServiceImpl extends ServiceImpl implements Us UserAuthInfo userAuthInfo = this.baseMapper.getUserAuthInfo(username); if (userAuthInfo != null) { Set roles = userAuthInfo.getRoles(); - if (CollectionUtil.isNotEmpty(roles)) { - Set perms = roleMenuService.getRolePermsByRoleCodes(roles); - userAuthInfo.setPerms(perms); - } - // 获取最大范围的数据权限 Integer dataScope = roleService.getMaximumDataScope(roles); userAuthInfo.setDataScope(dataScope); @@ -226,11 +221,6 @@ public class UserServiceImpl extends ServiceImpl implements Us UserAuthInfo userAuthInfo = this.baseMapper.getUserAuthInfoByOpenId(openid); if (userAuthInfo != null) { Set roles = userAuthInfo.getRoles(); - if (CollectionUtil.isNotEmpty(roles)) { - Set perms = roleMenuService.getRolePermsByRoleCodes(roles); - userAuthInfo.setPerms(perms); - } - // 获取最大范围的数据权限 Integer dataScope = roleService.getMaximumDataScope(roles); userAuthInfo.setDataScope(dataScope);