From f52b1e3ea0a45c4e1a85ae613f49034ed266dd00 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 9 Oct 2020 19:19:55 +0800 Subject: [PATCH] 1 --- server/imserver/guild.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 3d66e79..8e6fdb5 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -534,8 +534,16 @@ void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg) a8::MutableXObject* params = a8::MutableXObject::NewObject(); params->SetVal("account_id", forward_msg->context().user_info().base_data().account_id()); params->SetVal("guild_id", guild_id_); - params->SetVal("guild_name", guild_name_); - params->SetVal("guild_declaration", guild_declaration_); + if (msg.has_guild_name()) { + params->SetVal("guild_name", msg.guild_name()); + } else { + params->SetVal("guild_name", guild_name_); + } + if (msg.has_guild_declaration()) { + params->SetVal("guild_declaration", msg.guild_declaration()); + } else { + params->SetVal("guild_declaration", guild_declaration_); + } f8::HttpClientPool::Instance()->HttpGet ( a8::XParams()