From 9d637cf0883f7f4ce49f31cef2806aaea64dc82d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 17 Sep 2020 17:37:35 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.cc               | 23 ++++++++++++++++++-----
 server/imserver/guild.h                |  2 +-
 server/tools/protobuild/cs_proto.proto |  3 ++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index eaebdc4..7de9e88 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -107,7 +107,6 @@ void Guild::Deserialize(const std::string& guild_data, const std::string& guild_
 void Guild::_CMGuildInfo(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildInfo& msg)
 {
     cs::SMGuildInfo respmsg;
-    respmsg.set_errcode(0);
     FillGuildBasic(respmsg.mutable_info());
     GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, context, respmsg);
 }
@@ -139,7 +138,9 @@ void Guild::_CMGuildDismiss(int socket_handle, const ss::MFIMMsgConext& context,
 
 void Guild::_CMGuildRename(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildRename& msg)
 {
-
+    guild_name = msg.new_name();
+    cs::SMGuildRename respmsg;
+    GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, context, respmsg);
 }
 
 void Guild::_CMGuildMemberList(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildMemberList& msg)
@@ -154,12 +155,24 @@ void Guild::_CMGuildLog(int socket_handle, const ss::MFIMMsgConext& context, con
 
 void Guild::FillGuildBasic(cs::MFGuildBasic* guild_basic)
 {
-
+    guild_basic->set_guild_id(guild_id);
+    guild_basic->set_guild_name(guild_name);
+    guild_basic->set_guild_lv(guild_lv);
+    guild_basic->set_guild_exp(guild_exp);
+    guild_basic->set_guild_badge(guild_badge);
+    guild_basic->set_member_num(member_hash_.size());
+    guild_basic->set_guild_declaration(guild_declaration);
+    guild_basic->set_guild_owner_id(owner_id);
+    guild_basic->set_guild_owner_name(owner_name);
+    guild_basic->set_guild_owner_avatar_url(owner_avatar_url);
 }
 
-void Guild::FillGuildDB(ss::MFGuildDB& guild_dto)
+void Guild::FillGuildDB(ss::MFGuildDB& guild_pb)
 {
-
+    for (auto& pair : member_hash_) {
+        auto p = guild_pb.add_members();
+        TypeConvert::Convert(*pair.second, *p->mutable_base_data());
+    }
 }
 
 void Guild::SerializeMembers(std::string& guild_members)
diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index a4aae64..c0d0ec3 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -73,7 +73,7 @@ private:
     void RemoveMember(const std::string& account_id);
 
     void FillGuildBasic(cs::MFGuildBasic* guild_basic);
-    void FillGuildDB(ss::MFGuildDB& guild_dto);
+    void FillGuildDB(ss::MFGuildDB& guild_pb);
     void SerializeMembers(std::string& guild_members);
     void SaveToDB();
 
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 1296ef8..0b813f7 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -96,6 +96,7 @@ message MFGuildBasic
     optional string guild_declaration = 7; //公会宣言
     optional string guild_owner_id = 8; //公会队长id
     optional string guild_owner_name = 9; //公会队长名字
+    optional string guild_owner_avatar_url = 10; //公会队长头像
 }
 
 //登录好友服
@@ -418,7 +419,7 @@ message SMGuildDismiss
 //公会改名
 message CMGuildRename
 {
-    optional string new_guild_name = 1; //新公会名
+    optional string new_name = 1; //新公会名
 }
 message SMGuildRename
 {