From 6c101ba5408b5858c13216bc9b0ebbe22aa3a7f0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 22 Sep 2020 12:26:41 +0800
Subject: [PATCH] 1

---
 server/rankserver/guildmgr.cc   | 27 +++++++++++++++++++++++++++
 server/rankserver/guildmgr.h    |  2 ++
 server/rankserver/handlermgr.cc |  5 +++++
 3 files changed, 34 insertions(+)

diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index 2ceb26d..5005670 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -19,6 +19,11 @@ void GuildMgr::UnInit()
 
 void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
 {
+    if (!load_done_) {
+        request->resp_xobj->SetVal("errcode", 2);
+        request->resp_xobj->SetVal("errmsg", "");
+        return;
+    }
     request->pending = true;
     request->resp_xobj->SetVal("errcode", 0);
     request->resp_xobj->SetVal("errmsg", "");
@@ -89,6 +94,11 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
 
 void GuildMgr::__GuildSearch(f8::JsonHttpRequest* request)
 {
+    if (!load_done_) {
+        request->resp_xobj->SetVal("errcode", 2);
+        request->resp_xobj->SetVal("errmsg", "");
+        return;
+    }
     int curr_page = request->request.At("curr_page")->AsXValue();
     int page_size = request->request.At("page_size")->AsXValue();
     std::string search_name = request->request.At("guild_name")->AsXValue().GetString();
@@ -139,6 +149,12 @@ void GuildMgr::__GuildSearch(f8::JsonHttpRequest* request)
 
 void GuildMgr::__GuildRank(f8::JsonHttpRequest* request)
 {
+    if (!load_done_) {
+        request->resp_xobj->SetVal("errcode", 2);
+        request->resp_xobj->SetVal("errmsg", "");
+        return;
+    }
+
     int gameid = request->request.At("gameid")->AsXValue();
     std::vector<cs::MFGuildBasic*>* sorted_guild_list = GetGuildRank(gameid);
 
@@ -161,6 +177,17 @@ void GuildMgr::__GuildRank(f8::JsonHttpRequest* request)
     delete guild_list;
 }
 
+void GuildMgr::__GenTestData(f8::JsonHttpRequest* request)
+{
+    if (!load_done_) {
+        request->resp_xobj->SetVal("errcode", 2);
+        request->resp_xobj->SetVal("errmsg", "");
+        return;
+    }
+    request->resp_xobj->SetVal("errcode", 0);
+    request->resp_xobj->SetVal("errmsg", "");
+}
+
 cs::MFGuildBasic* GuildMgr::GetGuild(long long guild_id)
 {
     auto itr = guild_hash_.find(guild_id);
diff --git a/server/rankserver/guildmgr.h b/server/rankserver/guildmgr.h
index 86de76f..10b0b48 100644
--- a/server/rankserver/guildmgr.h
+++ b/server/rankserver/guildmgr.h
@@ -18,6 +18,7 @@ class GuildMgr : public a8::Singleton<GuildMgr>
     void __GuildCreate(f8::JsonHttpRequest* request);
     void __GuildSearch(f8::JsonHttpRequest* request);
     void __GuildRank(f8::JsonHttpRequest* request);
+    void __GenTestData(f8::JsonHttpRequest* request);
 
  private:
     cs::MFGuildBasic* GetGuild(long long guild_id);
@@ -25,6 +26,7 @@ class GuildMgr : public a8::Singleton<GuildMgr>
     void AddGuild(cs::MFGuildBasic* guild);
 
  private:
+    bool load_done_ = false;
     std::map<long long, cs::MFGuildBasic*> guild_hash_;
     std::map<int, std::vector<cs::MFGuildBasic*>> sorted_game_guild_list_;
 };
diff --git a/server/rankserver/handlermgr.cc b/server/rankserver/handlermgr.cc
index 2e1a8a2..6e38f02 100644
--- a/server/rankserver/handlermgr.cc
+++ b/server/rankserver/handlermgr.cc
@@ -45,6 +45,11 @@ void HandlerMgr::Init()
                          {
                              GuildMgr::Instance()->__GuildRank(request);
                          });
+    RegisterGMMsgHandler("Guild@genTestData",
+                         [] (f8::JsonHttpRequest* request)
+                         {
+                             GuildMgr::Instance()->__GenTestData(request);
+                         });
 }
 
 void HandlerMgr::UnInit()