From 835fae4578a33db9509ca93d695997fbe38f54bb Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Mon, 1 Nov 2021 11:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/user/service/IUserService.java     | 11 ++++++++++-
 .../user/service/impl/UserServiceImpl.java     | 18 +++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java b/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java
index 1fc4305e..faf24613 100644
--- a/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java
+++ b/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java
@@ -153,7 +153,7 @@ public interface IUserService extends IUserBaseService, IUserCheckService {
     void updatePassword(String token, UpdatePasswordVO updatePasswordVO) throws ReflectUtil.ReflectException;
 
     /**
-     * 修改面膜
+     * 修改密码
      *
      * @param userId           用户ID
      * @param updatePasswordVO 修改的密码
@@ -161,6 +161,15 @@ public interface IUserService extends IUserBaseService, IUserCheckService {
      */
     void updatePasswordByUserId(String userId, UpdatePasswordVO updatePasswordVO);
 
+    /**
+     * 修改密码
+     *
+     * @param userId           用户ID
+     * @param updatePasswordVO 修改的密码
+     * @param isPasswordMd5    密码是否已用MD5加密
+     */
+    void updatePasswordByUserId(String userId, UpdatePasswordVO updatePasswordVO, boolean isPasswordMd5);
+
     /**
      * 更新过期时间
      *
diff --git a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
index aba4187d..9595d8c4 100644
--- a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
+++ b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
@@ -215,13 +215,25 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
     @Override
     public void updatePassword(String token, UpdatePasswordVO updatePasswordVO) throws ReflectUtil.ReflectException {
         AppTokenUser appTokenUser = securityComponent.getAppTokenUser(token);
-        updatePasswordByUserId(appTokenUser.getId(), updatePasswordVO);
+        updatePasswordByUserId(appTokenUser.getId(), updatePasswordVO, true);
     }
 
     @Override
     public void updatePasswordByUserId(String userId, UpdatePasswordVO updatePasswordVO) {
-        String oldPassword = DigestUtils.md5Hex(DigestUtils.md5Hex(DigestUtils.md5Hex(updatePasswordVO.getOldPassword())));
-        String newPassword = DigestUtils.md5Hex(DigestUtils.md5Hex(DigestUtils.md5Hex(updatePasswordVO.getNewPassword())));
+        updatePasswordByUserId(userId, updatePasswordVO, false);
+    }
+
+    @Override
+    public void updatePasswordByUserId(String userId, UpdatePasswordVO updatePasswordVO, boolean isPasswordMd5) {
+        String oldPassword;
+        String newPassword;
+        if (isPasswordMd5) {
+            oldPassword = updatePasswordVO.getOldPassword();
+            newPassword = updatePasswordVO.getNewPassword();
+        } else {
+            oldPassword = DigestUtils.md5Hex(DigestUtils.md5Hex(DigestUtils.md5Hex(updatePasswordVO.getOldPassword())));
+            newPassword = DigestUtils.md5Hex(DigestUtils.md5Hex(DigestUtils.md5Hex(updatePasswordVO.getNewPassword())));
+        }
         UserPO userPO = getPO(userId);
         if (!passwordEncoder.matches(oldPassword, userPO.getUserPassword())) {
             throw new UpdateException("旧密码错误");