From a37935025b929531df438038448da604b80d12f8 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 27 Jul 2021 18:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=9A=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app.ts                                     | 10 +++-------
 .../app/servers/connector/handler/entryHandler.ts      |  5 -----
 shared/db/WhiteList.ts                                 | 10 ++--------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/game-server/app.ts b/game-server/app.ts
index 4db5ef662..f5d77b57b 100644
--- a/game-server/app.ts
+++ b/game-server/app.ts
@@ -152,7 +152,7 @@ app.configure(ALL_ENVS, 'systimer', function () {
 function errorHandler(err: Error, msg: any, resp: any,
     session: FrontendOrBackendSession, cb: HandlerCallback) {
         const errCode = genCode(10);
-        errlogger.error(`${pinus.app.serverId} error handler \n msg[${JSON.stringify(msg)}] \n resp[${JSON.stringify(resp)}] \n sessionId:${JSON.stringify(session.export())} \n error *${errCode}* stack: ${err.stack}`);
+        errlogger.error(`${pinus.app.serverId} error handler \n msg[${JSON.stringify(msg)}] \n resp[${JSON.stringify(resp)}] \n sessionId:${JSON.stringify(session.export())} \n error 【${errCode}】 stack: ${err.stack}`);
 
     if (!resp) {
         resp = resResult(STATUS.GLOBAL_ERR, { errCode });
@@ -162,12 +162,8 @@ function errorHandler(err: Error, msg: any, resp: any,
 
 export function globalErrorHandler(err: Error, msg: any, resp: any,
     session: FrontendOrBackendSession, cb: HandlerCallback) {
-        errlogger.debug(`${pinus.app.serverId} globalErrorHandler handler`);
-        errlogger.debug(`msg[${JSON.stringify(msg)}]`);
-        errlogger.debug(`resp[${JSON.stringify(resp)}]`);
-        errlogger.debug(`sessionId:${JSON.stringify(session.export())}`);
-        errlogger.error(`error stack: ${err.stack}`);
-
+        const errCode = genCode(10);
+        errlogger.error(`${pinus.app.serverId} globalErrorHandler handler \n msg[${JSON.stringify(msg)}] \n resp[${JSON.stringify(resp)}] \n sessionId:${JSON.stringify(session.export())} \n error 【${errCode}】 stack: ${err.stack}`);
 
     if (cb) {
         cb(err, resp ? resp : { code: 503 });
diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts
index 8c0311b53..43da45f6f 100644
--- a/game-server/app/servers/connector/handler/entryHandler.ts
+++ b/game-server/app/servers/connector/handler/entryHandler.ts
@@ -309,9 +309,4 @@ export class EntryHandler {
 
         return resResult(STATUS.SUCCESS);
     }
-
-    async test(msg: { magicWord: string }, session: FrontendSession) {
-        let rec = await WhiteListModel.checkTel(1, 2, 'xxxxx');
-        return resResult(STATUS.SUCCESS);
-    }
 }
\ No newline at end of file
diff --git a/shared/db/WhiteList.ts b/shared/db/WhiteList.ts
index 835c1b5d1..a91c3cc97 100644
--- a/shared/db/WhiteList.ts
+++ b/shared/db/WhiteList.ts
@@ -1,5 +1,5 @@
-import BaseModel, { getModelForClass } from './BaseModel';
-import { prop, DocumentType } from '@typegoose/typegoose';
+import BaseModel from './BaseModel';
+import { prop, DocumentType, getModelForClass } from '@typegoose/typegoose';
 import { WHITE_LIST_TYPE } from '../consts';
 
 export default class WhiteList extends BaseModel {
@@ -19,12 +19,6 @@ export default class WhiteList extends BaseModel {
         const rec: WhiteListModelType = await WhiteListModel.findOne({ type: WHITE_LIST_TYPE.TEL, str: tel }).lean();
         return rec;
     }
-
-    public static async test(a: number, b: number, c: string) {
-        console.log(a, b, c)
-        const rec: WhiteListModelType = await WhiteListModel.findOneAndUpdate({}, { type: [] as any }).lean();
-        return rec;
-    } 
 }
 
 export const WhiteListModel = getModelForClass(WhiteList);