|
|
@ -240,8 +240,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
if (!oldPasswordMd5.equals(user.getPassword())) { |
|
|
|
return rb.setMsg("原始密码输入错误"); |
|
|
|
} |
|
|
|
if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { |
|
|
|
return rb.setMsg("密码格式错误,必须为8至10位大小写字母和数字的组合"); |
|
|
|
if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,16}$")) { |
|
|
|
return rb.setMsg("密码格式错误,必须为8至16位大小写字母和数字的组合"); |
|
|
|
} |
|
|
|
int i = baseMapper.updatePasswordApp(user.getSid(), Encodes.md5(newPassword)); |
|
|
|
SysUserVo sysUserVo = selectUserOne(user); |
|
|
@ -261,7 +261,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
sysUserVo.setNeedResetPsd(isTrue); |
|
|
|
} |
|
|
|
if (i == 1) { |
|
|
|
redisUtil.remove(token); |
|
|
|
// redisUtil.remove(token);
|
|
|
|
return rb.success().setData(sysUserVo); |
|
|
|
} else { |
|
|
|
return rb.setMsg("修改失败"); |
|
|
|