diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index ef338cf..533b9ff 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -42,7 +42,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
     request->resp_xobj->SetVal("errmsg", "");
 
     long long guild_id = request->request.At("guild_id")->AsXValue();
-    if (GetGuild(guild_id)) {
+    if (GetGuildById(guild_id)) {
         request->resp_xobj->SetVal("errcode", 1);
         request->resp_xobj->SetVal("errmsg", "guild_id已经存在");
         return;
@@ -181,7 +181,7 @@ void GuildMgr::__GuildUpdate(f8::JsonHttpRequest* request)
         return;
     }
     long long guild_id = request->request.At("guild_id")->AsXValue();
-    cs::MFGuildBasic* guild = GetGuild(guild_id);
+    cs::MFGuildBasic* guild = GetGuildById(guild_id);
     if (guild) {
         guild->set_guild_name(request->request.At("guild_name")->AsXValue().GetString());
         guild->set_guild_badge(request->request.At("guild_badge")->AsXValue());
@@ -293,7 +293,7 @@ void GuildMgr::__GenTestData(f8::JsonHttpRequest* request)
     }
 }
 
-cs::MFGuildBasic* GuildMgr::GetGuild(long long guild_id)
+cs::MFGuildBasic* GuildMgr::GetGuildById(long long guild_id)
 {
     auto itr = id_hash_.find(guild_id);
     return itr != id_hash_.end() ? itr->second : nullptr;
@@ -464,7 +464,7 @@ void GuildMgr::RefreshGuild(long long guild_id)
          {
              if (data_set && !data_set->empty()) {
                  for (auto& row : *data_set) {
-                     cs::MFGuildBasic* guild = GuildMgr::Instance()->GetGuild(a8::XValue(row[2]));
+                     cs::MFGuildBasic* guild = GuildMgr::Instance()->GetGuildById(a8::XValue(row[2]));
                      if (guild) {
                          guild->set_guild_name(row[3]);
                          guild->set_guild_lv(a8::XValue(row[4]));
@@ -539,7 +539,7 @@ void GuildMgr::UpdateRank(std::vector<cs::MFGuildBasic*>& rank_list, cs::MFGuild
 
 void GuildMgr::UpdateGuild(cs::MFGuildBasic* new_guild)
 {
-    auto guild = GetGuild(new_guild->guild_id());
+    auto guild = GetGuildById(new_guild->guild_id());
     if (guild) {
         guild->set_guild_name(new_guild->guild_name());
         guild->set_guild_lv(new_guild->guild_lv());
diff --git a/server/rankserver/guildmgr.h b/server/rankserver/guildmgr.h
index d0e5b18..5b85583 100644
--- a/server/rankserver/guildmgr.h
+++ b/server/rankserver/guildmgr.h
@@ -25,7 +25,7 @@ class GuildMgr : public a8::Singleton<GuildMgr>
     void __GenTestData(f8::JsonHttpRequest* request);
 
  private:
-    cs::MFGuildBasic* GetGuild(long long guild_id);
+    cs::MFGuildBasic* GetGuildById(long long guild_id);
     std::vector<cs::MFGuildBasic*>* GetGuildRank(int gameid);
     void AddGuild(cs::MFGuildBasic* guild);
     void LoadGuild(int instance_id, long long last_idx);