Merge branch 'feature/login'

Conflicts: game-server/app/servers/role/handler/heroHandler.ts game-server/app/services/redisService.ts shared/consts/index.ts shared/resource/jsons/dic_zyz_gk_main.json
2021-03-08 11:04:09 +08:00
parent ba70750f09 9cc83a61a5
commit 6b809d1b2b
79 changed files with 3766 additions and 2442 deletions
--- a/shared/db/Equip.ts
+++ b/shared/db/Equip.ts
@@ -94,7 +94,7 @@ export default class Equip extends BaseModel {
    return equip;
  }

-    public static async putOn(hid: number, equipId: string, lean = true) {
+    public static async putOnOrOff(equipId: string, hid: number, lean = true) {
        const equip: EquipType = await EquipModel.findOneAndUpdate({ _id: equipId }, { hid }, { new: true }).lean(lean);
        return equip;
    }
--- a/shared/db/Game.ts
+++ b/shared/db/Game.ts
@@ -2,27 +2,58 @@ import { APP_ID } from './../consts';
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType, modelOptions } from '@typegoose/typegoose';

-class ServerInfo {
+export class ServerInfo {
  @prop({ required: true })
-  id: number;
+  id: number;                // 小区id

  @prop({ required: true })
-  name: string;
+  name: string;              // 小区区名

  @prop({ required: true })
-  host: string;
+  groupId: number;           // 大区id
+
+  @prop({ required: true })
+  groupName: string;          // 大区区名
+
+  @prop({ required: true })
+  host: string;               // pinus连接地址

  @prop({ required: false })
-  port: number;
+  port: number;               // pinus端口

  @prop({ required: true })
-  status: number;
+  serverStatus: number;       // 服务器状态
+  
+  public get status() {
+    let now = new Date();
+    if( now > this.openTime) {
+      return this.serverStatus;
+    } else {
+      return 3; // 未开服
+    }
+  }
+
+  @prop({ required: true })
+  openTime: Date;

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

  @prop({ required: true })
  serverType: string;
+
+  constructor(id: number, name: string, groupId: number, groupName: string, host: string, port: number, serverStatus: number, serverType: string, openTime?: Date) {
+    this.id = id;
+    this.name = name;
+    this.groupId = groupId;
+    this.groupName = groupName;
+    this.host = host;
+    this.port = port;
+    this.serverStatus = serverStatus;
+    this.serverType = serverType;
+    this.openTime = openTime||new Date();
+    this.createTime = new Date();
+  }
 }

 /**
@@ -65,26 +96,23 @@ export default class Game extends BaseModel {
    }
  }

-  public static async getServerListByType(serverType: string) {
-    let game: GameType = await GameModel.findOne().lean();
+  public static async getServerList() {
+    let game: GameType = await GameModel.findOne().lean({ getter: true, virtuals: true });
    if (!game) {
-      const serverInfo: ServerInfo = { id: 1, name: '常山少年', host: 'pinus_test.trgame.cn', port: 3014, status: 1, createTime: new Date(), serverType: 'official' };
+      const serverInfo = new ServerInfo(1, '常山少年', 1, '逍遥津', 'pinus_test.trgame.cn', 3014, 1, '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();
+      ).lean({ getter: true, virtuals: true });
    }
-    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;
  }

  public static async newServer(serverId: number, serverType: string, name: string, host: string, port: number, status: number, lean = true) {
-    let serverInfo: ServerInfo = {id: serverId, name, host, port, status, createTime: new Date(), serverType};
+    let serverInfo = new ServerInfo(serverId, name, 1, '逍遥津', host, port, status, serverType);
    let game: GameType = await GameModel.findOneAndUpdate({}, {$push: {serverList: serverInfo}}, {new: true}).lean(lean);
    return game;
  }
--- a/shared/db/GroupMail.ts
+++ b/shared/db/GroupMail.ts
@@ -1,9 +1,9 @@
 import BaseModel from './BaseModel';
-import { index, getModelForClass, mongoose, prop, DocumentType } from '@typegoose/typegoose';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { nowSeconds } from '../pubUtils/timeUtil';
 import { MAIL_STATUS, MAIL_TYPE } from '../consts/constModules/mailConst';
 import { findWhere } from 'underscore';
-const { ObjectId } = mongoose.Types;
+
 class RewardInter {
    @prop({ required: true })
    id: number;
--- a/shared/db/Hero.ts
+++ b/shared/db/Hero.ts
@@ -1,17 +1,32 @@
 import BaseModel from './BaseModel';
-import { CeAttr } from '../domain/roleField/attribute';
 import { index, getModelForClass, prop, Ref, mongoose, DocumentType } from '@typegoose/typegoose';
 import Equip, {  } from './Equip';
 import { CounterModel } from './Counter';
 import { COUNTER, EQUIP_TYPE } from '../consts';
 import { reduceCe } from '../pubUtils/util';

+class CeAttrData {
+    @prop({ required: true })
+    id: number = 0;
+    @prop({ required: true })
+    base: number = 0;
+    @prop({ required: true })
+    ratioUp: number = 0;
+    @prop({ required: true })
+    fixUp: number = 0;
+    @prop({ required: true })
+    equipUp: number = 0;
+
+    constructor(id: number) {
+        this.id = id;
+    }
+}

 /**
  * 英雄表
 */

-class Connect {
+export class Connect {
    @prop({ required: true })
    shipId: number;
    @prop({ required: true })
@@ -51,31 +66,6 @@ function getInitialEplace() {
    return ePlace;
 }

-interface heroUpdate {
-    exp?: number;						
-    lv?: number;							
-    ce?: number;	
-    star?: number;						
-    starStage?: number;		 
-    colorStar?: number;
-    colorStarStage?: number;
-    quality?: number;
-    job?:number;
-    jobStage?:number;
-    favour?:number;
-    favourLv?:number;
-    skins?: Skin[];
-    connections?: Connect[];
-    ePlace?:EPlace[];
-    _id?:number;
-    scrollActive?: boolean;
-    scrollId?: number;
-    scrollStar?: number;
-    scrollColorStar?: number;
-    scrollQuality?: number;
-    historyCe?: number;
-}
-
@index({ roleId: 1, hid: 1 })
@index({ roleId: 1, seqId: 1 })
 export default class Hero extends BaseModel {
@@ -102,8 +92,8 @@ export default class Hero extends BaseModel {
    ce: number;							// 武将战力
    @prop({ required: true, default: 0 })
    historyCe: number;			        // 武将历史最高战力
-    @prop({required: true, default: new CeAttr(), _id: false })
-    ceAttr: CeAttr;                     // 影响战力的属性
+    @prop({required: true, type: CeAttrData, default: [], _id: false })
+    attr: CeAttrData[];                     // 影响战力的属性

    @prop({ required: true, default: 1 })
    star: number;						// 星级
@@ -181,10 +171,21 @@ export default class Hero extends BaseModel {
    public static async addEquip(roleId: string, hid: number, ePlaceId: number, equipId: string, lean = true) {
        const hero: HeroType = await HeroModel.findOneAndUpdate(
            { roleId, hid, 'ePlace.id': ePlaceId }, 
-            {$set: {'ePlace.$.equip': equipId, 'ePlace.$.hid':hid, 'ePlace.$.ePlaceId':ePlaceId}}, 
+            {$set: { 'ePlace.$.equip': equipId }}, 
            {new: true}).populate('ePlace.equip').lean(lean);
        if (hero) {
-            await Equip.putOn(hero.hid, equipId);
+            await Equip.putOnOrOff( equipId, hero.hid );
+        }
+        return hero;
+    }
+
+    public static async removeEquip(roleId: string, hid: number, ePlaceId: number, equipId: string, lean = true) {
+        const hero: HeroType = await HeroModel.findOneAndUpdate(
+            { roleId, hid, 'ePlace.id': ePlaceId }, 
+            {$set: {'ePlace.$.equip': null}}, 
+            {new: true}).populate('ePlace.equip').lean(lean);
+        if (hero) {
+            await Equip.putOnOrOff( equipId, 0 );
        }
        return hero;
    }
@@ -238,7 +239,7 @@ export default class Hero extends BaseModel {
        return result;
    }

-    public static async updateHeroInfo(roleId: string, hid:number, heroUpdate:heroUpdate, select?: string, lean = true) {
+    public static async updateHeroInfo(roleId: string, hid:number, heroUpdate:HeroUpdate, select?: string, lean = true) {
        delete heroUpdate._id;
        let result: HeroType = await HeroModel.findOneAndUpdate({roleId, hid}, {$set:heroUpdate}, {new: true}).select(select).lean(lean);
        return result;
@@ -270,3 +271,4 @@ export default class Hero extends BaseModel {
 export const HeroModel = getModelForClass(Hero);
 
 export interface HeroType extends Pick<DocumentType<Hero>, keyof Hero>{};
+export type HeroUpdate = Partial<HeroType>; // 将所有字段变成可选项
--- a/shared/db/Mail.ts
+++ b/shared/db/Mail.ts
@@ -1,8 +1,8 @@
 import BaseModel from './BaseModel';
-import { index, getModelForClass, prop, DocumentType, mongoose } from '@typegoose/typegoose';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { nowSeconds } from '../pubUtils/timeUtil';
 import { MAIL_STATUS, MAIL_TYPE } from '../consts/constModules/mailConst';
-const { ObjectId } = mongoose.Types;
+
 class RewardInter {
    @prop({ required: true })
    id: number;
--- a/shared/db/Notice.ts
+++ b/shared/db/Notice.ts
@@ -0,0 +1,63 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType, modelOptions } from '@typegoose/typegoose';
+import { formatTime } from '../pubUtils/timeUtil';
+import { TIME_FORMAT } from '../consts'
+
+/**
+  * 游戏字段接口
+*/
+@index({ id: 1 })
+@modelOptions({schemaOptions: {id: false}})
+export default class Notice extends BaseModel {
+
+  @prop({ required: true })
+  id: number;                 // 公告id
+  @prop({ required: true })
+  title: string;              // 公告标题
+  @prop({ required: true })
+  tag: number;                // 公告显示标签，在系统参数表中配了
+  @prop({ required: true })
+  type: number;               // 类型 1-公告 2-活动
+  @prop({ required: true })
+  content: number;            // 公告内容
+
+  @prop({ required: true })
+  timeStr: string;             // 时间显示
+  @prop({ required: true })
+  startTime: Date;            // 活动开始时间
+  @prop({ required: true })
+  endTime: Date;              // 活动结束时间
+  public get time() {
+    let startTime = formatTime(this.startTime, TIME_FORMAT.TYPE_SLASH);
+    let endTime = formatTime(this.endTime, TIME_FORMAT.TYPE_SLASH);
+
+    return this.timeStr.replace(/%startTime/g, startTime).replace(/%endTime/g, endTime);
+  }
+
+  @prop({ required: true, select: false  })
+  sort: number;
+
+  @prop({ required: true, select: false  })
+  showStartTime: Date;
+  @prop({ required: true, select: false  })
+  showEndTime: Date;
+  @prop({ required: true, select: false  })
+  serverType: string;           // 服务器类型
+  @prop({ required: true, select: false  })
+  isEnable: boolean;
+
+
+  public static async getAllNotice(serverType: string) {
+    let curTime = new Date();
+    let notices: NoticeType[] = await NoticeModel.find({ showStartTime: { $lte: curTime }, showEndTime: { $gte: curTime }, isEnable: true, serverType })
+    .sort({ sort: -1, createTime: -1 })
+    .lean({ virtuals: true });
+    return notices;
+  }
+}
+
+export const NoticeModel = getModelForClass(Notice);
+
+export interface NoticeType extends Pick<DocumentType<Notice>, keyof Notice>{
+  id: number;
+};
--- a/shared/db/Role.ts
+++ b/shared/db/Role.ts
@@ -1,6 +1,5 @@
-import { HANG_UP_CONSTS, ROLE_TERAPH, ROLE_SELECT } from './../consts';
+import { HANG_UP_CONSTS, ROLE_TERAPH, ROLE_SELECT, ABI_TYPE } from './../consts';
 import BaseModel  from './BaseModel';
-import { CeAttrRole } from '../domain/roleField/attribute';
 import { index, getModelForClass, prop, DocumentType, Ref, mongoose } from '@typegoose/typegoose';
 import User from './User';
 import { shouldRefresh, reduceCe } from '../pubUtils/util';
@@ -8,6 +7,20 @@ import { initRoleAtrr } from '../pubUtils/playerCe';
 import Hero,{} from '../db/Hero';
 import { nowSeconds } from '../pubUtils/timeUtil';

+// role表属性格式
+export class CeAttrDataRole {
+    @prop({ required: true })
+    id: number = 0;
+    @prop({ required: true })
+    ratioUp: number = 0;
+    @prop({ required: true })
+    fixUp: number = 0;
+    
+    constructor(id: number) {
+        this.id = id;
+    }
+}
+
 class TopHero {
  @prop({ required: true })
  hid: number; // 武将id
@@ -41,37 +54,47 @@ export class WarStar {
    star: number;					// 星级
 }

-class Teraph{
+export class Teraph{
    @prop({ required: true, default: 1 })
    id: number;						// 神像的id
    @prop({ required: true, default: 1 })
-    grade: number;                  // 等级
+    grade: number = 1;                  // 等级
    @prop({ required: true, default: 0 })
-    hp: number;
+    hp: number = 0;
    @prop({ required: true, default: 0 })
-    atk: number;
+    atk: number = 0;
    @prop({ required: true, default: 0 })
-    def: number;
+    def: number = 0;
    @prop({ required: true, default: 0 })
-    mdef: number;
-    @prop({ required: true, default: 0 })
-    agi: number;
-    @prop({ required: true, default: 0 })
-    luk: number;
+    mdef: number = 0;
+
+    constructor(id: number) {
+        this.id = id;
+    }
+
+    public get attr() {
+        let map = new Map<number, number>();
+        map.set(ABI_TYPE.ABI_HP, this.hp);
+        map.set(ABI_TYPE.ABI_ATK, this.atk);
+        map.set(ABI_TYPE.ABI_DEF, this.def);
+        map.set(ABI_TYPE.ABI_MDEF, this.mdef);
+        return map
+    }
+
+    public set attr(value: Map<number, number>) {
+        value.forEach((val, id) => {
+            if(id == ABI_TYPE.ABI_HP) this.hp = val;
+            if(id == ABI_TYPE.ABI_ATK) this.atk = val;
+            if(id == ABI_TYPE.ABI_DEF) this.def = val;
+            if(id == ABI_TYPE.ABI_MDEF) this.mdef = val;
+        });
+    }
 }
 // 初始化
 function getInitialTeraph() {
    let teraphs = new Array<Teraph>();
    for(let i = ROLE_TERAPH.START; i <= ROLE_TERAPH.END; i++) {
-        let p = new Teraph();
-        p.id = i;
-        p.grade = 1;
-        p.hp = 0;
-        p.atk = 0;
-        p.def = 0;
-        p.mdef = 0;
-        p.agi = 0;
-        p.luk = 0;
+        let p = new Teraph(i);
        teraphs.push(p);
    }
    return teraphs;
@@ -114,8 +137,8 @@ export default class Role extends BaseModel {
    lv: number;							// 主公等级
    @prop({ required: true, default: 0, set: (val: number) => val, get: (val: number) => reduceCe(val) })
    ce: number;							// 总战力
-    @prop({ required: true, default: new CeAttrRole(), _id: false })
-    globalCeAttr: CeAttrRole;							// 总战力
+    @prop({ required: true, type: CeAttrDataRole, default: [], _id: false })
+    attr: CeAttrDataRole[];					// 总战力
    @prop({ required: true, default: 0, set: (val: number) => val, get: (val: number) => reduceCe(val) })
    topLineupCe: number;			// 最强x人战力
    @prop({ required: true, type: TopHero, default: [], _id: false })
@@ -227,7 +250,7 @@ export default class Role extends BaseModel {
    @prop({ required: true, default: 0 })
    updatedMailAt: number;
    public static async findAllByUid(uid: number, lean = true) {
-        const role: RoleType[] = await RoleModel.find({ 'userInfo.uid': uid }).select('roleId roleName serverId').lean(lean);
+        const role: RoleType[] = await RoleModel.find({ 'userInfo.uid': uid }).select('roleId roleName serverId headHid sHid lv updatedAt').lean(lean);
        return role;
    }

@@ -242,8 +265,8 @@ export default class Role extends BaseModel {
     * @param select 选取字段，来自 selectConst/ROLE
     * @param getters 是否使用get方法，如ce使用了自动缩小1w倍
     */
-    public static async findByRoleId(roleId: string, select?: string, getters = false) {
-        const role: RoleType = await RoleModel.findOne({ roleId }).select(select).lean({getters});
+    public static async findByRoleId(roleId: string, select?: string, getters = false, virtuals = true) {
+        const role: RoleType = await RoleModel.findOne({ roleId }).select(select).lean({getters, virtuals});
        return role;
    }

@@ -252,9 +275,8 @@ export default class Role extends BaseModel {
        if (!user) return null;
        const doc = new RoleModel();
        const update = Object.assign(doc.toJSON(), roleInfo, { userInfo: user, serverType: user.serverType, serverId });
-        initRoleAtrr(update);
        const role: RoleType = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, update, { upsert: true, new: true }).lean(lean);
-        
+        initRoleAtrr(role);
        return role;
    }

@@ -427,7 +449,7 @@ export default class Role extends BaseModel {
        return recs
    }

-    public static async updateRoleInfo(roleId: string, roleUpdate:roleUpdate, lean = true) {
+    public static async updateRoleInfo(roleId: string, roleUpdate:RoleUpdate, lean = true) {
        delete roleUpdate._id;
        let result: RoleType = await RoleModel.findOneAndUpdate({roleId}, {$set:roleUpdate}, {new: true}).lean(lean);
        return result;
@@ -519,4 +541,4 @@ export default class Role extends BaseModel {
 export const RoleModel = getModelForClass(Role);

 export interface RoleType extends Pick<DocumentType<Role>, keyof Role>{};
-type roleUpdate = Partial<RoleType>; // 将所有字段变成可选项
+export type RoleUpdate = Partial<RoleType>; // 将所有字段变成可选项
--- a/shared/db/User.ts
+++ b/shared/db/User.ts
@@ -3,6 +3,8 @@ import { CounterModel } from './Counter';
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { genCode } from '../pubUtils/util';
+const bcrypt = require('bcrypt');
+const SALT_WORK_FACTOR = 5

 /**
  * 用户字段接口
@@ -24,16 +26,42 @@ export default class User extends BaseModel {
  token: string;

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

  @prop({ required: true, default: '' })
  telHash: string;

+  @prop({ required: true })
+  password: string;
+
+  @prop({ required: true })
+  salt: string;
+
  @prop({ required: true, default: '' })
  channelId: string;

+  // 游客相关
+  @prop({ required: false, default: false })
+  isGuest: boolean;    // 是否是游客
  @prop({ required: false })
-  guestId: string;
+  guestId: string;     // 游客id
+  @prop({ required: false, default: 0 })
+  guestTime: number;   // 游客体验时间
+
+  // 防沉迷相关
+  @prop({ required: false, default: false })
+  hasAuthenticated: boolean;    // 是否是已认证
+  @prop({ required: false })
+  birthday: string;             // 生日年月
+  @prop({ required: false })
+  pi: string;                   // 已通过实名认证用户唯一标识
+  @prop({ required: false, default: 0 })
+  todayPlayTime: number;        // 今日游戏时间
+  @prop({ required: false })
+  reportTime: Date;               // 汇报时间
+
+  @prop({ required: false, default: false })
+  hasSetPw: boolean;               // 是否设置过密码

  // 最后登录 IP
  @prop({ required: false })
@@ -52,6 +80,9 @@ export default class User extends BaseModel {
    unionId: string; // 用户标识
  }];

+  @prop({ required: true, type: String, default: [], _id: false })
+  device: string[];
+
  @prop({ required: true, default: 'com.bantu.zyz' })
  pkgName: string;

@@ -67,23 +98,77 @@ export default class User extends BaseModel {
  @prop({ required: true, default: 0 })
  auth: number;

-  public static async updateToken(tel: string, token: string, platform: string, pkgName: string, serverType: string, lean = true) {
-    let user: UserType = await UserModel.findOne({ tel }).lean();
+  public static async createUser(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string, guestTime?: number) {
    const curTime: Date = new Date();
+
+    const uid = await CounterModel.getNewCounter(COUNTER.UID);
+    const userCode = genCode(8);
+    const doc = new UserModel();
    let update = {};
-    if (!user) {
-      const uid = await CounterModel.getNewCounter(COUNTER.UID);
-      const userCode = genCode(8);
-      const doc = new UserModel();
-      update = Object.assign(update, { platform, pkgName, serverType, createTime: curTime, uid, userCode, username: `用户${uid}` }, doc.toJSON());
-    }
-    update = Object.assign(update, { token, lastLoginTime: curTime });
-    user = await UserModel.findOneAndUpdate({ tel }, update, { upsert: true, new: true }).lean(lean);
+    update = Object.assign(update, doc.toJSON(), { platform, pkgName, serverType, createTime: curTime, uid, userCode, username: `用户${uid}`, isGuest, token, lastLoginTime: curTime, guestTime });
+    if(isGuest) update["guestId"] = tel;
+    delete update["device"];
+
+    const user: UserType = await UserModel.findOneAndUpdate({ tel }, { $set: update, $addToSet: {device: deviceId}}, { upsert: true, new: true }).lean();
    return user;
  }

+  public static async getLastDeviceGuest(deviceId: string) {
+    const user: UserType = await UserModel.findOne({ device: { $elemMatch: { $eq: deviceId } }, isGuest: true }).sort({createTime: -1}).lean();
+    return user;
+  }
+
+  public static async updateToken(tel: string, token: string, deviceId: string, lean = true) {
+    const curTime: Date = new Date();
+
+    let user = await UserModel.findOneAndUpdate({ tel }, { $set: { token, lastLoginTime: curTime }, $addToSet: {device: deviceId}}, { new: true }).lean(lean);
+    return user;
+  }
+
+  public static async createOrUpdate(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string) {
+    let user: UserType = await UserModel.findOne({ tel }).lean();
+    if (!user) {
+      user = await UserModel.createUser(isGuest, tel, token, platform, pkgName, serverType, deviceId);
+    } else {
+      user = await UserModel.updateToken(tel, token, deviceId);
+    }
+    return user;
+  }
+
+  private static async encryptPass(password: string, salt?: string) {
+    if (!salt) {
+        salt = await bcrypt.genSalt(SALT_WORK_FACTOR);
+    }
+    let npassword = await bcrypt.hash(password, salt);
+    return { npassword, salt };
+  }
+
+  public static async setPass(uid: number, password: string, lean = true) {
+    let r = await this.encryptPass(password);
+    const user: UserType = await UserModel.findOneAndUpdate({ uid }, { $set: { password: r.npassword, salt: r.salt, hasSetPw: true }}, {new: true}).lean(lean);
+    return user;
+  }
+
+  public static async bindTel(uid: number, tel: string, lean = true) {
+    const user: UserType = await UserModel.findOneAndUpdate({ uid, isGuest: true }, { $set: { tel, isGuest: false }}, {new: true}).lean(lean);
+    return user;
+  }
+
+  public static async checkPass(tel: string, password: string, token: string, deviceId: string, lean = true) {
+    const user: UserType = await UserModel.findOne({ tel }).select('salt').lean();
+    if (user) {
+      const curTime: Date = new Date();
+        let { salt } = user;
+        let { npassword } = await this.encryptPass(password, salt);
+        const checkUser: UserType = await UserModel.findOneAndUpdate({ tel, password: npassword }, { $set: { token, lastLoginTime: curTime }, $addToSet: {device: deviceId}}, { new: true }).lean(lean);
+        return checkUser;
+    } else {
+        return null
+    }
+  }
+
  public static async findUserByToken(token: string, lean = true) {
-    const user: UserType = await UserModel.findOne({ token }).select('uid token serverType auth userCode').lean(lean);
+    const user: UserType = await UserModel.findOne({ token }).select('uid token serverType auth tel userCode pkgName').lean(lean);
    return user;
  }

@@ -93,7 +178,7 @@ export default class User extends BaseModel {
  }

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

@@ -102,8 +187,18 @@ export default class User extends BaseModel {
    return user;
  }

+  public static async findUserByUserCode(userCode: string, lean = true) {
+    const user: UserType = await UserModel.findOne({ userCode }).lean(lean);
+    return user;
+  }
+
  public static async addAuth(uid: number, auth: number, lean = true) {
-    const user: UserType = await UserModel.findOneAndUpdate({ uid }, { auth }).select('uid tel').lean(lean);
+    const user: UserType = await UserModel.findOneAndUpdate({ uid }, { auth }, {new: true}).select('uid tel').lean(lean);
+    return user;
+  }
+
+  public static async authentication(uid: number, birthday: string, pi: string, lean = true) {
+    const user: UserType = await UserModel.findOneAndUpdate({ uid }, { hasAuthenticated: true, birthday, pi }, {new: true}).lean(lean);
    return user;
  }

@@ -117,8 +212,15 @@ export default class User extends BaseModel {
    const user: UserType[] = await UserModel.find(searchObj).select('uid tel username serverType auth').lean(lean);
    return user;
  }
+
+
+  public static async updatePlayTime(userCode: string, guestTimeInc: number, todayPlayTime: number, lean = true) {
+    const user: UserType = await UserModel.findOneAndUpdate({ userCode }, { $inc: { guestTime: guestTimeInc }, $set: { todayPlayTime, reportTime: new Date() }}, { new: true }).lean(lean);
+    return user;
+  }
 }

+
 export const UserModel = getModelForClass(User);

 export interface UserType extends Pick<DocumentType<User>, keyof User>{};