From aeb7cf69a91adc3dc99710cc24e54b7bb6cd070f Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 19 Apr 2022 21:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9Adebug=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/connector/handler/entryHandler.ts | 26 ++++---------------
 game-server/app/services/connectorService.ts  |  2 +-
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts
index eb85a5640..d2e58fd70 100644
--- a/game-server/app/servers/connector/handler/entryHandler.ts
+++ b/game-server/app/servers/connector/handler/entryHandler.ts
@@ -14,7 +14,7 @@ import { rmRoleFromQueue, roleLeave, getRoleOnlineInfo, roleLogin } from '../../
 import { addRoleToGuildChannel, addRoleToSysChannel, addRoleToWorldChannel, leaveGuildAuctionChannel, leaveGuildChannel, leaveSysChannel, leaveWorldAuctionChannel, leaveWorldChannel, recentGuildMsgs, recentPrivateChatInfos, recentSysMsgs, recentWorldMsgs } from '../../../services/chatService';
 import { reportOneOnline, savePlayTime } from '../../../services/authenticateService';
 import { checkTaskInEntry, } from '../../../services/task/taskService';
-import { pushData, everydayRefresh, kickUser } from '../../../services/connectorService';
+import { pushData, everydayRefresh, kickUser, getModuleData } from '../../../services/connectorService';
 // import { setComBtlOnUserLeave } from '../../../services/comBattleService';
 import Counter from '../../../db/Counter';
 import { getExpByLv } from '../../../pubUtils/data';
@@ -300,31 +300,15 @@ export class EntryHandler {
         return resResult(STATUS.SUCCESS, { user });
     }
 
-    async debugGetRole(msg: { magicWord: string }, session: FrontendSession) {
-        const { magicWord } = msg;
+    async debugGetRole(msg: { magicWord: string, type: string }, session: FrontendSession) {
+        const { magicWord, type = 'role' } = msg;
         if (magicWord !== DEBUG_MAGIC_WORD) {
             return resResult(STATUS.TOKEN_ERR);
         }
         let roleId = session.get('roleId');
-
         let role = await RoleModel.findByRoleId(roleId, '-_id', true, true);
-        let heros = await HeroModel.findByRole(role.roleId, [], HERO_SELECT.ENTRY, true);
-        let jewels = await JewelModel.findbyRole(role.roleId, JEWEL_SELECT.ENTRY);
-        let items = await ItemModel.findbyRole(role.roleId, ITEM_SELECT.ENTRY);
-        let skins = await SkinModel.findbyRole(role.roleId, SKIN_SELECT.ENTRY);
-
-        role['heros'] = heros.map(hero => new HeroParam(hero));
-        role['jewels'] = jewels;
-        role['consumeGoods'] = items;
-        role['skins'] = skins;
-        let apJson = await getAp(role.roleId, '', role.lv);
-        role['apJson'] = apJson;
-
-        if (!role.showLineup) role.showLineup = role.topLineup.map(cur => cur.hid);
-        role.heads = role.heads.filter(cur => cur.status);
-        role.frames = role.frames.filter(cur => cur.status);
-        role.spines = role.spines.filter(cur => cur.status);
-        return resResult(STATUS.SUCCESS, { role });
+        let module = await getModuleData(type, { role, session });
+        return resResult(STATUS.SUCCESS, { role: module });
     }
 
     async debugQueryTokenByTel(msg: { tel: string, magicWord: string, serverId: number }, session: FrontendSession) {
diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts
index 18f119180..d715edd05 100644
--- a/game-server/app/services/connectorService.ts
+++ b/game-server/app/services/connectorService.ts
@@ -105,7 +105,7 @@ export async function pushData(hasInit: boolean, role: RoleType, session: Fronte
     }
 }
 
-async function getModuleData(type: string, data: { role: RoleType, session: FrontendOrBackendSession }, guildData: { hasGuild: boolean, guild?: GuildType, userGuild?: UserGuildType, guildResult?: any } = { hasGuild: false }) {
+export async function getModuleData(type: string, data: { role: RoleType, session: FrontendOrBackendSession }, guildData: { hasGuild: boolean, guild?: GuildType, userGuild?: UserGuildType, guildResult?: any } = { hasGuild: false }) {
     let { role, session } = data;
     const { roleId, serverId, roleName, guildCode } = role;
     let { hasGuild, guild, userGuild, guildResult } = guildData;