回滚代码

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -186,7 +186,7 @@ public class UserController implements IBaseController {
     }
     String verificationCode =  successResult.getMsg();
     // 执行短信验证码检查
-    verifyPhoneAndCode(phoneNo, verificationCode);
+    smsValidForFastLogin(phoneNo, verificationCode);
     User user = userService.findByPhoneWithCache(phoneNo);
     if (user != null && !user.getEnable()) {
       LOGGER.error("用户不存在，或者已经注销，phoneNo:{}",phoneNo);
@@ -272,7 +272,7 @@ public class UserController implements IBaseController {
     if (null == registerFrom) {
       registerFrom = 1L;
     }
-    verifyPhoneAndCode(phoneNo, verificationCode);
+    smsValidForRegister(phoneNo, verificationCode);
     if (userService.exist(phoneNo)) {
       LOGGER.info("用户注册失败，该手机号已经被注册：register -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("该手机号已经被注册", null);
@@ -336,7 +336,7 @@ public class UserController implements IBaseController {
     if (password.length() < 6 || password.length() > 12) {
       return JsonResult.buildErrorStateResult("密码应为6-12位", null);
     }
-    verifyPhoneAndCode(phoneNo, verificationCode);
+    smsValidForRegister(phoneNo, verificationCode);
     if (!userService.exist(phoneNo)) {
       LOGGER.info("修改密码失败，该手机号尚未注册, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("该手机号尚未注册", null);
@@ -486,14 +486,27 @@ public class UserController implements IBaseController {
   }
 
   /**
-   * 校验短信验证码
+   * 注册时校验短信验证码
    * @param phoneNo
    * @param verificationCode
    */
-  private void verifyPhoneAndCode(String phoneNo, String verificationCode) {
-    if (!smsService.verifyPhoneAndCode(phoneNo, verificationCode)) {
+  private void smsValidForRegister(String phoneNo, String verificationCode) {
+    if (!smsService.validRegisterOrResetPasswdVerificationCode(phoneNo, verificationCode)) {
       smsReSendOrNot(phoneNo);
-      LOGGER.info("验证码校验失败,phoneNo:{} , verificationCode:{}", phoneNo, verificationCode);
+      LOGGER.info("用户快速注册，验证码校验失败,phoneNo:{} , verificationCode:{}", phoneNo, verificationCode);
+      throw new VerificationCodeErrorException("短信验证码错误");
+    }
+  }
+
+  /**
+   * 登录时校验短信验证码
+   * @param phoneNo
+   * @param verificationCode
+   */
+  private void smsValidForFastLogin(String phoneNo, String verificationCode) {
+    if (!smsService.validateFastLoginVerificationCode(phoneNo, verificationCode)) {
+      smsReSendOrNot(phoneNo);
+      LOGGER.info("用户快速登录，验证码校验失败,phoneNo:{} , verificationCode:{}", phoneNo, verificationCode);
       throw new VerificationCodeErrorException("短信验证码错误");
     }
   }

src/main/java/cn/quantgroup/xyqb/service/sms/impl/SmsServiceImpl.java

@@ -79,7 +79,22 @@ public class SmsServiceImpl implements ISmsService {
 
   @Override
   public boolean validRegisterOrResetPasswdVerificationCode(String phoneNo, String smsVerificationCode) {
-    return verifyPhoneAndCode(phoneNo, smsVerificationCode);
+    //if (StringUtils.isEmpty(smsVerificationCode) || smsVerificationCode.length() != SMS_VERIFICATION_MAXLEN) {
+    //  return false;
+    //}
+    String key = Constants.REDIS_PREFIX_VERIFICATION_CODE + phoneNo;
+    String randomCode = stringRedisTemplate.opsForValue().get(key);
+    if (StringUtils.isEmpty(randomCode)) {
+      return false;
+    }
+    String[] arr = randomCode.split(":");
+    String uniqueId = arr[0];
+    String code = arr[1];
+    log.info("arr: {}", arr);
+    for (String i: arr) {
+      log.info("arr[i]: {}", i);
+    }
+    return confirmSms(smsVerificationCode, uniqueId, code);
   }
 
   @Override