From 477c4d6b67bc1055d7c9c9b75395a4e134d6b837 Mon Sep 17 00:00:00 2001
From: efren <79289982@qq.com>
Date: Fri, 18 Jul 2025 15:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=A7=A3=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/system/login/controller/LoginController.java |  4 ++--
 .../login/service/impl/BaseUserServiceImpl.java       | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/coscoshipping/ebtp/system/login/controller/LoginController.java b/src/main/java/com/coscoshipping/ebtp/system/login/controller/LoginController.java
index ebaf056..4f9b174 100644
--- a/src/main/java/com/coscoshipping/ebtp/system/login/controller/LoginController.java
+++ b/src/main/java/com/coscoshipping/ebtp/system/login/controller/LoginController.java
@@ -136,7 +136,7 @@ public class LoginController {
     @ApiOperation("忘记密码-验证验证码")
     @PostMapping("/forgotPassword/verifyCode")
     public BaseResponse<Boolean> verifyForgotPasswordCode(@RequestBody LoginUserVo vo) {
-        boolean valid = iBaseUserService.verifySmsCode(vo.getAccount(), vo.getIdentifying());
+        boolean valid = iBaseUserService.verifySmsCode(vo.getAccount(), vo.getEncryptValue());
         if (!valid) {
             return BaseResponse.fail("验证码错误", null);
         }
@@ -151,7 +151,7 @@ public class LoginController {
     @ApiOperation("忘记密码-设置新密码")
     @PostMapping("/forgotPassword/reset")
     public BaseResponse<Boolean> resetForgotPassword(@RequestBody LoginUserVo vo) {
-        boolean valid = iBaseUserService.verifySmsCode(vo.getAccount(), vo.getIdentifying());
+        boolean valid = iBaseUserService.verifySmsCode(vo.getAccount(), vo.getEncryptValue());
         if (!valid) {
             return BaseResponse.fail("验证码错误", null);
         }
diff --git a/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java
index 5e8e81f..792da30 100644
--- a/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java
+++ b/src/main/java/com/coscoshipping/ebtp/system/login/service/impl/BaseUserServiceImpl.java
@@ -676,7 +676,10 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
+        // code = 784290_2025-07-18 15:00:59
         code = new String(decode);
+        String[] caps = code.split("_");
+        code = caps[0];
         Object redisCode = redisTemplate.opsForValue().get("FORGOT_PWD_CODE:" + account);
         return code.equals(redisCode);
     }
@@ -706,7 +709,13 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
             // 供应商
             SysSupplierUser supplierUser = sysSupplierUserMapper.selectById(cacheUser.getUserId());
             if (supplierUser == null) return false;
-            String mm2 = RSA.encrypt(newPassword, publickey);
+            byte[] passwordBytes = null;
+            try {
+                passwordBytes = RSA.decryptByPrivateKey(RSA.decryptBASE64(newPassword), privateKey);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            newPassword = new String(passwordBytes);
             supplierUser.setPassword(Md5Util.encode(newPassword));
             result = sysSupplierUserMapper.updateById(supplierUser) > 0;
         } else {