From 53722739276e36b67200970d4faf69da6a7c2488 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 27 Dec 2022 09:47:17 +0800 Subject: [PATCH] 1 --- server/gameserver/handlermgr.cc | 2 +- server/gameserver/httpproxy.cc | 12 ++++++------ third_party/f8 | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/gameserver/handlermgr.cc b/server/gameserver/handlermgr.cc index 6ab9c025..be4950d4 100644 --- a/server/gameserver/handlermgr.cc +++ b/server/gameserver/handlermgr.cc @@ -149,7 +149,7 @@ void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, request->saddr = saddr; request->socket_handle = sockhandle; request->query_str = querystr; - request->request.ReadFromUrlQueryString(querystr); + request->params->ReadFromUrlQueryString(querystr); request->resp_xobj->SetVal("errcode", 0); request->resp_xobj->SetVal("errmsg", ""); itr->second(request); diff --git a/server/gameserver/httpproxy.cc b/server/gameserver/httpproxy.cc index ced12215..f6962b32 100644 --- a/server/gameserver/httpproxy.cc +++ b/server/gameserver/httpproxy.cc @@ -27,24 +27,24 @@ static void _ProxyCallback(std::shared_ptr request) #ifdef DEBUG f8::UdpLog::Instance()->Debug("ProxyCallbBack request:%s", { - request->request.ToJsonStr() + request->params->ToJsonStr() }); #endif - std::string seq_id = request->request.Get("seq_id"); + std::string seq_id = request->params->Get("seq_id"); std::shared_ptr req = HttpProxy::Instance()->GetRequest(seq_id); if (req) { a8::XObject data; - data.ReadFromJsonString(request->request.Get("data").GetString()); + data.ReadFromJsonString(request->params->Get("data").GetString()); if (data.GetType() == a8::XOT_SIMPLE) { data.ReadFromJsonString("{}"); } f8::HttpContext ctx; - if (request->request.HasKey("errcode") && - request->request.Get("errcode").GetInt() == 0) { + if (request->params->HasKey("errcode") && + request->params->Get("errcode").GetInt() == 0) { req->cb(true, &data, &ctx); } else { - req->cb(false, &request->request, &ctx); + req->cb(false, request->params.get(), &ctx); } HttpProxy::Instance()->DestoryRequest(req); } diff --git a/third_party/f8 b/third_party/f8 index 4933bf3d..cea561b5 160000 --- a/third_party/f8 +++ b/third_party/f8 @@ -1 +1 @@ -Subproject commit 4933bf3dde65a20dbcb11b296e7a3a1aa4ac6ef6 +Subproject commit cea561b5ae61e6bd23d85c7dbc3bdb0311bdc0ee