From c8fd17ca34d9410242013056bc22cf8a4e3e8456 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 25 Mar 2022 17:43:13 +0800 Subject: [PATCH] 1 --- server/gameserver/httpproxy.cc | 3 +-- server/gameserver/roommgr.cc | 14 +++++--------- third_party/a8engine | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/server/gameserver/httpproxy.cc b/server/gameserver/httpproxy.cc index 28ee78b7..c4d610e8 100644 --- a/server/gameserver/httpproxy.cc +++ b/server/gameserver/httpproxy.cc @@ -66,7 +66,7 @@ std::string HttpProxy::HttpGet(a8::XParams param, } request_hash_[request->req_id] = request; - a8::MutableXObject* proxy_url_params = a8::MutableXObject::NewObject(); + auto proxy_url_params = a8::MutableXObject::CreateObject(); proxy_url_params->SetVal("seq_id", request->req_id); proxy_url_params->SetVal("target_url", std::string(url)); proxy_url_params->SetVal("params", url_params.ToJsonStr()); @@ -95,7 +95,6 @@ std::string HttpProxy::HttpGet(a8::XParams param, *proxy_url_params, rand() % MAX_SYS_HTTP_NUM ); - delete proxy_url_params; return request->req_id; } diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 3278316d..45b54520 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -813,24 +813,21 @@ void RoomMgr::SendGetBattleData(int mode, } else { url += "?&c=Battle&a=getBattleData"; } - a8::MutableXObject* url_params = a8::MutableXObject::NewObject(); + auto url_params = a8::MutableXObject::CreateObject(); { - a8::MutableXObject* data = a8::MutableXObject::NewObject(); - a8::MutableXObject* members = a8::MutableXObject::NewArray(); + auto data = a8::MutableXObject::CreateObject(); + auto members = a8::MutableXObject::CreateArray(); for (auto msg : join_msgs) { - a8::MutableXObject* member = a8::MutableXObject::NewObject(); + auto member = a8::MutableXObject::CreateObject(); member->SetVal("account_id", msg->account_id()); member->SetVal("session_id", msg->session_id()); member->SetVal("hero_uniid", msg->hero_uniid()); member->SetVal("cmjoin", f8::PbToJson(msg.get())); - members->Push(*member); - delete member; + members->Push(*member.get()); } data->SetVal("members", *members); data->SetVal("mode", mode); url_params->SetVal("data", data->ToJsonStr()); - delete members; - delete data; } HttpProxy::Instance()->HttpGet ( @@ -871,6 +868,5 @@ void RoomMgr::SendGetBattleData(int mode, url.c_str(), *url_params ); - delete url_params; } } diff --git a/third_party/a8engine b/third_party/a8engine index adcd7a71..6364d325 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit adcd7a71ae0d085df858585bef5df69270b01c86 +Subproject commit 6364d325fa4423fc7f4216fac2af76dbd8ca793a