web-server 注册、登录、获取服务器列表；game-server token 校验

game-server/app/consts/consts.ts

@@ -0,0 +1,8 @@
+export const TURBO_CORE_URL = 'https://coresrv.tgamebox.cn';
+export const APP_ID = 'AXaXmIHPs9eONvzrBesD8aSKQNXYdALF';
+export const TURBO_PARM_SECRET = 'ipqw05du6ob4x130w89t31yrqd6xs005zzltcmg2zpqnvrjp1s';
+
+export const ENCRYPT_IV = 'f7182j5f04e377ux';
+export const ENCRYPT_KEY = 'fiqaxijabbantusmprc234fj';
+
+export const AUTH_SMS_CNT_PER_DAY = 8;

game-server/app/db/Counter.ts

@@ -0,0 +1,23 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop } from '@typegoose/typegoose';
+
+/**
+  * 短信字段接口
+*/
+@index({ name: 1 })
+export default class Counter extends BaseModel {
+
+    @prop({ required: true })
+    name: string;
+
+    @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;
+    }
+
+}
+
+export const CounterModel = getModelForClass(Counter);

game-server/app/db/Game.ts

@@ -0,0 +1,70 @@
+import { APP_ID } from './../consts/consts';
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop } from '@typegoose/typegoose';
+
+class ServerInfo {
+    @prop({ required: true})
+    name: string;
+
+    @prop({ required: true})
+    host: string;
+
+    @prop({ required: false})
+    port: number;
+
+    @prop({ required: true})
+    status: number;
+
+    @prop({ required: true})
+    createTime: Date;
+
+    @prop({ required: true})
+    serverType: string;
+}
+
+/**
+  * 用户字段接口
+*/
+@index({ id: 1 })
+export default class Game extends BaseModel {
+
+  @prop({ required: true})
+  id: number;
+
+  @prop({ required: true})
+  name: string;
+
+  @prop({ required: true})
+  nameEn: string;
+
+  @prop({ required: true})
+  des: string;
+
+  @prop({ required: true})
+  serverList: Array<ServerInfo>;
+
+  @prop({ required: true})
+  iconUrl: string;
+
+  @prop({ required: true})
+  version: string;
+
+  @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;
+  }
+
+  //#endregion
+}
+
+export const GameModel = getModelForClass(Game);

game-server/app/db/Sms.ts

@@ -0,0 +1,62 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop } from '@typegoose/typegoose';
+const moment = require('moment');
+
+/**
+  * 短信字段接口
+*/
+@index({ tel: 1 })
+export default class Sms extends BaseModel {
+
+    @prop({ required: true })
+    tel: string;
+
+    @prop({ required: true })
+    telHash: string;
+
+    @prop({ required: true })
+    code: string;
+
+    @prop({ required: true })
+    used: boolean;
+
+    @prop({ required: true })
+    updateTime: Date;
+
+    @prop({ required: true })
+    countToday: number;
+
+    public static async findByTel(tel: string) {
+        let sms = await smsModel.findOne({ tel }).lean();
+        return sms;
+    }
+
+    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 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");
+    }
+}
+
+export const smsModel = getModelForClass(Sms);

game-server/app/db/User.ts

@@ -1,44 +1,78 @@
+import { COUNTER } from './../consts/consts';
+import { CounterModel } from './Counter';
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop } from '@typegoose/typegoose';
 
-
 /**
   * 用户字段接口
 */
-@index({ userNo: 1 })
+@index({ tel: 1 })
+@index({ uid: 1 })
 export default class User extends BaseModel {
 
   @prop({ required: true})
-  userNo: number;
+  uid: number;
 
   @prop({ required: true})
-  userName: string;
+  username: string;
 
   @prop({ required: true})
   token: string;
 
+  @prop({ required: true})
+  tel: string;
+
   @prop({ required: true})
   telHash: string;
 
-  //#region（实例方法 和 实例方法）
-  public async userInstanceTestMethods() {
+  @prop({ required: true})
+  lastLoginTime: Date;
 
-    const user: User = new User();
-    user.userName = '我是实例化方法测试';
-    user.userNo = 9527;
+  @prop({ required: true})
+  createTime: Date;
 
+  // 平台：ios, android, web, pc
+  @prop({ required: true})
+  platform: string;
+
+  @prop({ required: true})
+  pkgName: string;
+
+  // 服务器类型：official, channel, ios, oversea
+  @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();
+    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, {token, lastLoginTime: curTime});
+    user = await UserModel.findOneAndUpdate({tel}, update, {upsert: true, new: true}).lean();
     return user;
   }
 
-  public static async userStaticTestMethods() {
-
-    const user: User = new User();
-    user.userName = '我是静态方法测试';
-    user.userNo = 9527;
-
+  public static async findUserByToken(token: string) {
+    const user = await UserModel.findOne({token}).select('uid token').lean();
     return user;
   }
 
+  public static async findUserByTel(tel: string) {
+    const user = await UserModel.findOne({tel}).select('uid tel').lean();
+    return user;
+  }
+
+  public static async findUserByUid(uid: number) {
+    const user = await UserModel.findOne({uid}).select('uid tel').lean();
+    return user;
+  }
   //#endregion
 }
 

game-server/app/servers/chat/handler/chatHandler.ts

@@ -1,4 +1,3 @@
-import { UserModel } from './../../../db/User';
 import { ChatRemote } from '../remote/chatRemote';
 import {Application, BackendSession} from 'pinus';
 import { FrontendSession } from 'pinus';
@@ -55,10 +54,6 @@ export class ChatHandler {
         };
         let channel = channelService.getChannel(rid, false);
 
-        console.log(`got user in send2 :`,);
-        const user = await UserModel.findOneAndUpdate({userName: username}, {userName: username, userNo: 666}, {upsert: true, new: true}).lean();
-        console.log(`got user in send2 :`, user);
-
         // the target is all users
         if (msg.target === '*') {
             channel.pushMessage('onChat', param);

game-server/app/servers/connector/handler/entryHandler.ts

@@ -1,3 +1,4 @@
+import { UserModel } from './../../../db/User';
 import {Application} from 'pinus';
 import {FrontendSession} from 'pinus';
 
@@ -16,14 +17,24 @@ export class EntryHandler {
      * @param  {Object}   msg     request message
      * @param  {Object}   session current session object
      */
-    async enter(msg: { rid: string, username: string }, session: FrontendSession) {
+    async enter(msg: { rid: string, username: string, token: string }, session: FrontendSession) {
         let self = this;
         let rid = msg.rid;
         let uid = msg.username + '*' + rid;
         let sessionService = self.app.get('sessionService');
 
+        let user = await UserModel.findUserByToken(msg.token);
+        if (!user) {
+            console.log('user token not found');
+            return {
+                code: 500,
+                error: true
+            };
+        }
+
         // duplicate log in
         if (!!sessionService.getByUid(uid)) {
+            console.log('uid not found');
             return {
                 code: 500,
                 error: true

game-server/app/servers/gate/handler/gateHandler.ts

@@ -25,7 +25,6 @@ export class GateHandler {
         }
         // get all connectors
         let connectors = this.app.getServersByType('connector');
-        console.log('ltc connectors', connectors);
         if (!connectors || connectors.length === 0) {
             return {
                 code: 500