From aa0e313b9b317baae038e84352033c100eccb53c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 24 Sep 2020 14:06:54 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc    | 4 +++-
 server/imserver/synchelper.h | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 33d8bd4..6f9ee28 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -1133,10 +1133,12 @@ void Player::ForwardGuildCMMsg(f8::MsgHdr& hdr, long long guild_id)
 {
     ss::SS_IM_ForwardGuildCMMsg msg;
     FillIMMsgConext(msg.mutable_context());
+    msg.set_msgid(hdr.msgid);
     if (hdr.buflen > 0) {
         msg.mutable_payload()->assign(hdr.buf, hdr.buflen);
     }
-    SyncHelper::Instance()->SendIMConnMsg(0, msg);
+    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(guild_id),
+                                          msg);
 }
 
 void Player::FillMFUserInfo(cs::MFUserInfo* user_info)
diff --git a/server/imserver/synchelper.h b/server/imserver/synchelper.h
index 8b5f7c1..d483d06 100644
--- a/server/imserver/synchelper.h
+++ b/server/imserver/synchelper.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "jsondatamgr.h"
+
 namespace ss
 {
     class SS_IM_FriendAgreeRequest;
@@ -48,13 +50,13 @@ public:
     void BroadcastIMConnMsg(int msgid, ::google::protobuf::Message& msg);
 
     template <typename T>
-    void SendIMConnMsg(int intance_id, const T& msg)
+    void SendIMConnMsg(int instance_id, const T& msg)
     {
         static int msgid = f8::Net_GetMessageId(msg);
-        SendIMConnMsg(msgid, msg);
+        SendIMConnMsg(instance_id, msgid, msg);
     }
 
-    void SendIMConnMsg(int intance_id, int msgid, const ::google::protobuf::Message& msg);
+    void SendIMConnMsg(int instance_id, int msgid, const ::google::protobuf::Message& msg);
 
     std::map<long long, timer_list*> pending_request_hash_;
 };