added:db configure for configure module

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -23,10 +23,10 @@
         "LogLeave":32
     },
     "XSql":{
-        "SQLAddr":"192.168.1.10",
+        "SQLAddr":"42.194.178.57",
         "SQLPort":3306,
         "SQLUser":"root",
-        "SQLPass":"123123aa"
+        "SQLPass":"123123Qyt"
     },
     "XPass":{
         "nTimeout":2,
@@ -36,6 +36,7 @@
         "tszPassLogout":""
     },
     "XVer":[
+        "3.7.0.1001 Build20230423",
         "3.6.0.1001 Build20230222",
         "3.5.0.1001 Build20230106",
         "3.4.0.1001 Build20221110",

XEngine_Release/XEngine_Config/XEngine_DBConfig.json

@@ -0,0 +1,7 @@
+{
+    "MQUser":{
+        "UserTime":{
+            "bPubClear":false
+        }
+    }
+}

XEngine_Source/MQCore_ConfigModule/Config_Define.h

@@ -13,7 +13,7 @@
 //////////////////////////////////////////////////////////////////////////
 //                        导出的数据结构
 //////////////////////////////////////////////////////////////////////////
-typedef struct tag_XEngine_ServerConfig
+typedef struct 
 {
     XCHAR tszIPAddr[128];
     XCHAR tszTopic[128];
@@ -62,6 +62,16 @@ typedef struct tag_XEngine_ServerConfig
         list<tstring> *pStl_ListStorage;
     }st_XVer;
 }XENGINE_SERVERCONFIG;
+typedef struct
+{
+    struct  
+    {
+        struct  
+        {
+            bool bPubClear;
+        }st_UserTime;
+    }st_MQUser;
+}MESSAGEQUEUE_DBCONFIG;
 //////////////////////////////////////////////////////////////////////////
 //                        导出函数定义
 //////////////////////////////////////////////////////////////////////////
@@ -70,3 +80,4 @@ extern "C" XLONG Config_GetLastError(int *pInt_ErrorCode = NULL);
 /*                        文件配置读取                                  */
 /************************************************************************/
 extern "C" bool Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG *pSt_ServerConfig);
+extern "C" bool Config_Json_DBFile(LPCXSTR lpszConfigFile, MESSAGEQUEUE_DBCONFIG* pSt_DBConfig);

XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.cpp

@@ -145,3 +145,65 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
     }
     return true;
 }
+bool CConfig_Json::Config_Json_DBFile(LPCXSTR lpszConfigFile, MESSAGEQUEUE_DBCONFIG* pSt_DBConfig)
+{
+	Config_IsErrorOccur = false;
+
+	if ((NULL == lpszConfigFile) || (NULL == pSt_DBConfig))
+	{
+		Config_IsErrorOccur = true;
+		Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_PARAMENT;
+		return false;
+	}
+	JSONCPP_STRING st_JsonError;
+	Json::Value st_JsonRoot;
+	Json::CharReaderBuilder st_JsonBuilder;
+
+	FILE* pSt_File = _xtfopen(lpszConfigFile, _X("rb"));
+	if (NULL == pSt_File)
+	{
+		Config_IsErrorOccur = true;
+		Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_PARAMENT;
+		return false;
+	}
+	int nCount = 0;
+	XCHAR tszMsgBuffer[4096];
+	while (1)
+	{
+		int nRet = fread(tszMsgBuffer + nCount, 1, 2048, pSt_File);
+		if (nRet <= 0)
+		{
+			break;
+		}
+		nCount += nRet;
+	}
+	fclose(pSt_File);
+
+	std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_JsonBuilder.newCharReader());
+	if (!pSt_JsonReader->parse(tszMsgBuffer, tszMsgBuffer + nCount, &st_JsonRoot, &st_JsonError))
+	{
+		Config_IsErrorOccur = true;
+		Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_PARSE;
+		return false;
+	}
+
+	if (st_JsonRoot["MQUser"].empty())
+	{
+		Config_IsErrorOccur = true;
+		Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_XMAX;
+		return false;
+	}
+	Json::Value st_JsonUser = st_JsonRoot["MQUser"];
+
+	if (st_JsonUser["UserTime"].empty())
+	{
+		Config_IsErrorOccur = true;
+		Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_XMAX;
+		return false;
+	}
+	Json::Value st_JsonUserTime = st_JsonUser["UserTime"];
+	
+	pSt_DBConfig->st_MQUser.st_UserTime.bPubClear = st_JsonUserTime["bPubClear"].asBool();
+
+	return true;
+}

XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.h

@@ -18,4 +18,5 @@ class CConfig_Json
     ~CConfig_Json();
 public:
     bool Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG *pSt_ServerConfig);
+    bool Config_Json_DBFile(LPCXSTR lpszConfigFile, MESSAGEQUEUE_DBCONFIG *pSt_DBConfig);
 };

XEngine_Source/MQCore_ConfigModule/MQCore_ConfigModule.def

@@ -3,4 +3,5 @@ LIBRARY
 EXPORTS
 	Config_GetLastError
 
-	Config_Json_File
+	Config_Json_File
+	Config_Json_DBFile

XEngine_Source/MQCore_ConfigModule/pch.cpp

@@ -33,3 +33,7 @@ extern "C" bool Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG *
 {
 	return m_ConfigJson.Config_Json_File(lpszConfigFile, pSt_ServerConfig);
 }
+extern "C" bool Config_Json_DBFile(LPCXSTR lpszConfigFile, MESSAGEQUEUE_DBCONFIG * pSt_DBConfig)
+{
+	return m_ConfigJson.Config_Json_DBFile(lpszConfigFile, pSt_DBConfig);
+}