From aec2eb18c3c9c28a4855a9e3623b20c060097c86 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Thu, 22 Apr 2021 17:53:41 +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 --- ruoyi-ui/src/views/system/user/profile/userInfo.vue | 4 ++-- .../ruoyi/project/system/controller/SysProfileController.java | 2 +- .../ruoyi/project/system/controller/SysUserController.java | 2 +- .../java/com/ruoyi/project/system/mapper/SysUserMapper.java | 2 +- .../com/ruoyi/project/system/service/ISysUserService.java | 2 +- .../ruoyi/project/system/service/impl/SysUserServiceImpl.java | 4 ++-- ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/ruoyi-ui/src/views/system/user/profile/userInfo.vue index 379a77aca..bccd248ab 100644 --- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue +++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue @@ -4,10 +4,10 @@ - + - + diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java index 8b0b38e1a..62e23c4b8 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java @@ -91,7 +91,7 @@ public class SysProfileController extends BaseController { return AjaxResult.error("新密码不能与旧密码相同"); } - if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) + if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword),newPassword) > 0) { // 更新缓存用户密码 loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword)); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java index 48dccd6fb..8ae498aee 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java @@ -328,8 +328,8 @@ public class SysUserController extends BaseController { @PutMapping("/resetPwd") public AjaxResult resetPwd(@RequestBody SysUser user) { userService.checkUserAllowed(user); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setPw(user.getPassword()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setUpdateBy(SecurityUtils.getUsername()); return toAjax(userService.resetPwd(user)); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java index ac0844337..11995b0c9 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java @@ -117,7 +117,7 @@ public interface SysUserMapper * @param password 密码 * @return 结果 */ - public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); + public int resetUserPwd(@Param("userName") String userName, @Param("password") String password, @Param("pw") String pw); /** * 通过用户ID删除用户 diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java index 6bf432890..66226fd0b 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java @@ -186,7 +186,7 @@ public interface ISysUserService * @param password 密码 * @return 结果 */ - public int resetUserPwd(String userName, String password); + public int resetUserPwd(String userName, String password,String pw); /** * 通过用户ID删除用户 diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java index 735fcc6be..de8807353 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java @@ -341,8 +341,8 @@ public class SysUserServiceImpl implements ISysUserService { * @return 结果 */ @Override - public int resetUserPwd(String userName, String password) { - return userMapper.resetUserPwd(userName, password); + public int resetUserPwd(String userName, String password, String pw) { + return userMapper.resetUserPwd(userName, password, pw); } /** diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml index 6e2a4daeb..0c0681f79 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml @@ -224,7 +224,7 @@ update_by = #{updateBy}, remark = #{remark}, open_id = #{openId}, - open_id = #{pw}, + pw = #{pw}, update_time = sysdate() where user_id = #{userId} @@ -243,7 +243,7 @@ - update sys_user set password = #{password},pw=#{pw} where user_name = #{userName} + update sys_user set password = #{password},pw= #{pw} where user_name = #{userName}