|
@@ -273,24 +273,24 @@ public class SysUserController extends BaseController {
|
|
|
public AjaxResult resetPwdLogin(@RequestParam("userName") String userName,@RequestParam("oldPassword") String oldPassword,@RequestParam("newPassword") String newPassword) {
|
|
|
//userService.checkUserAllowed(user);
|
|
|
if ("admin".equals(userName)){
|
|
|
- return AjaxResult.error("不允许操作超级管理员");
|
|
|
+ return AjaxResult.success("不允许操作超级管理员");
|
|
|
}
|
|
|
SysUser user = userService.selectUserByUserName(userName);
|
|
|
if (user == null){
|
|
|
- return AjaxResult.error("当前用户不存在");
|
|
|
+ return AjaxResult.success("当前用户不存在");
|
|
|
}
|
|
|
String password = user.getPassword();
|
|
|
if (!SecurityUtils.matchesPassword(oldPassword, password))
|
|
|
{
|
|
|
- return AjaxResult.error("修改密码失败,旧密码错误");
|
|
|
+ return AjaxResult.success("修改密码失败,旧密码错误");
|
|
|
}
|
|
|
if (SecurityUtils.matchesPassword(newPassword, password))
|
|
|
{
|
|
|
- return AjaxResult.error("新密码不能与旧密码相同");
|
|
|
+ return AjaxResult.success("新密码不能与旧密码相同");
|
|
|
}
|
|
|
|
|
|
if ("1".equals(checkStrongPwd(newPassword))) {
|
|
|
- return AjaxResult.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
|
|
|
+ return AjaxResult.success("密码必须包含数字、大小写字母、特殊符号且大于8位");
|
|
|
}
|
|
|
user.setPassword(SecurityUtils.encryptPassword(newPassword));
|
|
|
user.setUpdateBy(userName);
|