From 2cac3902c16770118c864fc4906b2ba94ace151d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 9 Oct 2020 10:22:00 +0800 Subject: [PATCH] 1 --- server/imserver/jsondatamgr.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/server/imserver/jsondatamgr.cc b/server/imserver/jsondatamgr.cc index 9b49201..e88e739 100644 --- a/server/imserver/jsondatamgr.cc +++ b/server/imserver/jsondatamgr.cc @@ -76,15 +76,10 @@ std::shared_ptr JsonDataMgr::GetMysqlClusterConf() bool JsonDataMgr::GetRankServerConf(std::string& ip, int& port) { - #if 1 - ip = "127.0.0.1"; - port = 8961; - #else std::shared_ptr rankserver_cluster_conf = GetMasterServerClusterConf(); std::shared_ptr conf = rankserver_cluster_conf->At(0); - ip = conf->At("rankserver_ip")->AsXValue().GetString(); - port = conf->At("rankserver_ip")->AsXValue(); - #endif + ip = conf->At("ip")->AsXValue().GetString(); + port = conf->At("port")->AsXValue(); return true; }