From c3f4ef9d4738f0c6c4071c84c9c0d66fb1a2b609 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 24 Dec 2020 11:05:59 +0800 Subject: [PATCH] =?UTF-8?q?text=20=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=86=85?= =?UTF-8?q?=E9=83=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/imserver/guild.cc | 28 ++++++++++++++-------------- server/imserver/guildmgr.cc | 4 ++-- server/imserver/player.cc | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index d1f0128..e0e99be 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -314,9 +314,9 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg) } GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id()); if (!sender) { - SendErrorMsg(hdr.socket_handle, forward_msg->context(), "服务器内部错误"); + SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("server_internal_error", "服务器内部错误")); respmsg.set_errcode(2); - respmsg.set_errmsg("服务器内部错误"); + respmsg.set_errmsg(TEXT("server_internal_error", "服务器内部错误")); GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); @@ -399,7 +399,7 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg) cs::CMGuildAgree* msg_copy = (cs::CMGuildAgree*)param.param3.GetUserData(); Guild* guild = GuildMgr::Instance()->GetGuild(param.sender); if (guild) { - guild->SendErrorMsg(param.param2, forward_msg_copy->context(), "服务器内部错误"); + guild->SendErrorMsg(param.param2, forward_msg_copy->context(), TEXT("server_internal_error", "服务器内部错误")); } delete msg_copy; delete forward_msg_copy; @@ -454,9 +454,9 @@ void Guild::_CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg) cs::SMGuildRefuse respmsg; GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id()); if (!sender) { - SendErrorMsg(hdr.socket_handle, forward_msg->context(), "服务器内部错误"); + SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("server_internal_error", "服务器内部错误")); respmsg.set_errcode(2); - respmsg.set_errmsg("服务器内部错误"); + respmsg.set_errmsg(TEXT("server_internal_error", "服务器内部错误")); GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); @@ -501,9 +501,9 @@ void Guild::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg) cs::SMGuildKick respmsg; GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id()); if (!sender) { - SendErrorMsg(hdr.socket_handle, forward_msg->context(), "服务器内部错误"); + SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("server_internal_error", "服务器内部错误")); respmsg.set_errcode(2); - respmsg.set_errmsg("服务器内部错误"); + respmsg.set_errmsg(TEXT("server_internal_error", "服务器内部错误")); GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); @@ -626,9 +626,9 @@ void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg) GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id()); if (!sender) { - SendErrorMsg(hdr.socket_handle, forward_msg->context(), "服务器内部错误"); + SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("server_internal_error", "服务器内部错误")); respmsg.set_errcode(2); - respmsg.set_errmsg("服务器内部错误"); + respmsg.set_errmsg(TEXT("server_internal_error", "服务器内部错误")); GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); @@ -710,7 +710,7 @@ void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg) } else { guild->SendErrorMsg(param.param2, forward_msg_copy->context(), - data.Get("errmsg", "服务器内部错误")); + data.Get("errmsg", TEXT("server_internal_error", "服务器内部错误"))); } } delete msg_copy; @@ -722,7 +722,7 @@ void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg) cs::CMGuildChange* msg_copy = (cs::CMGuildChange*)param.param3.GetUserData(); Guild* guild = GuildMgr::Instance()->GetGuild(param.sender); if (guild) { - guild->SendErrorMsg(param.param2, forward_msg_copy->context(), "服务器内部错误"); + guild->SendErrorMsg(param.param2, forward_msg_copy->context(), TEXT("server_internal_error", "服务器内部错误")); } delete msg_copy; delete forward_msg_copy; @@ -924,7 +924,7 @@ void Guild::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& } GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id()); if (!sender) { - SendErrorMsg(hdr.socket_handle, forward_msg->context(), "服务器内部错误"); + SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("server_internal_error", "服务器内部错误")); respmsg.set_errcode(3); respmsg.set_errmsg("权限不够"); GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, @@ -1575,9 +1575,9 @@ void Guild::GuildAgreeCb(int socket_handle, const ss::MFIMMsgConext& context, co } GuildMember* sender = GetMember(context.user_info().base_data().account_id()); if (!sender) { - SendErrorMsg(socket_handle, context, "服务器内部错误"); + SendErrorMsg(socket_handle, context, TEXT("server_internal_error", "服务器内部错误")); respmsg.set_errcode(2); - respmsg.set_errmsg("服务器内部错误"); + respmsg.set_errmsg(TEXT("server_internal_error", "服务器内部错误")); GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, context, respmsg); diff --git a/server/imserver/guildmgr.cc b/server/imserver/guildmgr.cc index 2022d12..79621f5 100644 --- a/server/imserver/guildmgr.cc +++ b/server/imserver/guildmgr.cc @@ -67,7 +67,7 @@ public: void OnError() { cs::SMShowErrorMsg notifymsg; - notifymsg.set_msg("服务器内部错误"); + notifymsg.set_msg(TEXT("server_internal_error", "服务器内部错误")); GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, forward_msg.context(), notifymsg); @@ -101,7 +101,7 @@ void GuildMgr::_SS_IM_ForwardGuildCMMsg(f8::MsgHdr& hdr, const ss::SS_IM_Forward } if (!IsValidGuildId(msg.guild_id())) { cs::SMShowErrorMsg respmsg; - respmsg.set_msg("服务器内部错误"); + respmsg.set_msg(TEXT("server_internal_error", "服务器内部错误")); ForwardGuildSMMsg(hdr.socket_handle, msg.context(), respmsg); return; } diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 30057d4..4657875 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -704,7 +704,7 @@ void Player::_CMDirtyWordCheck(f8::MsgHdr& hdr, const cs::CMDirtyWordCheck& msg) Player* hum = PlayerMgr::Instance()->GetPlayerByAccountId(param.sender); if (hum) { #if 0 - hum->ShowErrorMsg("服务器内部错误"); + hum->ShowErrorMsg(TEXT("server_internal_error", "服务器内部错误")); #endif } }, @@ -916,7 +916,7 @@ void Player::_CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg) Player* hum = PlayerMgr::Instance()->GetPlayerByAccountId(msg_context->account_id); if (hum) { hum->last_create_guild_time_ = 0; - hum->ShowErrorMsg("服务器内部错误"); + hum->ShowErrorMsg(TEXT("server_internal_error", "服务器内部错误")); } A8_SAFE_DELETE(msg_context); @@ -1094,7 +1094,7 @@ void Player::_CMGuildSearch(f8::MsgHdr& hdr, const cs::CMGuildSearch& msg) Player* hum = PlayerMgr::Instance()->GetPlayerBySocket(msg_context->socket_handle); if (hum && hum->AccountId() == msg_context->account_id) { - hum->ShowErrorMsg("服务器内部错误"); + hum->ShowErrorMsg(TEXT("server_internal_error", "服务器内部错误")); } A8_SAFE_DELETE(msg_context); @@ -1158,7 +1158,7 @@ void Player::_CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg) Player* hum = PlayerMgr::Instance()->GetPlayerBySocket(msg_context->socket_handle); if (hum && hum->AccountId() == msg_context->account_id) { - hum->ShowErrorMsg("服务器内部错误"); + hum->ShowErrorMsg(TEXT("server_internal_error", "服务器内部错误")); } A8_SAFE_DELETE(msg_context);