From 9e692510ea3bf9413ba74dc0a1f4f572ce97d8ec Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Mon, 14 Sep 2020 22:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E5=85=85=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/db/Equip.ts |  4 +++-
 shared/db/Hero.ts  |  4 +++-
 shared/db/Role.ts  |  5 +++--
 shared/db/User.ts  | 19 ++++++++++---------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/shared/db/Equip.ts b/shared/db/Equip.ts
index 67b56ed19..0bf2e0897 100644
--- a/shared/db/Equip.ts
+++ b/shared/db/Equip.ts
@@ -45,7 +45,9 @@ export default class Equip extends BaseModel {
   }
 
   public static async createEquip(equipInfo: {roleId: string, roleName: string, eid: number, seqId: number, type: number, eName: string}, lean = true) {
-    const equip = await EquipModel.findOneAndUpdate({ seqId: equipInfo.seqId }, equipInfo, {upsert: true, new: true}).lean(lean);
+    const doc = new EquipModel();
+    const update = Object.assign(equipInfo, doc.toJSON());
+    const equip = await EquipModel.findOneAndUpdate({ seqId: equipInfo.seqId }, update, {upsert: true, new: true}).lean(lean);
     return equip;
   }
 
diff --git a/shared/db/Hero.ts b/shared/db/Hero.ts
index f201a9226..613df5d68 100644
--- a/shared/db/Hero.ts
+++ b/shared/db/Hero.ts
@@ -64,7 +64,9 @@ export default class Hero extends BaseModel {
   }
 
   public static async createHero(heroInfo: {roleId: string, roleName: string, hid: number, hName: string, seqId: number}, lean = true) {
-    const hero = await HeroModel.findOneAndUpdate({roleId: heroInfo.roleId, hid: heroInfo.hid}, heroInfo, {upsert: true, new: true}).lean(lean);
+    const doc = new HeroModel();
+    const update = Object.assign(heroInfo, doc.toJSON());
+    const hero = await HeroModel.findOneAndUpdate({roleId: heroInfo.roleId, hid: heroInfo.hid}, update, {upsert: true, new: true}).lean(lean);
     return hero;
   }
 
diff --git a/shared/db/Role.ts b/shared/db/Role.ts
index 5bc58c548..898afb35a 100644
--- a/shared/db/Role.ts
+++ b/shared/db/Role.ts
@@ -99,8 +99,9 @@ export default class Role extends BaseModel {
   public static async createRole(uid: number, serverId: number, roleInfo: {roleId: string; roleName: string; seqId: number; code: string}, lean = true) {
     const user = await User.findUserByUid(uid);
     if (!user) return null;
-    const info = Object.assign(roleInfo, { userInfo: user, serverType: user.serverType, serverId });
-    const role = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, info, { upsert: true, new: true }).lean(lean);
+    const doc = new RoleModel();
+    const update = Object.assign(roleInfo, { userInfo: user, serverType: user.serverType, serverId }, doc.toJSON());
+    const role = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, update, { upsert: true, new: true }).lean(lean);
     return role;
   }
 }
diff --git a/shared/db/User.ts b/shared/db/User.ts
index ac5dae45f..4e6d75a9a 100644
--- a/shared/db/User.ts
+++ b/shared/db/User.ts
@@ -22,17 +22,17 @@ export default class User extends BaseModel {
   @prop({ required: true })
   tel: string;
 
-  @prop({ required: true })
+  @prop({ required: true, default: '' })
   telHash: string;
 
-  @prop({ required: true })
+  @prop({ required: true, default: '' })
   channelId: string;
 
-  @prop({ required: true })
+  @prop({ required: false })
   guestId: string;
 
   // 最后登录 IP
-  @prop({ required: true })
+  @prop({ required: false })
   ip: string;
 
   @prop({ required: true })
@@ -42,21 +42,21 @@ export default class User extends BaseModel {
   createTime: Date;
 
   platform: string;
-  @prop({ required: true })
+  @prop({ required: true, default: [] })
   platforms: [{
     platform: string; // 平台：ios, android, web, pc
     unionId: string; // 用户标识
   }];
 
-  @prop({ required: true })
+  @prop({ required: true, default: 'com.bantu.zyz' })
   pkgName: string;
 
   // 服务器类型：official, channel, ios, oversea
-  @prop({ required: true })
+  @prop({ required: true, default: 'official' })
   serverType: string;
 
   // 账号是否被屏蔽
-  @prop({ required: true })
+  @prop({ required: true, default: false })
   blocked: boolean;
 
   public static async updateToken(tel: string, token: string, platform: string, pkgName: string, serverType: string, lean = true) {
@@ -65,7 +65,8 @@ export default class User extends BaseModel {
     let update = {};
     if (!user) {
       const uid = await CounterModel.getNewCounter(COUNTER.UID);
-      update = Object.assign(update, { platform, pkgName, serverType, createTime: curTime, uid, username: `用户${uid}` });
+      const doc = new UserModel();
+      update = Object.assign(update, { platform, pkgName, serverType, createTime: curTime, uid, username: `用户${uid}` }, doc.toJSON());
     }
     update = Object.assign(update, { token, lastLoginTime: curTime });
     user = await UserModel.findOneAndUpdate({ tel }, update, { upsert: true, new: true }).lean(lean);