From 91bfb69548862bab2dec62855e8cc1b843562ab7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 9 Oct 2020 15:07:51 +0800 Subject: [PATCH] 1 --- server/rankserver/guildmgr.cc | 11 ++++++++++- server/rankserver/guildmgr.h | 3 ++- server/rankserver/handlermgr.cc | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc index a957c62..19bb37c 100644 --- a/server/rankserver/guildmgr.cc +++ b/server/rankserver/guildmgr.cc @@ -183,7 +183,9 @@ void GuildMgr::__GuildUpdate(f8::JsonHttpRequest* request) long long guild_id = request->request.At("guild_id")->AsXValue(); cs::MFGuildBasic* guild = GetGuildById(guild_id); if (guild) { + #if 0 guild->set_guild_name(request->request.At("guild_name")->AsXValue().GetString()); + #endif guild->set_guild_badge(request->request.At("guild_badge")->AsXValue()); guild->set_guild_lv(request->request.At("guild_lv")->AsXValue()); guild->set_guild_exp(request->request.At("guild_exp")->AsXValue()); @@ -199,6 +201,11 @@ void GuildMgr::__GuildUpdate(f8::JsonHttpRequest* request) request->resp_xobj->SetVal("errmsg", ""); } +void GuildMgr::__GuildRename(f8::JsonHttpRequest* request) +{ + +} + void GuildMgr::__GuildRank(f8::JsonHttpRequest* request) { if (!load_done_) { @@ -299,7 +306,7 @@ cs::MFGuildBasic* GuildMgr::GetGuildById(long long guild_id) return itr != id_hash_.end() ? itr->second : nullptr; } -cs::MFGuildBasic* GuildMgr::GetGuildByName(const std::string& guild_name) +cs::MFGuildBasic* GuildMgr::GetGuildByName(int gameid, const std::string& guild_name) { auto itr = name_hash_.find(guild_name); return itr != name_hash_.end() ? itr->second : nullptr; @@ -472,7 +479,9 @@ void GuildMgr::RefreshGuild(long long guild_id) for (auto& row : *data_set) { cs::MFGuildBasic* guild = GuildMgr::Instance()->GetGuildById(a8::XValue(row[2])); if (guild) { + #if 0 guild->set_guild_name(row[3]); + #endif guild->set_guild_lv(a8::XValue(row[4])); guild->set_guild_exp(a8::XValue(row[5])); guild->set_guild_badge(a8::XValue(row[6])); diff --git a/server/rankserver/guildmgr.h b/server/rankserver/guildmgr.h index a0d5897..fee48cc 100644 --- a/server/rankserver/guildmgr.h +++ b/server/rankserver/guildmgr.h @@ -20,13 +20,14 @@ class GuildMgr : public a8::Singleton void __GuildCreate(f8::JsonHttpRequest* request); void __GuildSearch(f8::JsonHttpRequest* request); void __GuildUpdate(f8::JsonHttpRequest* request); + void __GuildRename(f8::JsonHttpRequest* request); void __GuildRank(f8::JsonHttpRequest* request); void __GuildConfirmed(f8::JsonHttpRequest* request); void __GenTestData(f8::JsonHttpRequest* request); private: cs::MFGuildBasic* GetGuildById(long long guild_id); - cs::MFGuildBasic* GetGuildByName(const std::string& guild_name); + cs::MFGuildBasic* GetGuildByName(int gameid, const std::string& guild_name); std::vector* GetGuildRank(int gameid); void AddGuild(cs::MFGuildBasic* guild); void LoadGuild(int instance_id, long long last_idx); diff --git a/server/rankserver/handlermgr.cc b/server/rankserver/handlermgr.cc index 89c4ecb..cc407c1 100644 --- a/server/rankserver/handlermgr.cc +++ b/server/rankserver/handlermgr.cc @@ -45,6 +45,11 @@ void HandlerMgr::Init() { GuildMgr::Instance()->__GuildUpdate(request); }); + RegisterGMMsgHandler("Guild@rename", + [] (f8::JsonHttpRequest* request) + { + GuildMgr::Instance()->__GuildRename(request); + }); RegisterGMMsgHandler("Guild@rank", [] (f8::JsonHttpRequest* request) {