修改代码格式；

数据库查询加 lean 判断；其它内容微调。
2020-08-27 20:01:35 +08:00
parent 940879016f
commit c53db8634d
17 changed files with 710 additions and 323 deletions
--- a/web-server/app/db/BaseModel.ts
+++ b/web-server/app/db/BaseModel.ts
@@ -3,13 +3,13 @@ import { prop, pre } from '@typegoose/typegoose';
 /**
  * BaseModel
 */
-@pre<BaseModel>('save', function (next) {
+@pre<BaseModel>('save', function(next) {
  if (!this.createdAt || this.isNew) {
-    this.createdAt = this.updatedAt = new Date()
+    this.createdAt = this.updatedAt = new Date();
  } else {
-    this.updatedAt = new Date()
+    this.updatedAt = new Date();
  }
-  next()
+  next();
 })

 export default class BaseModel {
@@ -21,4 +21,4 @@ export default class BaseModel {

  @prop()
  updatedAt: Date
-}
+}
--- a/web-server/app/db/Counter.ts
+++ b/web-server/app/db/Counter.ts
@@ -2,21 +2,21 @@ import BaseModel from './BaseModel';
 import { index, getModelForClass, prop } from '@typegoose/typegoose';

 /**
-  * 短信字段接口
+  * 自增 ID
 */
@index({ name: 1 })
 export default class Counter extends BaseModel {

-    @prop({ required: true })
-    name: string;
+  @prop({ required: true })
+  name: string;

-    @prop({ required: true, default: 1 })
-    seq: number;
+  @prop({ required: true, default: 1 })
+  seq: number;

-    public static async getNewCounter(name: string) {
-        const counter = await CounterModel.findOneAndUpdate({name}, {$inc: {seq: 1}}, {new: true, upsert: true}).lean();
-        return counter?.seq;
-    }
+  public static async getNewCounter(name: string, lean = true) {
+    const counter = await CounterModel.findOneAndUpdate({ name }, { $inc: { seq: 1 } }, { new: true, upsert: true }).lean(lean);
+    return counter?.seq;
+  }

 }

--- a/web-server/app/db/Game.ts
+++ b/web-server/app/db/Game.ts
@@ -3,68 +3,72 @@ import BaseModel from './BaseModel';
 import { index, getModelForClass, prop } from '@typegoose/typegoose';

 class ServerInfo {
-    @prop({ required: true})
-    name: string;
+  @prop({ required: true })
+  name: string;

-    @prop({ required: true})
-    host: string;
+  @prop({ required: true })
+  host: string;

-    @prop({ required: false})
-    port: number;
+  @prop({ required: false })
+  port: number;

-    @prop({ required: true})
-    status: number;
+  @prop({ required: true })
+  status: number;

-    @prop({ required: true})
-    createTime: Date;
+  @prop({ required: true })
+  createTime: Date;

-    @prop({ required: true})
-    serverType: string;
+  @prop({ required: true })
+  serverType: string;
 }

 /**
-  * 用户字段接口
+  * 游戏字段接口
 */
@index({ id: 1 })
 export default class Game extends BaseModel {

-  @prop({ required: true})
+  @prop({ required: true })
  id: number;

-  @prop({ required: true})
+  @prop({ required: true })
  name: string;

-  @prop({ required: true})
+  @prop({ required: true })
  nameEn: string;

-  @prop({ required: true})
+  @prop({ required: true })
  des: string;

-  @prop({ required: true})
+  @prop({ required: true })
  serverList: Array<ServerInfo>;

-  @prop({ required: true})
+  @prop({ required: true })
  iconUrl: string;

-  @prop({ required: true})
+  @prop({ required: true })
  version: string;

-  @prop({ required: true})
+  @prop({ required: true })
  versionCode: number;

  public static async getServerListByType(serverType: string) {
-      let game = await GameModel.findOne().lean();
-      if (!game) {
-          const serverInfo: ServerInfo = {name: '常山少年', host: 'pinus_test.trgame.cn', port: 3014, status: 1, createTime: new Date(), serverType: 'official'};
-          const iconUrl = `https://download.tgamebox.cn/avatar/${APP_ID}/1.png`;
-          game = await GameModel.findOneAndUpdate({}, {id: 1, name: '赵云传', nameEn: 'zyz', des: '牛逼的战棋', iconUrl, version: '0.0.1', versionCode: 1, $push: {serverList: serverInfo}}, {upsert: true, new: true}).lean();
-      }
-      let serverList: Array<ServerInfo> = game ? game.serverList : [];
-      serverList = serverList.filter(item => { return item.serverType === serverType; })
-      return serverList;
+    let game = await GameModel.findOne().lean();
+    if (!game) {
+      const serverInfo: ServerInfo = { name: '常山少年', host: 'pinus_test.trgame.cn', port: 3014, status: 1, createTime: new Date(), serverType: 'official' };
+      const iconUrl = `https://download.tgamebox.cn/avatar/${APP_ID}/1.png`;
+      game = await GameModel.findOneAndUpdate(
+        {},
+        { id: 1, name: '赵云传', nameEn: 'zyz', des: '牛逼的战棋', iconUrl, version: '0.0.1', versionCode: 1, $push: { serverList: serverInfo } },
+        { upsert: true, new: true },
+      ).lean();
+    }
+    console.log(serverType, game);
+    let serverList: Array<ServerInfo> = game ? game.serverList : [];
+    serverList = serverList.filter(item => { return item.serverType === serverType; });
+    console.log(serverType, serverList);
+    return serverList;
  }
-
-  //#endregion
 }

-export const GameModel = getModelForClass(Game);
+export const GameModel = getModelForClass(Game);
--- a/web-server/app/db/Sms.ts
+++ b/web-server/app/db/Sms.ts
@@ -8,55 +8,57 @@ const moment = require('moment');
@index({ tel: 1 })
 export default class Sms extends BaseModel {

-    @prop({ required: true })
-    tel: string;
+  @prop({ required: true })
+  tel: string;

-    @prop({ required: true })
-    telHash: string;
+  @prop({ required: true })
+  telHash: string;

-    @prop({ required: true })
-    code: string;
+  @prop({ required: true })
+  code: string;

-    @prop({ required: true })
-    used: boolean;
+  @prop({ required: true })
+  used: boolean;

-    @prop({ required: true })
-    updateTime: Date;
+  @prop({ required: true })
+  updateTime: Date;

-    @prop({ required: true })
-    countToday: number;
+  @prop({ required: true })
+  countToday: number;

-    public static async findByTel(tel: string) {
-        let sms = await smsModel.findOne({ tel }).lean();
-        return sms;
+  public static async findByTel(tel: string, lean = true) {
+    const sms = await smsModel.findOne({ tel }).lean(lean);
+    return sms;
+  }
+
+  public static async updateByTel(tel: string, code: string, used: boolean, updateTime: Date, countToday: number, lean = true) {
+    await smsModel.findOneAndUpdate({ tel }, { code, used, updateTime, countToday }, { upsert: true }).lean(lean);
+  }
+
+  public static async validateSms(tel: string, code: string, lean = true) {
+    const record = await smsModel.findOneAndUpdate({ tel, code, used: false }, { used: true }).lean(lean);
+    return !!record;
+  }
+
+  public async timeLimit(interval: number) {
+    if (Date.now() > this.updateTime.getTime() + interval) {
+      return false;
    }
+    return true;
+  }

-    public static async updateByTel(tel: string, code: string, used: boolean, updateTime: Date, countToday: number) {
-        await smsModel.findOneAndUpdate({tel}, {code, used, updateTime, countToday}, {upsert: true});
+  public async cntLimit(cnt: number) {
+    console.log('hasSendToday:', this.hasSendToday());
+    if (await this.hasSendToday() && this.countToday >= cnt) {
+      return true;
    }
+    return false;
+  }

-    public static async validateSms(tel: string, code: string) {
-        const record = await smsModel.findOneAndUpdate({tel, code, used: false}, {used: true});
-        return !!record;
-    }
-
-    public async timeLimit(interval: number) {
-        if (this.updateTime.getTime() > Date.now() - interval) {
-            return true;
-        }
-        return false;
-    }
-
-    public async cntLimit(cnt: number) {
-        if (this.hasSendToday() && this.countToday >= cnt) {
-            return true;
-        }
-        return false;
-    }
-
-    public async hasSendToday() {
-        return moment(this.updateTime).format("YYYY-MM-DD") === moment(Date.now()).format("YYYY-MM-DD");
-    }
+  public async hasSendToday() {
+    console.log(moment(this.updateTime).format('YYYY-MM-DD'), moment(Date.now()).format('YYYY-MM-DD'));
+    return moment(this.updateTime).format('YYYY-MM-DD') === moment(Date.now()).format('YYYY-MM-DD');
+  }
 }

-export const smsModel = getModelForClass(Sms);
+export const smsModel = getModelForClass(Sms);
--- a/web-server/app/db/User.ts
+++ b/web-server/app/db/User.ts
@@ -10,70 +10,65 @@ import { index, getModelForClass, prop } from '@typegoose/typegoose';
@index({ uid: 1 })
 export default class User extends BaseModel {

-  @prop({ required: true})
+  @prop({ required: true })
  uid: number;

-  @prop({ required: true})
+  @prop({ required: true })
  username: string;

-  @prop({ required: true})
+  @prop({ required: true })
  token: string;

-  @prop({ required: true})
+  @prop({ required: true })
  tel: string;

-  @prop({ required: true})
+  @prop({ required: true })
  telHash: string;

-  @prop({ required: true})
+  @prop({ required: true })
  lastLoginTime: Date;

-  @prop({ required: true})
+  @prop({ required: true })
  createTime: Date;

  // 平台：ios, android, web, pc
-  @prop({ required: true})
+  @prop({ required: true })
  platform: string;

-  @prop({ required: true})
+  @prop({ required: true })
  pkgName: string;

  // 服务器类型：official, channel, ios, oversea
-  @prop({ required: true})
+  @prop({ required: true })
  serverType: string;

-  public static async createUser() {
-
-  }
-
-  public static async updateToken(tel: string, token: string, platform: string, pkgName: string, serverType: string) {
-    let user = await UserModel.findOne({tel}).lean();
+  public static async updateToken(tel: string, token: string, platform: string, pkgName: string, serverType: string, lean = true) {
+    let user = await UserModel.findOne({ tel }).lean();
    const curTime: Date = new Date();
    let update = {};
    if (!user) {
      const uid = await CounterModel.getNewCounter(COUNTER.UID);
-      update = Object.assign(update, {platform, pkgName, serverType, createTime: curTime, uid, username: `用户${uid}`});
+      update = Object.assign(update, { platform, pkgName, serverType, createTime: curTime, uid, username: `用户${uid}` });
    }
-    update = Object.assign(update, {token, lastLoginTime: curTime});
-    user = await UserModel.findOneAndUpdate({tel}, update, {upsert: true, new: true}).lean();
+    update = Object.assign(update, { token, lastLoginTime: curTime });
+    user = await UserModel.findOneAndUpdate({ tel }, update, { upsert: true, new: true }).lean(lean);
    return user;
  }

-  public static async findUserByToken(token: string) {
-    const user = await UserModel.findOne({token}).select('uid token').lean();
+  public static async findUserByToken(token: string, lean = true) {
+    const user = await UserModel.findOne({ token }).select('uid token').lean(lean);
    return user;
  }

-  public static async findUserByTel(tel: string) {
-    const user = await UserModel.findOne({tel}).select('uid tel').lean();
+  public static async findUserByTel(tel: string, lean = true) {
+    const user = await UserModel.findOne({ tel }).select('uid tel').lean(lean);
    return user;
  }

-  public static async findUserByUid(uid: number) {
-    const user = await UserModel.findOne({uid}).select('uid tel').lean();
+  public static async findUserByUid(uid: number, lean = true) {
+    const user = await UserModel.findOne({ uid }).select('uid tel').lean(lean);
    return user;
  }
-  //#endregion
 }

-export const UserModel = getModelForClass(User);
+export const UserModel = getModelForClass(User);