diff --git a/game-server/app/servers/battle/handler/guildHandler.ts b/game-server/app/servers/battle/handler/guildHandler.ts index 70ebef3a5..45cdb5301 100644 --- a/game-server/app/servers/battle/handler/guildHandler.ts +++ b/game-server/app/servers/battle/handler/guildHandler.ts @@ -449,7 +449,6 @@ export class GuildHandler { const list = result.map(cur => { let guild = cur.guild; let leader = guild.leader; - delete guild.leader; delete cur.guild; return { applyCode: cur.applyCode, ...guild, leader: leader.roleName }; }); @@ -513,7 +512,6 @@ export class GuildHandler { select.push('auth', 'activeWeekly activeUpdateTime'); } let list = await UserGuildModel.getListByGuild(code, select.join(' '), { auth: 1 }); - console.log('**', JSON.stringify(list)) let result = list.map(cur => { let role = cur.role; delete role._id; diff --git a/game-server/app/services/redisService.ts b/game-server/app/services/redisService.ts index 2c200785d..e321f03e5 100644 --- a/game-server/app/services/redisService.ts +++ b/game-server/app/services/redisService.ts @@ -89,7 +89,6 @@ async function setRankRedisFromDb(type: string, serverId: number) { for(let { code, icon, name, lv, leader, activeWeekly = 0, activeUpdateTime = 0 } of ranks) { let _leader = leader; let { roleName, title, sHid, headHid, lv: leaderLv } = _leader; - console.log(activeWeekly, activeUpdateTime * 1000) await client.zaddAsync(getKeyName(REDIS_KEY.GUILD_ACTIVE_RANK, serverId), encodeScoreWithTime(activeWeekly, activeUpdateTime * 1000 ), code); let rankParam = new GuildRankParam(icon, name, lv, { roleName, title, sHid, headHid, lv: leaderLv }); await redisUserInfoAdd(REDIS_KEY.GUILD_INFO, code, rankParam); diff --git a/shared/db/Guild.ts b/shared/db/Guild.ts index 8de08bb94..005377c4b 100644 --- a/shared/db/Guild.ts +++ b/shared/db/Guild.ts @@ -3,7 +3,7 @@ import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typ import Role, { RoleType } from './Role'; import { genCode } from '../pubUtils/util'; import { GUILD_STRUCTURE, GUILD_STATUS, GUILD_PER_PAGE } from '../consts'; -import { getCurWeekTime } from '../pubUtils/timeUtil'; +import { getCurWeekTime, nowSeconds } from '../pubUtils/timeUtil'; class Structure { @prop({ required: true }) @@ -60,7 +60,7 @@ export default class Guild extends BaseModel { @prop({ required: true, default: 0 }) activeWeekly: number; - @prop({ required: true, default: Date.now() }) + @prop({ required: true, default: nowSeconds() }) activeUpdateTime: number; @prop({ required: true, default: new Date(), select: false }) @@ -93,6 +93,7 @@ export default class Guild extends BaseModel { delete update._id; const code = genCode(6); 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, sHid: 1, headHid: 1, lv: 1, loginTime: 1, ce: 1, title: 1, _id: 0 }, 'Role') .lean(); diff --git a/shared/db/UserGuildApply.ts b/shared/db/UserGuildApply.ts index af4993611..ce53b4e16 100644 --- a/shared/db/UserGuildApply.ts +++ b/shared/db/UserGuildApply.ts @@ -94,7 +94,7 @@ export default class UserGuildApply extends BaseModel { const lastApply = await this.findByCode(lastApplyCode); condition["createdAt"] = { $lt: lastApply.createdAt }; } - const list: UserGuildApplyType[] = await UserGuildApplyModel.find(condition) + const list: UserGuildApplyType[] = await UserGuildApplyModel.find(condition, {_id: 0}) .sort({ createdAt: -1 }) .select('applyCode guild') .populate({