Skip to content

Commit c64c7b5

Browse files
committed
added:http pass configure supported
1 parent a1bc34a commit c64c7b5

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

XEngine_Source/MQCore_ConfigModule/Config_Define.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ typedef struct tag_XEngine_ServerConfig
4949
TCHAR tszDBName[128];
5050
int nSQLPort;
5151
}st_XSql;
52+
struct
53+
{
54+
TCHAR tszPassRegister[MAX_PATH];
55+
TCHAR tszPassUNReg[MAX_PATH];
56+
TCHAR tszPassLogin[MAX_PATH];
57+
TCHAR tszPassLogout[MAX_PATH];
58+
int nTimeout;
59+
}st_XPass;
5260
struct
5361
{
5462
list<tstring> *pStl_ListStorage;

XEngine_Source/MQCore_ConfigModule/Config_Error.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919
#define ERROR_MQ_MODULE_CONFIG_JSON_XTIME 0x0020004
2020
#define ERROR_MQ_MODULE_CONFIG_JSON_XLOG 0x0020005
2121
#define ERROR_MQ_MODULE_CONFIG_JSON_XSQL 0x0020006
22-
#define ERROR_MQ_MODULE_CONFIG_JSON_XVER 0x0020007
22+
#define ERROR_MQ_MODULE_CONFIG_JSON_XPASS 0x0020007
23+
#define ERROR_MQ_MODULE_CONFIG_JSON_XVER 0x0020008

XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,19 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
117117
_tcscpy(pSt_ServerConfig->st_XSql.tszSQLUser,st_JsonXSql["SQLUser"].asCString());
118118
_tcscpy(pSt_ServerConfig->st_XSql.tszSQLPass,st_JsonXSql["SQLPass"].asCString());
119119

120+
if (st_JsonRoot["XPass"].empty() || (5 != st_JsonRoot["XPass"].size()))
121+
{
122+
Config_IsErrorOccur = TRUE;
123+
Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_XPASS;
124+
return FALSE;
125+
}
126+
Json::Value st_JsonXPass = st_JsonRoot["XPass"];
127+
pSt_ServerConfig->st_XPass.nTimeout = st_JsonXPass["nTimeout"].asInt();
128+
_tcscpy(pSt_ServerConfig->st_XPass.tszPassLogin, st_JsonXPass["tszPassLogin"].asCString());
129+
_tcscpy(pSt_ServerConfig->st_XPass.tszPassLogout, st_JsonXPass["tszPassLogout"].asCString());
130+
_tcscpy(pSt_ServerConfig->st_XPass.tszPassRegister, st_JsonXPass["tszPassRegister"].asCString());
131+
_tcscpy(pSt_ServerConfig->st_XPass.tszPassUNReg, st_JsonXPass["tszPassUNReg"].asCString());
132+
120133
if (st_JsonRoot["XVer"].empty())
121134
{
122135
Config_IsErrorOccur = TRUE;

0 commit comments

Comments
 (0)