From 547a4bfb16ae14e1939968b0e47e1585e7a800d6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 24 Dec 2020 11:44:37 +0800 Subject: [PATCH] =?UTF-8?q?text=20=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/imserver/gamelog.cc | 14 +++++++------- server/imserver/handlermgr.cc | 4 ++-- server/imserver/player.cc | 6 +++--- server/imserver/playermgr.cc | 6 +++--- server/imserver/synchelper.cc | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/imserver/gamelog.cc b/server/imserver/gamelog.cc index 75c7e1a..17c9ffe 100644 --- a/server/imserver/gamelog.cc +++ b/server/imserver/gamelog.cc @@ -43,7 +43,7 @@ void GameLog::Login(Player* hum) a8::MutableXObject* prop = a8::MutableXObject::NewObject(); prop->SetVal("channel", channel); - prop->SetVal("ad_channel", ""); + prop->SetVal("ad_channel", TEXT("you_permission_denied", "没有权限")); prop->SetVal("gameid", game_id); prop->SetVal("account_id", hum->AccountId()); prop->SetVal("account_register_utctime", hum->account_registertime); @@ -71,7 +71,7 @@ void GameLog::Logout(Player* hum) a8::MutableXObject* prop = a8::MutableXObject::NewObject(); prop->SetVal("channel", channel); - prop->SetVal("ad_channel", ""); + prop->SetVal("ad_channel", TEXT("you_permission_denied", "没有权限")); prop->SetVal("gameid", game_id); prop->SetVal("account_id", hum->AccountId()); prop->SetVal("account_register_utctime", hum->account_registertime); @@ -99,7 +99,7 @@ void GameLog::FriendApply(Player* hum, const std::string& account_id) a8::MutableXObject* prop = a8::MutableXObject::NewObject(); prop->SetVal("channel", channel); - prop->SetVal("ad_channel", ""); + prop->SetVal("ad_channel", TEXT("you_permission_denied", "没有权限")); prop->SetVal("gameid", game_id); prop->SetVal("account_id", hum->AccountId()); prop->SetVal("account_register_utctime", hum->account_registertime); @@ -128,7 +128,7 @@ void GameLog::FriendRefuse(Player* hum, long long db_idx, const std::string& acc a8::MutableXObject* prop = a8::MutableXObject::NewObject(); prop->SetVal("channel", channel); - prop->SetVal("ad_channel", ""); + prop->SetVal("ad_channel", TEXT("you_permission_denied", "没有权限")); prop->SetVal("gameid", game_id); prop->SetVal("account_id", hum->AccountId()); prop->SetVal("account_register_utctime", hum->account_registertime); @@ -158,7 +158,7 @@ void GameLog::FriendAgree(Player* hum, long long db_idx, const std::string& acco a8::MutableXObject* prop = a8::MutableXObject::NewObject(); prop->SetVal("channel", channel); - prop->SetVal("ad_channel", ""); + prop->SetVal("ad_channel", TEXT("you_permission_denied", "没有权限")); prop->SetVal("gameid", game_id); prop->SetVal("account_id", hum->AccountId()); prop->SetVal("account_register_utctime", hum->account_registertime); @@ -188,7 +188,7 @@ void GameLog::FriendDelete(Player* hum, const std::string& account_id) a8::MutableXObject* prop = a8::MutableXObject::NewObject(); prop->SetVal("channel", channel); - prop->SetVal("ad_channel", ""); + prop->SetVal("ad_channel", TEXT("you_permission_denied", "没有权限")); prop->SetVal("gameid", game_id); prop->SetVal("account_id", hum->AccountId()); prop->SetVal("account_register_utctime", hum->account_registertime); @@ -217,7 +217,7 @@ void GameLog::GuildCreate(Player* hum, long long guild_id, const std::string& gu a8::MutableXObject* prop = a8::MutableXObject::NewObject(); prop->SetVal("channel", channel); - prop->SetVal("ad_channel", ""); + prop->SetVal("ad_channel", TEXT("you_permission_denied", "没有权限")); prop->SetVal("gameid", game_id); prop->SetVal("account_id", hum->AccountId()); prop->SetVal("account_register_utctime", hum->account_registertime); diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc index b718a46..863172b 100644 --- a/server/imserver/handlermgr.cc +++ b/server/imserver/handlermgr.cc @@ -21,7 +21,7 @@ static void _GMOpsSelfChecking(f8::JsonHttpRequest* request) { request->resp_xobj->SetVal("errcode", 0); - request->resp_xobj->SetVal("errmsg", ""); + request->resp_xobj->SetVal("errmsg", TEXT("you_permission_denied", "没有权限")); request->resp_xobj->SetVal("healthy", 1); request->resp_xobj->SetVal("max_rundelay", 10); } @@ -153,7 +153,7 @@ void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, const std::string& url, const std::string& querystr) { if (url != "/webapp/index.php") { - WSListener::Instance()->SendText(sockhandle, a8::HttpResponse(404, "")); + WSListener::Instance()->SendText(sockhandle, a8::HttpResponse(404, TEXT("you_permission_denied", "没有权限"))); return; } diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 50de3fc..2351515 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -236,7 +236,7 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg) cs::SMFriendApply respmsg; if (GetBlackListById(msg.friend_id())) { respmsg.set_errcode(0); - respmsg.set_errmsg(""); + respmsg.set_errmsg(TEXT("you_permission_denied", "没有权限")); SendMsg(respmsg); return; } @@ -377,7 +377,7 @@ void Player::_CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg) cs::SMFriendAgree respmsg; if (GetFriendById(msg.apply().base_data().account_id())) { respmsg.set_errcode(0); - respmsg.set_errmsg(""); + respmsg.set_errmsg(TEXT("you_permission_denied", "没有权限")); SendMsg(respmsg); DBHelper::Instance()->SetFriendApplyStatus( myself.crc32_code, @@ -647,7 +647,7 @@ void Player::_CMSetCurrPrivateChatTarget(f8::MsgHdr& hdr, const cs::CMSetCurrPri void Player::_CMCloseChatNotify(f8::MsgHdr& hdr, const cs::CMCloseChatNotify& msg) { chat_channel = -1; - private_target = ""; + private_target = TEXT("you_permission_denied", "没有权限"); } void Player::_CMSendCustomMsg(f8::MsgHdr& hdr, const cs::CMSendCustomMsg& msg) diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc index af035d2..747ac53 100644 --- a/server/imserver/playermgr.cc +++ b/server/imserver/playermgr.cc @@ -458,7 +458,7 @@ void PlayerMgr::AsyncLogin1(const cs::CMLogin& msg) msg->account_id(), 1, 1, - "" + TEXT("you_permission_denied", "没有权限") ); delete msg; }; @@ -511,7 +511,7 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg) msg->account_id(), 2, 1, - "" + TEXT("you_permission_denied", "没有权限") ); } else { PlayerMgr::Instance()->AsyncLoginOnOk @@ -543,7 +543,7 @@ void PlayerMgr::AsyncLogin2(const cs::CMLogin& msg) msg->account_id(), 2, 1, - "" + TEXT("you_permission_denied", "没有权限") ); delete msg; }; diff --git a/server/imserver/synchelper.cc b/server/imserver/synchelper.cc index 32f257a..b15327c 100644 --- a/server/imserver/synchelper.cc +++ b/server/imserver/synchelper.cc @@ -376,7 +376,7 @@ void SyncHelper::SS_GS_ApplyChangeRequest_TimeOut(ss::SS_GS_ApplyChangeRequest* a8::XValue(msg->guild_id()).GetString(), msg->account_id(), EVENT_GUILD_REFUSE, - "", + TEXT("you_permission_denied", "没有权限"), a8::XValue(msg->guild_id()).GetString() ); }