From 9a70d42bb5d6a61291c6202de7f319ba297f2363 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 19 Dec 2022 13:49:56 +0800
Subject: [PATCH] 1

---
 server/gameserver/app.cc       | 7 +++++--
 server/gameserver/httpproxy.cc | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc
index a6f3bbe5..de17ba6c 100644
--- a/server/gameserver/app.cc
+++ b/server/gameserver/app.cc
@@ -41,6 +41,7 @@
 #include "matchmgr.h"
 
 #include "skillhelper.h"
+#include "config.h"
 
 struct MsgNode
 {
@@ -216,9 +217,9 @@ bool App::Init(int argc, char* argv[])
     TraceMgr::Instance()->Init("gameserver2006");
 #endif
     PerfMonitor::Instance()->Init();
+    f8::MsgQueue::Instance()->Init();
     HandlerMgr::Instance()->Init();
     f8::Timer::Instance()->Init();
-    f8::MsgQueue::Instance()->Init();
     f8::TGLog::Instance()->Init(a8::Format(PROJ_NAME_FMT, {GAME_ID}), false, 0);
     f8::HttpClientPool::Instance()->Init(MAX_ALL_HTTP_NUM, MAX_SYS_HTTP_NUM, MAX_USER_HTTP_NUM);
     f8::BtMgr::Instance()->Init("exported");
@@ -228,6 +229,7 @@ bool App::Init(int argc, char* argv[])
     SkillHelper::Init();
     JsonDataMgr::Instance()->Init();
     MetaMgr::Instance()->Init();
+    Config::Instance()->Init();
     EntityFactory::Instance()->Init();
     uuid.SetMachineId((node_id - 1) * MAX_NODE_ID + instance_id);
     KillMgr::Instance()->Init();
@@ -281,13 +283,14 @@ void App::UnInit()
     RoomMgr::Instance()->UnInit();
     KillMgr::Instance()->UnInit();
     EntityFactory::Instance()->UnInit();
+    Config::Instance()->UnInit();
     MetaMgr::Instance()->UnInit();
     JsonDataMgr::Instance()->UnInit();
     f8::BtMgr::Instance()->UnInit();
     f8::HttpClientPool::Instance()->UnInit();
+    HandlerMgr::Instance()->UnInit();
     f8::MsgQueue::Instance()->UnInit();
     f8::Timer::Instance()->UnInit();
-    HandlerMgr::Instance()->UnInit();
     PerfMonitor::Instance()->UnInit();
     f8::TGLog::Instance()->UnInit();
 #ifdef DEBUG
diff --git a/server/gameserver/httpproxy.cc b/server/gameserver/httpproxy.cc
index fbed1b2d..f05046ee 100644
--- a/server/gameserver/httpproxy.cc
+++ b/server/gameserver/httpproxy.cc
@@ -41,7 +41,7 @@ static void _ProxyCallback(f8::JsonHttpRequest* request)
         f8::HttpContext ctx;
         if (request->request.HasKey("errcode") &&
             request->request.Get("errcode").GetInt() == 0) {
-            req->cb(true, &request->request, &ctx);
+            req->cb(true, &data, &ctx);
         } else {
             req->cb(false, &request->request, &ctx);
         }