Merge remote-tracking branch 'origin/dev' into dev

2026-09-12 09:59:56 +08:00
parent d7574d188a 9cfffe1224
commit 71936b50a7
1 changed files with 7 additions and 1 deletions
@@ -170,7 +170,13 @@ public class TokenLoginApplicationService {
                throw new ServiceException("对不起，您的账号：" + userPhone + " 已停用");
            }
            //校验验证码是否正确
-            sysPasswordService.validate(userPo, verificationCode, 1, null);
+            if (loginDTO.getWechatFlag() != 1) {
+//                if (!ObjectUtil.equal(String.valueOf(object), verificationCode) && !ObjectUtil.equal(verificationCode, SmsConstants.universalCode)) {
+//                    recordLogininfor(userPhone, Constants.LOGIN_FAIL, "验证码错误", 1);
+                throw new ServiceException("验证码错误");
+//                }
+            }
+//            sysPasswordService.validate(userPo, verificationCode, 1, null);
        }
        return userInfo;
    }