From bd2ce077ab0d2b9460d800a4bf351a8af6354b32 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 25 Mar 2022 19:14:02 +0800
Subject: [PATCH] 1

---
 server/gameserver/httpproxy.cc | 5 +++++
 server/gameserver/roommgr.cc   | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/httpproxy.cc b/server/gameserver/httpproxy.cc
index c4d610e8..877d0373 100644
--- a/server/gameserver/httpproxy.cc
+++ b/server/gameserver/httpproxy.cc
@@ -82,6 +82,11 @@ std::string HttpProxy::HttpGet(a8::XParams param,
          .SetSender(request->req_id),
          [] (a8::XParams& param, a8::XObject& data)
          {
+             HttpProxyRequest* req = HttpProxy::Instance()->GetRequest(param.sender.GetString());
+             if (req) {
+                 req->on_ok(req->param, data);
+             }
+             HttpProxy::Instance()->DestoryRequest(req);
          },
          [] (a8::XParams& param, const std::string& response)
          {
diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 45b54520..03f1f120 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -803,7 +803,7 @@ void RoomMgr::SendGetBattleData(int mode,
         JsonDataMgr::Instance()->GetApiUrl(url);
         if (!f8::IsOnlineEnv()) {
 #ifdef DEBUG
-            if (!is_old_version) {
+            if (is_old_version) {
                 url = "https://game2006api-test.kingsome.cn/new/webapp/index.php";
             }
 #endif
@@ -828,6 +828,8 @@ void RoomMgr::SendGetBattleData(int mode,
             data->SetVal("members", *members);
             data->SetVal("mode", mode);
             url_params->SetVal("data", data->ToJsonStr());
+            url_params->SetVal("account_id", join_msgs[0]->account_id());
+            url_params->SetVal("session_id", join_msgs[0]->session_id());
         }
         HttpProxy::Instance()->HttpGet
             (