From 99a8b5124c62966ae2ad818bae8ed3dbe22ce76d Mon Sep 17 00:00:00 2001 From: wcy <761646706@qq.com> Date: Sat, 28 Sep 2024 19:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/system/api/RemoteUserService.java | 6 ++++++ .../api/factory/RemoteUserFallbackFactory.java | 5 +++++ .../bonus/sgzb/system/api/model/LoginUser.java | 18 ++++++++++++++++++ .../sgzb/auth/service/SysLoginService.java | 9 ++------- .../system/controller/SysUserController.java | 6 ++++++ .../sgzb/system/mapper/SysUserMapper.java | 2 ++ .../sgzb/system/service/ISysUserService.java | 2 ++ .../service/impl/SysUserServiceImpl.java | 5 +++++ .../resources/mapper/system/SysUserMapper.xml | 3 +++ 9 files changed, 49 insertions(+), 7 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java index 8655bfd..a6f6e37 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java @@ -84,4 +84,10 @@ public interface RemoteUserService */ @GetMapping("/user/getUserList") public R> getUserList(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 查询密码是否需要修改 + */ + @GetMapping("/user/userPwdState") + public String userPwdState(String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java index 82107f9..736e99e 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java @@ -61,6 +61,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory> getUserList(SysUser sysUser, String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } + + @Override + public String userPwdState(String username, String source) { + return null; + } }; } } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java index f0b4d1e..1512abc 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java @@ -67,6 +67,14 @@ public class LoginUser implements Serializable */ private Set roles; + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + /** * 用户信息 */ @@ -77,6 +85,16 @@ public class LoginUser implements Serializable */ private String loginMethod; + public String getForceChangePwd() { + return forceChangePwd; + } + + public void setForceChangePwd(String forceChangePwd) { + this.forceChangePwd = forceChangePwd; + } + + private String forceChangePwd; + public String getLoginMethod() { return loginMethod; } diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index 0537c46..5d3795b 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -93,14 +93,9 @@ public class SysLoginService { throw new ServiceException("对不起，您的账号：" + username + " 已停用"); } passwordService.validate(user, password); - - // 检查用户是否需要更改初始密码 - if (user.getForceChangePwd().equals(1)) { - recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "请先修改初始密码"); - throw new ServiceException("请先修改初始密码"); - } - recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); + String forceChangePwd = remoteUserService.userPwdState(username,SecurityConstants.INNER); + userInfo.setForceChangePwd(forceChangePwd); return userInfo; } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java index d335006..e03000d 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java @@ -83,6 +83,12 @@ public class SysUserController extends BaseController { return getDataTable(list); } + @GetMapping("/userPwdState") + public String userPwdState(String username) { + startPage(); + String state = userService.selectforceChangePwd(username); + return state; + } /** * 获取用户列表内部请求 */ diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java index 382d726..400655f 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java @@ -134,4 +134,6 @@ public interface SysUserMapper List selectUserByRole(SysUser sysUser); void updatePurchaseNoticePerson(SysUser user); + + String selectforceChangePwd(String username); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysUserService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysUserService.java index 62ad9fa..0c19bf6 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysUserService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysUserService.java @@ -224,4 +224,6 @@ public interface ISysUserService * @return */ AjaxResult urgentProcessingUser(UrgentProcessingUser urgentProcessingUser); + + String selectforceChangePwd(String username); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java index f22f8b3..d7680c4 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java @@ -575,4 +575,9 @@ public class SysUserServiceImpl implements ISysUserService { log.info("ToDoServiceImpl urgentProcessingUser {} end" ,urgentProcessingUser); return success(userList); } + + @Override + public String selectforceChangePwd(String username) { + return userMapper.selectforceChangePwd(username); + } } diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml index 707624c..f318222 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -180,6 +180,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into sys_user(