优化（合并冗余判断）

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -1363,7 +1363,7 @@ public class InnerController implements IBaseController {
     @RequestMapping(path = "/user/password/reset", method = RequestMethod.POST)
     public JsonResult resetPassword(@RequestParam("phone") String phone, @RequestParam(required = false) String password) {
         if (ValidationUtil.validatePhoneNo(phone)) {
-            if (StringUtils.isNotBlank(password) && (password.length() < 6 || password.length() > 12)) {
+            if (PasswordUtil.validPwd(password)) {
                 return JsonResult.buildErrorStateResult("密码应为6-12位", null);
             }
             try {

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

@@ -263,7 +263,7 @@ public class UserController implements IBaseController {
             log.info("用户注册失败，密码不能为空：register -> registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
             return JsonResult.buildErrorStateResult("密码不能为空", null);
         }
-        if (password.length() < 6 || password.length() > 12) {
+        if (PasswordUtil.validPwd(password)) {
             log.info("用户注册失败，密码长度须在6位至12位之间：register -> registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
             return JsonResult.buildErrorStateResult("密码应为6-12位", null);
         }
@@ -336,7 +336,7 @@ public class UserController implements IBaseController {
         if (StringUtils.isBlank(password)) {
             return JsonResult.buildErrorStateResult("密码不能为空", null);
         }
-        if (password.length() < 6 || password.length() > 12) {
+        if (PasswordUtil.validPwd(password)) {
             return JsonResult.buildErrorStateResult("密码应为6-12位", null);
         }
         verifyPhoneAndCode(phoneNo, verificationCode);
@@ -365,7 +365,7 @@ public class UserController implements IBaseController {
         if (StringUtils.isBlank(passwordNew)) {
             return JsonResult.buildErrorStateResult("密码不能为空", null);
         }
-        if (passwordNew.length() < 6 || passwordNew.length() > 12) {
+        if (PasswordUtil.validPwd(password)) {
             return JsonResult.buildErrorStateResult("密码应为6-12位", null);
         }
         User user = userService.findByPhoneWithCache(phoneNo);

src/main/java/cn/quantgroup/xyqb/util/PasswordUtil.java

@@ -75,4 +75,14 @@ public class PasswordUtil {
         return pwd.toString();
     }
 
+    /**
+     * 校验密码是否合法
+     *
+     * @param password
+     * @return
+     */
+    public static boolean validPwd(String password) {
+        return Objects.nonNull(password) && (password.length() < 6 || password.length() > 12);
+    }
+
 }