起名：添加屏蔽词检测

shared/db/Guild.ts

@@ -1,7 +1,6 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typegoose';
 import Role, { RoleType } from './Role';
-import { genCode } from '../pubUtils/util';
 import { GUILD_STRUCTURE, GUILD_STATUS, GUILD_PER_PAGE, GUILD_SELECT, REDIS_KEY, SHOP_REFRESH_TYPE } from '../consts';
 import { getZeroPoint, getZeroPointD, nowSeconds } from '../pubUtils/timeUtil';
 import { reduceCe } from '../pubUtils/util';
@@ -112,11 +111,11 @@ export default class Guild extends BaseModel {
     @prop({ required: true, default: 0 })
     openBossCnt: number;   // 开启boss本次数
 
-    public static async createGuild(params: { name: string, icon: number, notice: string }, role: RoleType, serverId: number) {
+    public static async createGuild(params: { guildCode: string, name: string, icon: number, notice: string }, role: RoleType, serverId: number) {
         const doc = new GuildModel();
         const update = Object.assign(doc.toJSON(), params, { leader: role._id, members: [role.roleId], guildCe: role.ce, serverId, lvUpdateTime: nowSeconds() });
         delete update._id;
-        const code = genCode(6);
+        const code = params.guildCode;
         const result: GuildType = await GuildModel.findOneAndUpdate({ code }, update, { upsert: true, new: true })
         .select({ _id: 0, __v: 0, createdAt: 0, updatedAt: 0 })
         .populate('leader', { roleId: 1, roleName: 1, head: 1, frame: 1, spine: 1, lv: 1, quitTime: 1, ce: 1, title: 1, _id: 0 }, 'Role')

shared/db/User.ts

@@ -259,7 +259,7 @@ export default class User extends BaseModel {
   }
 
   public static async findUserByUid(uid: number) {
-    const user: UserType = await UserModel.findOne({ uid }).select('uid tel channelInfo ip').lean({ getters: true });
+    const user: UserType = await UserModel.findOne({ uid }).select('uid tel channelInfo channelType ip').lean({ getters: true });
     return user;
   }