From 099ae65ac87a21e5768c1b4839b1604e74624744 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 18 Sep 2020 15:43:05 +0800
Subject: [PATCH] 1

---
 server/imserver/app.cc         | 3 +++
 server/imserver/constant.h     | 4 ++++
 server/imserver/guildmgr.cc    | 2 ++
 server/imserver/jsondatamgr.cc | 9 +++++++++
 server/imserver/jsondatamgr.h  | 1 +
 5 files changed, 19 insertions(+)

diff --git a/server/imserver/app.cc b/server/imserver/app.cc
index 467d705..4ea524e 100644
--- a/server/imserver/app.cc
+++ b/server/imserver/app.cc
@@ -36,6 +36,7 @@
 #include "framework/cpp/msgqueue.h"
 #include "framework/cpp/tglog.h"
 #include "framework/cpp/netmsghandler.h"
+#include "framework/cpp/httpclientpool.h"
 
 struct MsgNode
 {
@@ -93,6 +94,7 @@ bool App::Init(int argc, char* argv[])
     PerfMonitor::Instance()->Init();
     f8::MsgQueue::Instance()->Init();
     f8::TGLog::Instance()->Init(a8::Format(PROJ_NAME_FMT, {GAME_ID}), true);
+    f8::HttpClientPool::Instance()->Init(MAX_ALL_HTTP_NUM, MAX_SYS_HTTP_NUM, MAX_USER_HTTP_NUM);
     GameLog::Instance()->Init();
     a8::IoLoop::Instance()->Init(1);
     JsonDataMgr::Instance()->Init();
@@ -154,6 +156,7 @@ void App::UnInit()
     IMConnMgr::Instance()->UnInit();
     MSConnMgr::Instance()->UnInit();
     JsonDataMgr::Instance()->UnInit();
+    f8::HttpClientPool::Instance()->UnInit();
     a8::IoLoop::Instance()->UnInit();
     GameLog::Instance()->UnInit();
     f8::TGLog::Instance()->UnInit();
diff --git a/server/imserver/constant.h b/server/imserver/constant.h
index 74e2442..6002c4d 100644
--- a/server/imserver/constant.h
+++ b/server/imserver/constant.h
@@ -73,3 +73,7 @@ const int DAILY_APPLY_FRIEND_TIMES = 100;
 const int SYS_RESET_TIME = 2*60; //每日两点重置
 
 const int SERVER_INTERNAL_ERROR = 100;
+
+const int MAX_SYS_HTTP_NUM = 2;
+const int MAX_USER_HTTP_NUM = 8;
+const int MAX_ALL_HTTP_NUM = MAX_SYS_HTTP_NUM + MAX_USER_HTTP_NUM;
diff --git a/server/imserver/guildmgr.cc b/server/imserver/guildmgr.cc
index d82211e..d8ee97a 100644
--- a/server/imserver/guildmgr.cc
+++ b/server/imserver/guildmgr.cc
@@ -11,6 +11,8 @@
 #include "asynctaskmgr.h"
 #include "dbengine.h"
 
+#include "framework/cpp/httpclientpool.h"
+
 class AsyncGuildTask
 {
 public:
diff --git a/server/imserver/jsondatamgr.cc b/server/imserver/jsondatamgr.cc
index 48b448a..70e66ea 100644
--- a/server/imserver/jsondatamgr.cc
+++ b/server/imserver/jsondatamgr.cc
@@ -73,3 +73,12 @@ std::shared_ptr<a8::XObject> JsonDataMgr::GetMysqlClusterConf()
 {
     return std::make_shared<a8::XObject>(mysql_cluster_json_);
 }
+
+bool JsonDataMgr::GetRankServerConf(std::string& ip, int& port)
+{
+    std::shared_ptr<a8::XObject> rankserver_cluster_conf = GetMasterServerClusterConf();
+    std::shared_ptr<a8::XObject> conf = rankserver_cluster_conf->At(0);
+    ip = conf->At("rankserver_ip")->AsXValue().GetString();
+    port = conf->At("rankserver_ip")->AsXValue();
+    return true;
+}
diff --git a/server/imserver/jsondatamgr.h b/server/imserver/jsondatamgr.h
index 25b0677..ab3726d 100644
--- a/server/imserver/jsondatamgr.h
+++ b/server/imserver/jsondatamgr.h
@@ -14,6 +14,7 @@ class JsonDataMgr : public a8::Singleton<JsonDataMgr>
     std::shared_ptr<a8::XObject> GetMasterServerClusterConf();
     std::shared_ptr<a8::XObject> GetRankServerClusterConf();
     std::shared_ptr<a8::XObject> GetMysqlClusterConf();
+    bool GetRankServerConf(std::string& ip, int& port);
 
  private:
     std::string work_path_ = "../config";