xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

填充数据库文档的初始化数据

Browse Source
This commit is contained in:
liangtongchuan
2020-09-14 22:24:23 +08:00
parent 79754b788c
commit 9e692510ea
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/db/Equip.ts
View File

@@ -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;
}

4
shared/db/Hero.ts
View File

@@ -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;
}

5
shared/db/Role.ts
View File

@@ -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;
}
}

19
shared/db/User.ts
View File

@@ -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);