delete rename configure module

Author: xengine-qyt

XEngine_Source/StorageModule_Config/Config_Define.h

@@ -63,7 +63,6 @@ typedef struct tag_XEngine_ServerConfig
     }st_XSql;
     struct  
 	{
-        BOOL bRename;
         BOOL bResumable;
         int nHashMode;
 		TCHAR tszFileDir[MAX_PATH];

XEngine_Source/StorageModule_Config/Config_Error.h

@@ -23,6 +23,7 @@
 #define ERROR_XENGINE_BLOGIC_CONFIG_JSON_XVER 0x0020008
 #define ERROR_XENGINE_BLOGIC_CONFIG_JSON_XPROXY 0x0020009
 #define ERROR_XENGINE_BLOGIC_CONFIG_JSON_P2XP 0x002000A
+#define ERROR_XENGINE_BLOGIC_CONFIG_JSON_CERT 0x002000B
 
 #define ERROR_XENGINE_BLOGIC_CONFIG_JSON_LBCONFIG 0x0020010
 #define ERROR_XENGINE_BLOGIC_CONFIG_JSON_LAODBALANCE 0x0020011

XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp

@@ -125,7 +125,7 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
 	_tcscpy(pSt_ServerConfig->st_XSql.tszSQLPass, st_JsonXSql["SQLPass"].asCString());
 	_tcscpy(pSt_ServerConfig->st_XSql.tszSQLFile, st_JsonXSql["SQLFile"].asCString());
 
-    if (st_JsonRoot["XStorage"].empty() || (4 != st_JsonRoot["XStorage"].size()))
+    if (st_JsonRoot["XStorage"].empty() || (3 != st_JsonRoot["XStorage"].size()))
     {
         Config_IsErrorOccur = TRUE;
         Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_XSTORAGE;
@@ -134,7 +134,6 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
     Json::Value st_JsonXStorage = st_JsonRoot["XStorage"];
     pSt_ServerConfig->st_XStorage.nHashMode = st_JsonXStorage["nHashMode"].asInt();
     pSt_ServerConfig->st_XStorage.bResumable = st_JsonXStorage["bResumable"].asInt();
-    pSt_ServerConfig->st_XStorage.bRename = st_JsonXStorage["bRename"].asInt();
     _tcscpy(pSt_ServerConfig->st_XStorage.tszFileDir, st_JsonXStorage["tszFileDir"].asCString());
 
 	if (st_JsonRoot["XProxy"].empty() || (2 != st_JsonRoot["XProxy"].size()))
@@ -183,16 +182,22 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
 	if (st_JsonRoot["XCert"].empty() || (6 != st_JsonRoot["XCert"].size()))
 	{
 		Config_IsErrorOccur = TRUE;
-		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_P2XP;
+		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_CERT;
 		return FALSE;
 	}
 	Json::Value st_JsonCert = st_JsonRoot["XCert"];
 	pSt_ServerConfig->st_XCert.bDLEnable = st_JsonCert["bDLEnable"].asInt();
     pSt_ServerConfig->st_XCert.bUPEnable = st_JsonCert["bUPEnable"].asInt();
     pSt_ServerConfig->st_XCert.bCHEnable = st_JsonCert["bCHEnable"].asInt();
     pSt_ServerConfig->st_XCert.nSslType = st_JsonCert["nSslType"].asInt();
-	_tcscpy(pSt_ServerConfig->st_XCert.tszCertChain, st_JsonP2xp["tszCertChain"].asCString());
-    _tcscpy(pSt_ServerConfig->st_XCert.tszCertKey, st_JsonP2xp["tszCertKey"].asCString());
+    if (!st_JsonP2xp["tszCertChain"].isNull())
+    {
+        _tcscpy(pSt_ServerConfig->st_XCert.tszCertChain, st_JsonP2xp["tszCertChain"].asCString());
+    }
+	if (!st_JsonP2xp["tszCertKey"].isNull())
+	{
+        _tcscpy(pSt_ServerConfig->st_XCert.tszCertKey, st_JsonP2xp["tszCertKey"].asCString());
+	}
 
 	if (st_JsonRoot["XVer"].empty() || (1 != st_JsonRoot["XVer"].size()))
 	{