|
|
@@ -218,7 +218,10 @@ public class SysUserController extends BaseController {
|
|
|
public AjaxResult resetPwd(@RequestBody SysUser user) {
|
|
|
userService.checkUserAllowed(user);
|
|
|
userService.checkUserDataScope(user.getId());
|
|
|
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
|
+ final String salt = SaltHelper.salt();
|
|
|
+ user.setSalt(salt);
|
|
|
+// user.setPassword(SaltHelper.exec(user.getPassword(), userService.selectUserById(user.getId()).getSalt()));
|
|
|
+ user.setPassword(SaltHelper.exec(user.getPassword(), salt));
|
|
|
user.setUpdateBy(SecurityUtils.getUsername());
|
|
|
return toAjax(userService.resetPwd(user));
|
|
|
}
|