From 04be0ee0587fcdeed1a673ef215cffb0c4caea2f Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sat, 17 Jun 2023 22:13:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90auth=E3=80=91=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=9A=84=E5=93=8D=E5=BA=94dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/sys/api/SysUserServiceApi.java | 3 ++- .../kernel/sys/api/pojo/user/UserValidateDTO.java | 10 +++++++++- .../sys/modular/user/biz/UserIntegrationService.java | 7 +++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java index dbd938801..569d5f339 100644 --- a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java +++ b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserServiceApi.java @@ -93,9 +93,10 @@ public interface SysUserServiceApi { /** * 获取用于用户校验的 * + * @param account 用户账号 * @author fengshuonan * @since 2023/6/17 21:56 */ - UserValidateDTO getUserValidateDTO(Long account); + UserValidateDTO getUserValidateDTO(String account); } diff --git a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserValidateDTO.java b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserValidateDTO.java index ad8adfcf5..f755e7490 100644 --- a/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserValidateDTO.java +++ b/kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserValidateDTO.java @@ -36,6 +36,12 @@ import lombok.Data; @Data public class UserValidateDTO { + /** + * 用户id + */ + @ChineseDescription("用户id") + private Long userId; + /** * 加密后的密码，存在sys_user表的password字段 */ @@ -51,8 +57,10 @@ public class UserValidateDTO { public UserValidateDTO() { } - public UserValidateDTO(String userPasswordHexed, Integer userStatus) { + public UserValidateDTO(Long userId, String userPasswordHexed, Integer userStatus) { + this.userId = userId; this.userPasswordHexed = userPasswordHexed; this.userStatus = userStatus; } + } diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java index 136fbc16f..e841a9539 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java @@ -178,18 +178,17 @@ public class UserIntegrationService implements SysUserServiceApi { } @Override - public UserValidateDTO getUserValidateDTO(Long account) { - + public UserValidateDTO getUserValidateDTO(String account) { LambdaQueryWrapper sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysUserLambdaQueryWrapper.eq(SysUser::getAccount, account); - sysUserLambdaQueryWrapper.select(SysUser::getPassword, SysUser::getStatusFlag); + sysUserLambdaQueryWrapper.select(SysUser::getPassword, SysUser::getStatusFlag, SysUser::getUserId); SysUser sysUserServiceOne = this.sysUserService.getOne(sysUserLambdaQueryWrapper, false); if (sysUserServiceOne == null) { throw new ServiceException(SysUserExceptionEnum.ACCOUNT_NOT_EXIST); } - return new UserValidateDTO(sysUserServiceOne.getPassword(), sysUserServiceOne.getStatusFlag()); + return new UserValidateDTO(sysUserServiceOne.getUserId(), sysUserServiceOne.getPassword(), sysUserServiceOne.getStatusFlag()); } }