From 43a25f2922a3f47053fa6fb57b5054016803146c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 16 Sep 2020 17:41:34 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.cc    | 45 +++++++++++++++++++++++++++++++++++++
 server/imserver/guild.h     | 28 +++++++++++++++++++++++
 server/imserver/guildmgr.cc |  2 +-
 server/imserver/guildmgr.h  | 20 ++++++++---------
 4 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index ba71352..ec9b2aa 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -87,6 +87,51 @@ void Guild::MarkDirty()
     }
 }
 
+void Guild::_CMGuildInfo(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildInfo& msg)
+{
+
+}
+
+void Guild::_CMGuildJoin(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildJoin& msg)
+{
+
+}
+
+void Guild::_CMGuildAgree(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildAgree& msg)
+{
+
+}
+
+void Guild::_CMGuildKick(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildKick& msg)
+{
+
+}
+
+void Guild::_CMGuildQuit(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildQuit& msg)
+{
+
+}
+
+void Guild::_CMGuildDismiss(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildDismiss& msg)
+{
+
+}
+
+void Guild::_CMGuildRename(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildRename& msg)
+{
+
+}
+
+void Guild::_CMGuildMemberList(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildMemberList& msg)
+{
+
+}
+
+void Guild::_CMGuildLog(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildLog& msg)
+{
+
+}
+
 void Guild::FillGuildDB(ss::MFGuildDB& guild_dto)
 {
 
diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index 3624f77..9fdd5cf 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -2,6 +2,24 @@
 
 #include <a8/timer_attacher.h>
 
+namespace cs
+{
+    class CMGuildInfo;
+    class CMGuildJoin;
+    class CMGuildAgree;
+    class CMGuildKick;
+    class CMGuildQuit;
+    class CMGuildDismiss;
+    class CMGuildRename;
+    class CMGuildMemberList;
+    class CMGuildLog;
+}
+
+namespace ss
+{
+    class MFIMMsgConext;
+}
+
 struct GuildMember
 {
     std::string account_id;
@@ -46,6 +64,16 @@ class Guild
     void RemoveMember(const std::string& account_id);
     void MarkDirty();
 
+    void _CMGuildInfo(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildInfo& msg);
+    void _CMGuildJoin(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildJoin& msg);
+    void _CMGuildAgree(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildAgree& msg);
+    void _CMGuildKick(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildKick& msg);
+    void _CMGuildQuit(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildQuit& msg);
+    void _CMGuildDismiss(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildDismiss& msg);
+    void _CMGuildRename(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildRename& msg);
+    void _CMGuildMemberList(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildMemberList& msg);
+    void _CMGuildLog(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildLog& msg);
+
 private:
     void FillGuildDB(ss::MFGuildDB& guild_dto);
     void SaveToDB();
diff --git a/server/imserver/guildmgr.cc b/server/imserver/guildmgr.cc
index 36c3107..b0c8bc9 100644
--- a/server/imserver/guildmgr.cc
+++ b/server/imserver/guildmgr.cc
@@ -45,7 +45,7 @@ private:
     cs::CMGuildKick cmmsg;
 };
 
-class CMGuildAgreeTak : public AsyncGuildTask
+class CMGuildQuitTask : public AsyncGuildTask
 {
 private:
     cs::CMGuildQuit cmmsg;
diff --git a/server/imserver/guildmgr.h b/server/imserver/guildmgr.h
index 9aaf1ad..ae69849 100644
--- a/server/imserver/guildmgr.h
+++ b/server/imserver/guildmgr.h
@@ -28,6 +28,16 @@ class GuildMgr : public a8::Singleton<GuildMgr>
     void Init();
     void UnInit();
 
+    template <typename T>
+    void ForwardGuildSMMsg(int socket_handle, const ss::MFIMMsgConext& context, T& smmsg)
+    {
+        static int msgid = f8::Net_GetMessageId(smmsg);
+        ForwardGuildSMMsg(socket_handle, context, msgid, smmsg);
+    }
+    void ForwardGuildSMMsg(int socket_handle,
+                           const ss::MFIMMsgConext& context,
+                           int msgid,
+                           const ::google::protobuf::Message& smmsg);
     void _SS_IM_ForwardGuildCMMsg(f8::MsgHdr& hdr, const ss::SS_IM_ForwardGuildCMMsg& msg);
 
  private:
@@ -39,16 +49,6 @@ class GuildMgr : public a8::Singleton<GuildMgr>
     void LoadGuild(long long guild_id);
     bool IsValidGuildId(long long guild_id);
     Guild* GetGuild(long long group_id);
-    template <typename T>
-    void ForwardGuildSMMsg(int socket_handle, const ss::MFIMMsgConext& context, T& smmsg)
-    {
-        static int msgid = f8::Net_GetMessageId(smmsg);
-        ForwardGuildSMMsg(socket_handle, context, msgid, smmsg);
-    }
-    void ForwardGuildSMMsg(int socket_handle,
-                           const ss::MFIMMsgConext& context,
-                           int msgid,
-                           const ::google::protobuf::Message& smmsg);
 
  private:
     std::map<long long, Guild*> id_hash_;