Merge remote-tracking branch 'origin/dev' into dev

sso-server/src/main/java/com/uas/sso/controller/ResetPasswordController.java

@@ -356,15 +356,9 @@ public class ResetPasswordController extends BaseController {
 
         // 从token中获取用户信息
         Long userUU = (Long) expireToken.getBind();
-        User user = userService.findOne(userUU);
-
-        // 设置加密后的密码
-        String encryPassword = userService.getEncryPassword(Const.ENCRY_FORMAT, password, user.getSalt());
-        user.setPassword(encryPassword);
-        userService.save(user);
 
-        // 删除token，返回成功
-        tokenService.delete(token);
+        // 重置密码
+        userService.updatePassword(userUU, password);
         return success();
     }