基于验证码重置密码

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

 package cn.quantgroup.xyqb.controller.external;
 
 import cn.quantgroup.xyqb.Constants;
+import cn.quantgroup.xyqb.aspect.BehaviorAuth;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.aspect.captcha.CaptchaFiniteValidator;
 import cn.quantgroup.xyqb.aspect.captcha.CaptchaNewValidator;
@@ -420,10 +421,41 @@ public class UserController implements IBaseController {
      *
      * @param phoneNo
      * @param password
-     * @param verificationCode
+     * @param
      * @return
      * @yapi http://yapi.quantgroups.com/project/17/interface/api/3263
      */
+    @RequestMapping("/reset_password_captcha")
+    @BehaviorAuth
+    public JsonResult resetPasswordCaptcha(@RequestParam String phoneNo,
+                                    @RequestParam String password,
+                                    @RequestParam(required = false) String registerFrom,
+                                    @RequestHeader(value = Constants.X_AUTH_TENANT, defaultValue = UserConstant.defaultTenantIdString) Integer tenantId
+    ) {
+        if (!ValidationUtil.validatePhoneNo(phoneNo)) {
+            return JsonResult.buildErrorStateResult("手机号错误", null);
+        }
+        if (StringUtils.isBlank(password)) {
+            return JsonResult.buildErrorStateResult("密码不能为空", null);
+        }
+        if (!ValidationUtil.validatePassword(password)) {
+            return JsonResult.buildErrorStateResult(PasswordUtil.TOAST_MSG, null);
+        }
+        if (!userService.exist(phoneNo, tenantId)) {
+            log.info("修改密码失败，该手机号尚未注册, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+            return JsonResult.buildErrorStateResult("修改密码失败", null);
+        }
+        if (!userService.resetPassword(phoneNo, password, tenantId)) {
+            return JsonResult.buildErrorStateResult("修改密码失败", null);
+        }
+
+        // TODO  加渠道号
+        log.info("修改密码成功, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        //修改密码成功也要清除一下
+        lockIpv4Service.unLockPhone(phoneNo);
+        return JsonResult.buildSuccessResult(null, null);
+    }
+
     @RequestMapping("/reset_password")
     public JsonResult resetPassword(@RequestParam String phoneNo,
                                     @RequestParam String password,
@@ -455,6 +487,7 @@ public class UserController implements IBaseController {
         return JsonResult.buildSuccessResult(null, null);
     }
 
+
     /**
      * 重置密码
      *