diff --git a/server/imserver/guildmgr.cc b/server/imserver/guildmgr.cc index e49d302..332409d 100644 --- a/server/imserver/guildmgr.cc +++ b/server/imserver/guildmgr.cc @@ -248,17 +248,6 @@ void GuildMgr::_SS_IM_ForwardGuildCMMsg(f8::MsgHdr& hdr, const ss::SS_IM_Forward } } -unsigned int GuildMgr::GetGuildCrc32(long long guild_id) -{ - std::string guild_id_str = a8::XValue(guild_id).GetString(); - unsigned int crc32_code = a8::openssl::Crc32 - ( - (unsigned char*)guild_id_str.data(), - guild_id_str.size() - ); - return crc32_code; -} - void GuildMgr::_CMGuildCreate(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildCreate& msg) { Player* hum = PlayerMgr::Instance()->GetPlayerBySocket(socket_handle); @@ -555,9 +544,9 @@ void GuildMgr::LoadGuild(long long guild_id) } GuildMgr::Instance()->task_hash_.erase(itr); } - }; + }; - a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(GetGuildCrc32(guild_id)); + a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(guild_id); DBEngine::Instance()->ExecAsyncQuery ( conn_info, @@ -573,7 +562,7 @@ void GuildMgr::LoadGuild(long long guild_id) .SetSender(guild_id), on_ok, on_error, - GetGuildCrc32(guild_id) + guild_id ); } diff --git a/server/imserver/guildmgr.h b/server/imserver/guildmgr.h index 490b36d..f29bc04 100644 --- a/server/imserver/guildmgr.h +++ b/server/imserver/guildmgr.h @@ -39,7 +39,6 @@ class GuildMgr : public a8::Singleton int msgid, const ::google::protobuf::Message& smmsg); void _SS_IM_ForwardGuildCMMsg(f8::MsgHdr& hdr, const ss::SS_IM_ForwardGuildCMMsg& msg); - unsigned int GetGuildCrc32(long long guild_id); private: void _CMGuildCreate(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildCreate& msg); diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 7f4d752..47554af 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -858,14 +858,14 @@ void Player::ForwardGroupCMMsg(f8::MsgHdr& hdr, long long hash_code) MSConnMgr::Instance()->SendMsg(msg, hash_code); } -void Player::ForwardGuildCMMsg(f8::MsgHdr& hdr, long long hash_code) +void Player::ForwardGuildCMMsg(f8::MsgHdr& hdr, long long guild_id) { ss::SS_IM_ForwardGuildCMMsg msg; FillIMMsgConext(msg.mutable_context()); if (hdr.buflen > 0) { msg.mutable_payload()->assign(hdr.buf, hdr.buflen); } - MSConnMgr::Instance()->SendMsg(msg, hash_code); + SyncHelper::Instance()->SendIMConnMsg(0, msg); } void Player::FillMFUserInfo(cs::MFUserInfo* user_info) diff --git a/server/imserver/player.h b/server/imserver/player.h index f1dc57a..5659d95 100644 --- a/server/imserver/player.h +++ b/server/imserver/player.h @@ -134,7 +134,7 @@ private: void FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* friend_list); void FillBlackList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* black_list); void ForwardGroupCMMsg(f8::MsgHdr& hdr, long long hash_code); - void ForwardGuildCMMsg(f8::MsgHdr& hdr, long long hash_code); + void ForwardGuildCMMsg(f8::MsgHdr& hdr, long long guild_id); void SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBOnErrorFunc on_error); void FillApplyList(const cs::MFPaging& paging, cs::SMFriendApplyList& respmsg); void MarkDirty();