From 7cc54022a5a3624d4a4be4913722c6787c2f4b1c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 15 Oct 2020 11:05:17 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc              |  1 +
 server/tools/protobuild/cs_msgid.proto |  2 ++
 server/tools/protobuild/cs_proto.proto | 16 ++++++++++++++++
 server/tools/protobuild/ss_proto.proto |  1 +
 4 files changed, 20 insertions(+)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index cfa44f4..4df3f74 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -1232,6 +1232,7 @@ void Player::ReLogin(f8::MsgHdr& hdr, const cs::CMLogin& msg)
     FillSMLogin(respmsg);
     WSListener::Instance()->SendToClient(hdr.socket_handle, 0, respmsg);
     PlayerMgr::Instance()->ReBindSocket(hdr.socket_handle, this);
+    SyncGuildMemberInfo();
 }
 
 void Player::FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* friend_list)
diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto
index b3ceb9f..76a8433 100644
--- a/server/tools/protobuild/cs_msgid.proto
+++ b/server/tools/protobuild/cs_msgid.proto
@@ -26,6 +26,7 @@ enum CMMessageId_e
     _CMUpdateTempCustomData = 153;
     _CMUpdateUserInfo = 154;
     _CMDirtyWordCheck = 155;
+    _CMGetUserGuild = 156;
 
     _CMGuildMsgBegin = 230;
     _CMGuildCreate = 231;
@@ -78,6 +79,7 @@ enum SMMessageId_e
     _SMFriendIdList = 118;
 
     _SMDirtyWordCheck = 155;
+    _SMGetUserGuild = 156;
 
     _SMGuildMsgBegin = 230;
     _SMGuildCreate = 231;
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 546c7da..0cffee3 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -112,6 +112,7 @@ message MFGuildBasic
     optional int32 join_unlimited = 11; //不限制加入
     optional int32 join_cond1 = 20; //加入条件1
     optional int32 join_cond2 = 21; //加入条件2
+    optional int32 applyed = 22; //是否已申请
 
     optional int32 _gameid = 100; //gameid
     optional int32 _channel = 101; //channel
@@ -181,6 +182,21 @@ message SMDirtyWordCheck
     optional string errmsg = 2; //错误消息
 }
 
+//获取自己的公会信息
+message CMGetUserGuild
+{
+    optional string account_id = 1; //用户id，传空或不传获取自己
+}
+//获取自己
+message SMGetUserGuild
+{
+    optional int32 errcode = 1; //1:公会不存在
+    optional string errmsg = 2; //错误消息
+    optional string account_id = 3; //用户id，传空或不传获取自己
+    optional int64 guild_id = 4; //工会id(没有公会的话为0)
+    optional int32 guild_job = 5; //公会职位 1:公会长 2:副公会长 3：精英成员 其他(0)：普通会员
+}
+
 //获取好友列表
 message CMFriendList
 {
diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto
index 5c5a264..a936819 100755
--- a/server/tools/protobuild/ss_proto.proto
+++ b/server/tools/protobuild/ss_proto.proto
@@ -61,6 +61,7 @@ message MFRole
     optional int32 last_save_time = 3;
     optional int32 today_apply_guild_times = 4;
     optional int32 today_create_guild_times = 5;
+    repeated int32 applyed_guild_list = 6;
 }
 
 message MFGroupMemberDB