From a31ce4c3acab3c75a7b3811b356805626cf3f54f Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 25 Feb 2023 15:43:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
index 22b6e87..fa27ef2 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
@@ -452,10 +452,10 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
         String content = "";
         String redisKey = "";
         if (SmsEnum.SendEnum.LOGIN.getCode().equals(type)) {
-            content = "验证码：" + code + "，用于登录App,有效期5分钟，如非本人操作，请忽略该短信。";
+            content = "验证码：" + code + "，用于登录App,有效期5分钟，如非本人操作，请忽略。";
             redisKey = REDIS_KEY_PREFIX_LOGIN_CODE;
         }else if (SmsEnum.SendEnum.FORGET.getCode().equals(type)){
-            content = "验证码：" + code + "，用于修改登录密码,有效期5分钟，如非本人操作，请忽略该短信。";
+            content = "验证码：" + code + "，用于修改登录密码,有效期5分钟，如非本人操作，请忽略。";
             redisKey = REDIS_KEY_PREFIX_FORGET_CODE;
         }
         String result = SmsConfig.SendWaitWorkMsg(phone, code, content);

From d123d87201aafae01d19694891f0f7d7f6907c98 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 25 Feb 2023 17:04:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ums/service/impl/UmsMemberServiceImpl.java       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
index fa27ef2..8c38dc3 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
@@ -388,8 +388,15 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
 
     @Override
     public Object resetPassword(String phone, String password, String confimpassword, String authCode) {
-        if (ValidatorUtils.notEmpty(authCode) && !verifyAuthCode(authCode, phone)) {
+       /* if (ValidatorUtils.notEmpty(authCode) && !verifyAuthCode(authCode, phone)) {
             return new CommonResult().failed("验证码错误");
+        }*/
+        String codeFromRedis = redisService.get(REDIS_KEY_PREFIX_FORGET_CODE+ phone);
+        if (StringUtils.isBlank(codeFromRedis)){
+            return new CommonResult().failed("短信验证码已失效，请重新发送");
+        }
+        if (!authCode.equals(codeFromRedis.substring(0, 4))) {
+            return new CommonResult().failed("短信验证码错误或已失效，请重新获取");
         }
         if (!password.equals(confimpassword)) {
             return new CommonResult().failed("密码不一致");
@@ -397,7 +404,8 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
         UmsMember umsMember = new UmsMember();
         umsMember.setPassword(passwordEncoder.encode(password));
         memberMapper.update(umsMember, new QueryWrapper<UmsMember>().eq("phone", phone));
-        return true;
+        redisService.remove(String.format(Rediskey.MEMBER, phone));
+        return new CommonResult().success("操作成功");
     }
 
     @Override