Skip to content

Commit 5362404

Browse files
xengine-qytxengine-qyt
committed
modify:detach version configure from main configure
1 parent d282506 commit 5362404

File tree

12 files changed

+106
-13
lines changed

12 files changed

+106
-13
lines changed

‎XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
75-
<IncludePath>$(XEngine_Include);../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
75+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
7676
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7979
<LinkIncremental>false</LinkIncremental>
80-
<IncludePath>$(XEngine_Include);../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
80+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
8181
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

‎XEngine_Source/StorageModule_Config/Config_Define.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ typedef struct tag_XEngine_ServerConfig
106106
struct
107107
{
108108
XCHAR tszAPIUrl[MAX_PATH];
109+
XCHAR tszServiceName[128];
109110
bool bEnable;
110111
}st_XReport;
111112
struct
@@ -177,6 +178,25 @@ extern "C" XLONG Config_GetLastError(int *pInt_ErrorCode = NULL);
177178
*********************************************************************/
178179
extern "C" bool Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG * pSt_ServerConfig);
179180
/********************************************************************
181+
函数名称：Config_Json_Version
182+
函数功能：读取版本配置文件
183+
参数.一：lpszConfigFile
184+
In/Out：In
185+
类型：常量字符指针
186+
可空：N
187+
意思：输入配置文件
188+
参数.二：pSt_ServerConfig
189+
In/Out：Out
190+
类型：数据结构指针
191+
可空：N
192+
意思：输出读取到的信息
193+
返回值
194+
类型：逻辑型
195+
意思：是否成功
196+
备注：
197+
*********************************************************************/
198+
extern "C" bool Config_Json_Version(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG* pSt_ServerConfig);
199+
/********************************************************************
180200
函数名称：Config_Json_LoadBalance
181201
函数功能：读取负载均衡配置文件
182202
参数.一：lpszConfigFile

‎XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,16 +225,77 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG
225225
_tcsxcpy(pSt_ServerConfig->st_XCert.tszCertKey, st_JsonCert["tszCertKey"].asCString());
226226
}
227227

228-
if (st_JsonRoot["XReport"].empty() || (2 != st_JsonRoot["XReport"].size()))
228+
if (st_JsonRoot["XReport"].empty() || (3 != st_JsonRoot["XReport"].size()))
229229
{
230230
Config_IsErrorOccur = true;
231231
Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_CREPORT;
232232
return false;
233233
}
234234
Json::Value st_JsonReport = st_JsonRoot["XReport"];
235235
pSt_ServerConfig->st_XReport.bEnable = st_JsonReport["bEnable"].asBool();
236+
_tcsxcpy(pSt_ServerConfig->st_XReport.tszServiceName, st_JsonReport["tszServiceName"].asCString());
236237
_tcsxcpy(pSt_ServerConfig->st_XReport.tszAPIUrl, st_JsonReport["tszAPIUrl"].asCString());
238+
return true;
239+
}
240+
/********************************************************************
241+
函数名称：Config_Json_Version
242+
函数功能：读取版本配置文件
243+
参数.一：lpszConfigFile
244+
In/Out：In
245+
类型：常量字符指针
246+
可空：N
247+
意思：输入配置文件
248+
参数.二：pSt_ServerConfig
249+
In/Out：Out
250+
类型：数据结构指针
251+
可空：N
252+
意思：输出读取到的信息
253+
返回值
254+
类型：逻辑型
255+
意思：是否成功
256+
备注：
257+
*********************************************************************/
258+
bool CConfig_Json::Config_Json_Version(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG* pSt_ServerConfig)
259+
{
260+
Config_IsErrorOccur = false;
237261

262+
if ((NULL == lpszConfigFile) || (NULL == pSt_ServerConfig))
263+
{
264+
Config_IsErrorOccur = true;
265+
Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_PARAMENT;
266+
return false;
267+
}
268+
JSONCPP_STRING st_JsonError;
269+
Json::Value st_JsonRoot;
270+
Json::CharReaderBuilder st_JsonBuilder;
271+
272+
FILE* pSt_File = _xtfopen(lpszConfigFile, _X("rb"));
273+
if (NULL == pSt_File)
274+
{
275+
Config_IsErrorOccur = true;
276+
Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_PARAMENT;
277+
return false;
278+
}
279+
int nCount = 0;
280+
XCHAR tszMsgBuffer[4096];
281+
while (1)
282+
{
283+
int nRet = fread(tszMsgBuffer + nCount, 1, 2048, pSt_File);
284+
if (nRet <= 0)
285+
{
286+
break;
287+
}
288+
nCount += nRet;
289+
}
290+
fclose(pSt_File);
291+
292+
std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_JsonBuilder.newCharReader());
293+
if (!pSt_JsonReader->parse(tszMsgBuffer, tszMsgBuffer + nCount, &st_JsonRoot, &st_JsonError))
294+
{
295+
Config_IsErrorOccur = true;
296+
Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_PARSE;
297+
return false;
298+
}
238299
if (st_JsonRoot["XVer"].empty())
239300
{
240301
Config_IsErrorOccur = true;

‎XEngine_Source/StorageModule_Config/Config_Json/Config_Json.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ class CConfig_Json
1818
~CConfig_Json();
1919
public:
2020
bool Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG* pSt_ServerConfig);
21+
bool Config_Json_Version(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG* pSt_ServerConfig);
2122
bool Config_Json_LoadBalance(LPCXSTR lpszConfigFile, XENGINE_LBCONFIG* pSt_ServerConfig);
2223
};

‎XEngine_Source/StorageModule_Config/StorageModule_Config.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ EXPORTS
44
Config_GetLastError
55

66
Config_Json_File
7+
Config_Json_Version
78
Config_Json_LoadBalance

‎XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
75-
<IncludePath>$(XEngine_Include);../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
75+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;..\StorageModule_Config;$(IncludePath)</IncludePath>
7676
</PropertyGroup>
7777
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7878
<LinkIncremental>false</LinkIncremental>

‎XEngine_Source/StorageModule_Config/pch.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ extern "C" bool Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG *
3333
{
3434
return m_ConfigJson.Config_Json_File(lpszConfigFile, pSt_ServerConfig);
3535
}
36+
extern "C" bool Config_Json_Version(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG * pSt_ServerConfig)
37+
{
38+
return m_ConfigJson.Config_Json_Version(lpszConfigFile, pSt_ServerConfig);
39+
}
3640
extern "C" bool Config_Json_LoadBalance(LPCXSTR lpszConfigFile, XENGINE_LBCONFIG* pSt_ServerConfig)
3741
{
3842
return m_ConfigJson.Config_Json_LoadBalance(lpszConfigFile, pSt_ServerConfig);

‎XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
75-
<IncludePath>$(XEngine_Include);../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
75+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
7676
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

‎XEngine_Source/XEngine_Depend‎

‎XEngine_Source/XEngine_StorageApp/StorageApp_Config.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
bool StorageApp_Config_Parament(int argc,char **argv)
44
{
55
LPCXSTR lpszBaseCfg = _X("./XEngine_Config/XEngine_Config.json");
6+
LPCXSTR lpszVerCfg = _X("./XEngine_Config/XEngine_VersionConfig.json");
67
LPCXSTR lpszLoadCfg = _X("./XEngine_Config/XEngine_LBConfig.json");
78

89
if (NULL != st_ServiceCfg.st_XVer.pStl_ListStorage)
@@ -33,6 +34,11 @@ bool StorageApp_Config_Parament(int argc,char **argv)
3334
{
3435
printf("解析配置文件失败,Config_Json_File:%lX\n",Config_GetLastError());
3536
return false;
37+
}
38+
if (!Config_Json_Version(lpszVerCfg, &st_ServiceCfg))
39+
{
40+
printf("解析配置文件失败,Config_Json_Version:%lX\n", Config_GetLastError());
41+
return false;
3642
}
3743
if (!Config_Json_LoadBalance(lpszLoadCfg, &st_LoadbalanceCfg))
3844
{

0 commit comments

Comments
 (0)