From e183c780ee9655a67bf9cf5d20fe6e6f40bb4d5c Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Sat, 4 Mar 2023 16:19:46 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=88=98=E5=8C=BA=E5=88=86=E9=85=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/gm/handler/gmHandler.ts | 9 +++++++++
 gm-server/app/service/Game.ts                   | 2 +-
 shared/db/GVGServerGroup.ts                     | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts
index 54caac9ad..3c093951d 100644
--- a/game-server/app/servers/gm/handler/gmHandler.ts
+++ b/game-server/app/servers/gm/handler/gmHandler.ts
@@ -302,6 +302,15 @@ export class GmHandler {
         for(let serverId of serverIds) {
             await GVGServerGroupModel.updateByServerId(serverId, groupId, scheduleTime);
         }
+        try {
+            await pinus.app.rpc.guild.guildRemote.setGVGServerGroup.broadcast();
+            await pinus.app.rpc.chat.chatRemote.setGVGServerGroup.broadcast();
+            await pinus.app.rpc.connector.connectorRemote.setGVGServerGroup.broadcast();
+            await pinus.app.rpc.gm.gmRemote.setGVGServerGroup.broadcast();
+            await pinus.app.rpc.systimer.systimerRemote.setGVGServerGroup.broadcast();
+        } catch(e) {
+            console.log('remote未初始完');
+        }
         return resResult(STATUS.SUCCESS);
     }
 
diff --git a/gm-server/app/service/Game.ts b/gm-server/app/service/Game.ts
index 97c9fbf0a..afe6c4b73 100644
--- a/gm-server/app/service/Game.ts
+++ b/gm-server/app/service/Game.ts
@@ -359,7 +359,7 @@ export default class Game extends Service {
         const servers = serverlists.map(server => {
             let current = currentTypes.find(obj => obj.serverId == server.id);
             let next = nextTypes.find(obj => obj.serverId == server.id);
-            let dic = gameData.serverNames.get(server.id);
+            let dic = gameData.serverNames.get(server.serverId);
             return { id: server.id, serverId: server.serverId, name: server.name, current: current?.groupId|| dic.groupId, next: next?.groupId|| current?.groupId || dic.groupId, env: this.app.config.realEnv }
         });
 
diff --git a/shared/db/GVGServerGroup.ts b/shared/db/GVGServerGroup.ts
index d96ee548b..59ca17cab 100644
--- a/shared/db/GVGServerGroup.ts
+++ b/shared/db/GVGServerGroup.ts
@@ -20,9 +20,9 @@ export default class GVGServerGroup extends BaseModel {
       const serverGroup: { serverId: number, groupId: number }[] = await GVGServerGroupModel.aggregate([
         { $match: { time: { $lte: time } } },
         { $sort: { time: -1 } },
-        { $group: { _id: "$id", serverId: { $first: "$serverId" }, groupId: { $first: "$groupId" }, time: { $first: "$time" }} },
+        { $group: { _id: "$serverId", serverId: { $first: "$serverId" }, groupId: { $first: "$groupId" }, time: { $first: "$time" }} },
         { $sort: { _id: -1 } },
-        { $project: { _id: 0, id: "$_id", serverId: "$serverId", groupId: "$groupId", time: "$time" } }
+        { $project: { _id: 0, serverId: "$serverId", groupId: "$groupId", time: "$time" } }
       ]);
       return serverGroup;
     }