Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/mallplus

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
@@ -452,10 +460,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);