From 62562c3482f88f1b0f7afbb7a8faf1e7f9a776d2 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 4 Mar 2021 15:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95:=20fix=20checkTelNo=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/consts/statusCode.ts    |  1 +
 web-server/app/service/Auth.ts | 18 +++++++++---------
 web-server/package.json        |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts
index 79c8dc700..82ac43f35 100644
--- a/shared/consts/statusCode.ts
+++ b/shared/consts/statusCode.ts
@@ -22,6 +22,7 @@ export const STATUS = {
     TEL_HAS_USED: { code: 10011, simStr: '该手机号已被使用' },
     ACCOUNT_NOT_GUEST: { code: 10012, simStr: '该账号已绑定过' },
     AUTHEN_FAIL: { code: 10013, simStr: '实名失败' },
+    TEL_LEN_ERR: { code: 10014, simStr: '手机长度错误' },
     // 战斗相关状态 20000 - 29999
     // 战斗通用 20000 - 20099
     BATTLE_MISS_INFO: { code: 20001, simStr: '缺少关卡信息' },
diff --git a/web-server/app/service/Auth.ts b/web-server/app/service/Auth.ts
index 01a34ac7d..f25e39fd3 100644
--- a/web-server/app/service/Auth.ts
+++ b/web-server/app/service/Auth.ts
@@ -12,7 +12,7 @@ import { calPlayerCeAndSave, reCalAllHeroCe } from 'app/pubUtils/playerCe';
 import { getExpByLv, getHeroExpByLv, gameData } from 'app/pubUtils/data';
 import { isString } from 'underscore';
 import { getAge } from 'app/pubUtils/timeUtil';
-import { shouldRefresh } from 'app/pubUtils/util';
+import { shouldRefresh, resResult } from 'app/pubUtils/util';
 import { authenticate } from 'app/pubUtils/httpUtil';
 
 /**
@@ -73,7 +73,7 @@ export default class Auth extends Service {
                 loginType = 2;
             }
             return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
-                canLogin: true,
+                canLogin: user.hasSetPw, // 未设置密码等于未创建账号
                 loginType,
                 ...param
             });
@@ -104,12 +104,12 @@ export default class Auth extends Service {
 
     public checkTelNo(telNo) {
         if (!isString(telNo)) {
-            return { status: 1, data: '参数类型错误' };
+            return { status: 1, resResult: resResult(STATUS.WRONG_PARMS) };
         }
         if (telNo.length !== 11) {
-            return { status: 1, data: '手机号长度错误' };
+            return { status: 1, resResult: resResult(STATUS.TEL_LEN_ERR) };
         }
-        return { status: 0, data: '手机号合法' };
+        return { status: 0 };
     }
 
     async sendSmsCodeByGuodu(tel, code) {
@@ -137,7 +137,7 @@ export default class Auth extends Service {
 
         const telVerify = this.checkTelNo(tel);
         if (telVerify.status !== 0) {
-            return telVerify;
+            return telVerify.resResult;
         }
         const sms = await smsModel.findByTel(tel, false);
         if (sms) {
@@ -179,7 +179,7 @@ export default class Auth extends Service {
         // 参数检查
         const telVerify = this.checkTelNo(tel);
         if (telVerify.status !== 0) {
-            return telVerify;
+            return telVerify.resResult;
         }
 
         // ! 测试阶段允许客户端不传验证码，此时不做验证码验证，直接注册或登录账号
@@ -241,7 +241,7 @@ export default class Auth extends Service {
         // 参数检查
         const telVerify = this.checkTelNo(tel);
         if (telVerify.status !== 0) {
-            return telVerify;
+            return telVerify.resResult;
         }
 
 
@@ -329,7 +329,7 @@ export default class Auth extends Service {
         // 参数检查
         const telVerify = this.checkTelNo(tel);
         if (telVerify.status !== 0) {
-            return telVerify;
+            return telVerify.resResult;
         }
 
         if (!isString(code) || code.length !== 6 || !password) {
diff --git a/web-server/package.json b/web-server/package.json
index 5fe897f96..b40322247 100644
--- a/web-server/package.json
+++ b/web-server/package.json
@@ -20,7 +20,8 @@
     "autod": "autod",
     "lint": "eslint . --ext .ts",
     "clean": "ets clean",
-    "local": "cross-env EGG_SERVER_ENV=local npm run dev"
+    "local": "cross-env EGG_SERVER_ENV=local npm run dev",
+    "isbn": "cross-env EGG_SERVER_ENV=isbn npm run dev"
   },
   "dependencies": {
     "cross-env": "^7.0.3",