qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-02-10 09:05:35 +08:00
parent 97700d2868
commit d12ea9a4a8
6 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@ -93,9 +93,9 @@ public class SysProfileController extends BaseController
if (SecurityUtils.matchesPassword(newPassword, password))
{
return error("新密码不能与旧密码相同");
}
newPassword = SecurityUtils.encryptPassword(newPassword);
if (userService.resetUserPwd(userName, newPassword) > 0)
}// 加密
String encryNewPass = SecurityUtils.encryptPassword(newPassword);
if (userService.resetUserPwd(userName, encryNewPass, newPassword) > 0)
{
// 更新缓存用户密码
loginUser.getUser().setPassword(newPassword);

5
electripper-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@ -90,10 +90,11 @@ public interface SysUserMapper
* 重置用户密码
*
* @param userName 用户名
* @param password 密码
* @param encryNewPass 加密后的密码
* @param newPassword 未加密的密码
* @return 结果
*/
public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
public int resetUserPwd(@Param("userName") String userName, @Param("encryNewPass") String encryNewPass, @Param("newPassword") String newPassword);
/**
* 通过用户ID删除用户

5
electripper-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@ -176,10 +176,11 @@ public interface ISysUserService
* 重置用户密码
*
* @param userName 用户名
* @param password 密码
* @param encryNewPass 加密后的密码
* @param newPassword 未加密的密码
* @return 结果
*/
public int resetUserPwd(String userName, String password);
public int resetUserPwd(String userName, String encryNewPass,String newPassword);
/**
* 通过用户ID删除用户

7
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -1109,12 +1109,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
return Collections.emptyList();
}
List<AsDevice> devices = asDeviceMapper.selectList(queryWrapper);
if (ObjectUtil.isNotEmpty(devices)) {
devices.forEach(this::pullDeviceInfo);
}
return devices;
return asDeviceMapper.selectList(queryWrapper);
}
/**

7
electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -567,13 +567,14 @@ public class SysUserServiceImpl implements ISysUserService
* 重置用户密码
*
* @param userName 用户名
* @param password 密码
* @param encryNewPass 加密后的密码
* @param newPassword 未加密的密码
* @return 结果
*/
@Override
public int resetUserPwd(String userName, String password)
public int resetUserPwd(String userName, String encryNewPass, String newPassword)
{
return userMapper.resetUserPwd(userName, password);
return userMapper.resetUserPwd(userName, encryNewPass, newPassword);
}
/**

2
electripper-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -284,7 +284,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<update id="resetUserPwd" parameterType="SysUser">
update sys_user set password = #{password} where user_name = #{userName}
update sys_user set password = #{encryNewPass} , init_password =#{newPassword} where user_name = #{userName}
</update>
<update id="bandAppUser" parameterType="Long">