From 995e83932684978eb0f789bf05dc7e4eaf15f967 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 16 Jun 2020 14:55:51 +0800
Subject: [PATCH] 1

---
 server/masterserver/cachemgr.cc   | 5 -----
 server/masterserver/cachemgr.h    | 1 -
 server/masterserver/handlermgr.cc | 2 +-
 server/masterserver/svrmgr.cc     | 5 +++++
 server/masterserver/svrmgr.h      | 1 +
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/masterserver/cachemgr.cc b/server/masterserver/cachemgr.cc
index d2adc2e..f7725c8 100644
--- a/server/masterserver/cachemgr.cc
+++ b/server/masterserver/cachemgr.cc
@@ -27,11 +27,6 @@ void CacheMgr::_SS_IM_PullUserList(f8::MsgHdr& hdr, const ss::SS_IM_PullUserList
 
 }
 
-void CacheMgr::_SS_IM_IMServerList(f8::MsgHdr& hdr, const ss::SS_IM_IMServerList& msg)
-{
-
-}
-
 Friend* CacheMgr::GetFriendData(const std::string& account_id)
 {
     auto itr = friend_hash_.find(account_id);
diff --git a/server/masterserver/cachemgr.h b/server/masterserver/cachemgr.h
index da5954b..f5e92f6 100644
--- a/server/masterserver/cachemgr.h
+++ b/server/masterserver/cachemgr.h
@@ -19,7 +19,6 @@ class CacheMgr : public a8::Singleton<CacheMgr>
     void _SS_IM_UserOnline(f8::MsgHdr& hdr, const ss::SS_IM_UserOnline& msg);
     void _SS_IM_UserOffline(f8::MsgHdr& hdr, const ss::SS_IM_UserOffline& msg);
     void _SS_IM_PullUserList(f8::MsgHdr& hdr, const ss::SS_IM_PullUserList& msg);
-    void _SS_IM_IMServerList(f8::MsgHdr& hdr, const ss::SS_IM_IMServerList& msg);
 
     Friend* GetFriendData(const std::string& account_id);
 
diff --git a/server/masterserver/handlermgr.cc b/server/masterserver/handlermgr.cc
index 85a58a5..86f3f4e 100644
--- a/server/masterserver/handlermgr.cc
+++ b/server/masterserver/handlermgr.cc
@@ -52,7 +52,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&immsghandler, &CacheMgr::_SS_IM_UserOnline);
     RegisterNetMsgHandler(&immsghandler, &CacheMgr::_SS_IM_UserOffline);
     RegisterNetMsgHandler(&immsghandler, &CacheMgr::_SS_IM_PullUserList);
-    RegisterNetMsgHandler(&immsghandler, &CacheMgr::_SS_IM_IMServerList);
+    RegisterNetMsgHandler(&immsghandler, &SvrMgr::_SS_IM_IMServerList);
 }
 
 void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,
diff --git a/server/masterserver/svrmgr.cc b/server/masterserver/svrmgr.cc
index 175fe89..fc00002 100644
--- a/server/masterserver/svrmgr.cc
+++ b/server/masterserver/svrmgr.cc
@@ -104,6 +104,11 @@ void SvrMgr::_SS_IM_ReportServerInfo(f8::MsgHdr& hdr, const ss::SS_IM_ReportServ
     IMListener::Instance()->SendMsg(hdr.socket_handle, respmsg);
 }
 
+void SvrMgr::_SS_IM_IMServerList(f8::MsgHdr& hdr, const ss::SS_IM_IMServerList& msg)
+{
+
+}
+
 void SvrMgr::___GSList(f8::JsonHttpRequest* request)
 {
     {
diff --git a/server/masterserver/svrmgr.h b/server/masterserver/svrmgr.h
index c6b2571..cbeba2b 100644
--- a/server/masterserver/svrmgr.h
+++ b/server/masterserver/svrmgr.h
@@ -38,6 +38,7 @@ class SvrMgr : public a8::Singleton<SvrMgr>
 
     void _SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_RequestTargetServer& msg);
     void _SS_IM_ReportServerInfo(f8::MsgHdr& hdr, const ss::SS_IM_ReportServerInfo& msg);
+    void _SS_IM_IMServerList(f8::MsgHdr& hdr, const ss::SS_IM_IMServerList& msg);
 
     void ___GSList(f8::JsonHttpRequest* request);