From 3fce35d42150e89df8c6697039d3a89b7499f70f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 2 Oct 2023 11:52:24 +0800 Subject: [PATCH] 1 --- server/masterserver/jsondatamgr.cc | 12 +++++++++--- server/masterserver/jsondatamgr.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/masterserver/jsondatamgr.cc b/server/masterserver/jsondatamgr.cc index 5fe6aea..7b77114 100644 --- a/server/masterserver/jsondatamgr.cc +++ b/server/masterserver/jsondatamgr.cc @@ -5,14 +5,20 @@ #include "jsondatamgr.h" #include "app.h" -static const char* WORK_PATH = "../config"; - void JsonDataMgr::Init() { + if (!f8::IsOnlineEnv()) { + if (f8::IsTestEnv()) { + work_path_ = "../test_config"; + } else { + work_path_ = "../dev_config"; + } + } + std::string masterserver_cluster_json_file = a8::Format ("%s/zone%d/node%d/masterserver.cluster.json", { - WORK_PATH, + work_path_, f8::App::Instance()->GetZoneId(), f8::App::Instance()->GetNodeId(), }); diff --git a/server/masterserver/jsondatamgr.h b/server/masterserver/jsondatamgr.h index 10a3f34..ab5fcb0 100644 --- a/server/masterserver/jsondatamgr.h +++ b/server/masterserver/jsondatamgr.h @@ -13,5 +13,6 @@ class JsonDataMgr : public a8::Singleton std::shared_ptr GetConf(); private: + std::string work_path_ = "../config"; a8::XObject masterserver_cluster_json_; };