From a4f2ed7380ae7ee9b3fb3a08128bc9e6955df667 Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Thu, 4 Feb 2021 16:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=89=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=B8=8D=E5=A1=AB=E9=AA=8C=E8=AF=81=E7=A0=81=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-server/app/service/Auth.ts | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/web-server/app/service/Auth.ts b/web-server/app/service/Auth.ts
index 66ab373ce..ecf4e5391 100644
--- a/web-server/app/service/Auth.ts
+++ b/web-server/app/service/Auth.ts
@@ -92,20 +92,25 @@ export default class Auth extends Service {
     if (telVerify.status !== 0) {
       return telVerify;
     }
-    if (!isString(code) || code.length !== 6) {
-      return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
-    }
 
-    // 手机验证码核验
-    const smsValid: boolean = await smsModel.validateSms(tel, code);
-    if (!smsValid) {
-      const sms = await smsModel.findByTel(tel);
-      if(sms && sms.isFixed) { // 固定手机号登录
-        if (sms.code !== code) {
+    // ! 测试阶段允许客户端不传验证码，此时不做验证码验证，直接注册或登录账号
+    // TODO 上线前改掉或仅保留在测试服
+    if (code !== '') {
+      if (!isString(code) || code.length !== 6) {
+        return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
+      }
+
+      // 手机验证码核验
+      const smsValid: boolean = await smsModel.validateSms(tel, code);
+      if (!smsValid) {
+        const sms = await smsModel.findByTel(tel);
+        if(sms && sms.isFixed) { // 固定手机号登录
+          if (sms.code !== code) {
+            return ctx.service.utils.resResult(STATUS.SMS_INVALID);
+          }
+        } else {
           return ctx.service.utils.resResult(STATUS.SMS_INVALID);
         }
-      } else {
-        return ctx.service.utils.resResult(STATUS.SMS_INVALID);
       }
     }