update:match xengine v9.x support

xengine-qyt · xengine-qyt · commit c08c6cb7fe9d · 2024-12-31T10:07:24.000+08:00
diff --git a/XEngine_Source/MQCore_DBModule/DBModule_MQData/DBModule_MQData.cpp b/XEngine_Source/MQCore_DBModule/DBModule_MQData/DBModule_MQData.cpp
@@ -579,7 +579,7 @@ bool CDBModule_MQData::DBModule_MQData_CreateTable(LPCXSTR lpszQueueName)
 
 #ifdef _MSC_BUILD
 	int nUTFLen = 0;
-	BaseLib_OperatorCharset_AnsiToUTF(tszSQLQuery, tszUTFQuery, &nUTFLen);
+	BaseLib_Charset_AnsiToUTF(tszSQLQuery, tszUTFQuery, &nUTFLen);
 	if (!DataBase_MySQL_Execute(xhDBSQL, tszUTFQuery))
 #else
 	if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLQuery))
@@ -725,7 +725,7 @@ bool CDBModule_MQData::DBModule_MQData_ShowTable(XCHAR*** pppszTableName, int* p
 		return false;
 	}
 	*pInt_ListCount = (int)nllLine;
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)pppszTableName, (int)nllLine, sizeof(XENGINE_DBMESSAGEQUEUE));
+	BaseLib_Memory_Malloc((XPPPMEM)pppszTableName, (int)nllLine, sizeof(XENGINE_DBMESSAGEQUEUE));
 	for (__int64u i = 0; i < nllLine; i++)
 	{
 		XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
diff --git a/XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp b/XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp
@@ -330,7 +330,7 @@ bool CDBModule_MQUser::DBModule_MQUser_UserList(XENGINE_PROTOCOL_USERINFO*** ppp
 		return false;
 	}
 	*pInt_ListCount = (int)nllLine;
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_UserInfo, (int)nllLine, sizeof(XENGINE_PROTOCOL_USERINFO));
+	BaseLib_Memory_Malloc((XPPPMEM)pppSt_UserInfo, (int)nllLine, sizeof(XENGINE_PROTOCOL_USERINFO));
 	for (__int64u i = 0; i < nllLine; i++)
 	{
 		XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
@@ -551,7 +551,7 @@ bool CDBModule_MQUser::DBModule_MQUser_KeyList(LPCXSTR lpszUser, LPCXSTR lpszKey
 		return false;
 	}
 	*pInt_ListCount = (int)nllLine;
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_UserKey, (int)nllLine, sizeof(XENGINE_DBUSERKEY));
+	BaseLib_Memory_Malloc((XPPPMEM)pppSt_UserKey, (int)nllLine, sizeof(XENGINE_DBUSERKEY));
 	for (__int64u i = 0; i < nllLine; i++)
 	{
 		XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
@@ -782,7 +782,7 @@ bool CDBModule_MQUser::DBModule_MQUser_TimeQuery(XENGINE_DBTIMERELEASE*** pppSt_
 		return false;
 	}
 	*pInt_ListCount = (int)nllLine;
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_DBInfo, *pInt_ListCount, sizeof(XENGINE_DBTIMERELEASE));
+	BaseLib_Memory_Malloc((XPPPMEM)pppSt_DBInfo, *pInt_ListCount, sizeof(XENGINE_DBTIMERELEASE));
 	for (__int64u i = 0; i < nllLine; i++)
 	{
 		XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
@@ -1141,7 +1141,7 @@ XHTHREAD CALLBACK CDBModule_MQUser::DBModule_MQUser_TimeThread(XPVOID lParam)
 		{
 			pClass_This->lpCall_TimePublish(ppSt_DBInfo[i], pClass_This->m_lParam);
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_DBInfo, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSt_DBInfo, nListCount);
 		std::this_thread::sleep_for(std::chrono::seconds(1));
 	}
 	return 0;
diff --git a/XEngine_Source/MQCore_ProtocolModule/Makefile b/XEngine_Source/MQCore_ProtocolModule/Makefile
@@ -7,7 +7,7 @@ LIBFLAG =
 RELEASE = 0
 LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
 LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
-LIB = -ljsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lRfcComponents_MQTTProtocol
+LIB = -ljsoncpp -lXEngine_BaseLib -lXEngine_Cryption -lRfcComponents_MQTTProtocol
 LIBEX = 
 OBJECTS = ProtocolModule_Packet.o ProtocolModule_Parse.o pch.o
 
diff --git a/XEngine_Source/MQCore_ProtocolModule/ProtocolModule_Packet/ProtocolModule_Packet.cpp b/XEngine_Source/MQCore_ProtocolModule/ProtocolModule_Packet/ProtocolModule_Packet.cpp
@@ -829,7 +829,7 @@ bool CProtocolModule_Packet::ProtocolModule_Packet_WSCommon(XENGINE_PROTOCOLHDR*
 			}
 			memset(ptszBaseBuffer, '\0', XENGINE_MEMORY_SIZE_MAX);
 
-			OPenSsl_Codec_Base64(lpszMsgBuffer, ptszBaseBuffer, &nBLen, true);
+			Cryption_Codec_Base64(lpszMsgBuffer, ptszBaseBuffer, &nBLen, true);
 			st_JsonPayload["nPayLen"] = nBLen;
 			st_JsonPayload["tszPayData"] = ptszBaseBuffer;
 		}
@@ -861,7 +861,7 @@ bool CProtocolModule_Packet::ProtocolModule_Packet_MQTTCommon(XENGINE_PROTOCOLHD
 			XCHAR tszRVBuffer[1024];
 			MQTTPROTOCOL_HDRPROPERTY** ppSt_HDRProperty;
 
-			BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_HDRProperty, nListCount, sizeof(MQTTPROTOCOL_HDRPROPERTY));
+			BaseLib_Memory_Malloc((XPPPMEM)&ppSt_HDRProperty, nListCount, sizeof(MQTTPROTOCOL_HDRPROPERTY));
 
 			ppSt_HDRProperty[0]->nProLen = 4;
 			ppSt_HDRProperty[0]->st_unValue.nValue = 1024000;
@@ -889,7 +889,7 @@ bool CProtocolModule_Packet::ProtocolModule_Packet_MQTTCommon(XENGINE_PROTOCOLHD
 
 			MQTTProtocol_Packet_REPConnect(tszRVBuffer, &nRVLen, 0, XENGINE_RFCCOMPONENTS_MQTT_PROTOCOL_REASON_SUCCESS, &ppSt_HDRProperty, nListCount);
 			MQTTProtocol_Packet_Header(ptszMsgBuffer, pInt_MsgLen, XENGINE_RFCCOMPONENTS_MQTT_PROTOCOL_TYPE_CONNACK, tszRVBuffer, nRVLen);
-			BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_HDRProperty, nListCount);
+			BaseLib_Memory_Free((XPPPMEM)&ppSt_HDRProperty, nListCount);
 		}
 		else
 		{
diff --git a/XEngine_Source/MQCore_ProtocolModule/ProtocolModule_Parse/ProtocolModule_Parse.cpp b/XEngine_Source/MQCore_ProtocolModule/ProtocolModule_Parse/ProtocolModule_Parse.cpp
@@ -209,7 +209,7 @@ bool CProtocolModule_Parse::ProtocolModule_Parse_Websocket(LPCXSTR lpszMsgBuffer
 		if (ENUM_XENGINE_PROTOCOLHDR_PAYLOAD_TYPE_BIN == pSt_ProtocolHdr->byVersion)
 		{
 			int nBLen = st_JsonPayLoad["nPayLen"].asInt();
-			OPenSsl_Codec_Base64(st_JsonPayLoad["tszPayData"].asCString(), ptszMsgBuffer + nPos, &nBLen, false);
+			Cryption_Codec_Base64(st_JsonPayLoad["tszPayData"].asCString(), ptszMsgBuffer + nPos, &nBLen, false);
 			*pInt_MsgLen += nBLen;
 		}
 		else
diff --git a/XEngine_Source/MQCore_ProtocolModule/pch.h b/XEngine_Source/MQCore_ProtocolModule/pch.h
@@ -21,8 +21,8 @@
 #include <XEngine_Include/XEngine_ProtocolHdr.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
-#include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
-#include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
+#include <XEngine_Include/XEngine_Core/Cryption_Define.h>
+#include <XEngine_Include/XEngine_Core/Cryption_Error.h>
 #include <XEngine_Include/XEngine_Core/ManagePool_Define.h>
 #include <XEngine_Include/XEngine_HelpComponents/DataBase_Define.h>
 #include <XEngine_Include/XEngine_RfcComponents/MQTTProtocol_Define.h>
@@ -48,7 +48,7 @@ extern XLONG Protocol_dwErrorCode;
 
 #ifdef _MSC_BUILD
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
-#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
+#pragma comment(lib,"XEngine_Core/XEngine_Cryption")
 #pragma comment(lib,"XEngine_RfcComponents/RfcComponents_MQTTProtocol.lib")
 #ifdef _DEBUG
 #ifdef _WIN64
diff --git a/XEngine_Source/MQCore_SessionModule/SessionModule_Client/SessionModule_Client.cpp b/XEngine_Source/MQCore_SessionModule/SessionModule_Client/SessionModule_Client.cpp
@@ -432,7 +432,7 @@ bool CSessionModule_Client::SessionModule_Client_GetListAddr(XCHAR*** ppptszClie
 	Session_IsErrorOccur = false;
 
 	*pInt_ListCount = stl_MapSession.size();
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)ppptszClientList, stl_MapSession.size(), 128);
+	BaseLib_Memory_Malloc((XPPPMEM)ppptszClientList, stl_MapSession.size(), 128);
 
 	st_Locker.lock_shared();
 	unordered_map<tstring, XENGINE_SESSIONINFO>::iterator stl_MapIterator = stl_MapSession.begin();
diff --git a/XEngine_Source/VSCopy_Debug.bat b/XEngine_Source/VSCopy_Debug.bat
@@ -3,11 +3,13 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_BaseSafe.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Algorithm.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Core.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"
-copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_OPenSsl.dll" "./"
+copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Cryption.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_APIHelp.dll" "./"
 
+copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
+
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_Packets.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_XLog.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_DataBase.dll" "./"
diff --git a/XEngine_Source/VSCopy_x64.bat b/XEngine_Source/VSCopy_x64.bat
@@ -3,11 +3,13 @@ copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Core.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"
-copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_OPenSsl.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Cryption.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Client\XClient_APIHelp.dll" "./"
 
+copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
+
 copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
diff --git a/XEngine_Source/VSCopy_x86.bat b/XEngine_Source/VSCopy_x86.bat
@@ -3,11 +3,13 @@ copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Core.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_ManagePool.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_OPenSsl.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Cryption.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Client\XClient_APIHelp.dll" "./"
 
+copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
+
 copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_HttpTask.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_HttpTask.cpp
@@ -29,12 +29,12 @@ XHTHREAD CALLBACK MessageQueue_HttpThread(XPVOID lParam)
 				if (HttpProtocol_Server_GetMemoryEx(xhHTTPPacket, ppSst_ListAddr[i]->tszClientAddr, &ptszMsgBuffer, &nMsgLen, &st_HTTPReqparam, &ppszHdrList, &nHdrCount))
 				{
 					MessageQueue_Http_Handle(&st_HTTPReqparam, ppSst_ListAddr[i]->tszClientAddr, ptszMsgBuffer, nMsgLen, ppszHdrList, nHdrCount);
-					BaseLib_OperatorMemory_FreeCStyle((VOID**)&ptszMsgBuffer);
-					BaseLib_OperatorMemory_Free((XPPPMEM)&ppszHdrList, nHdrCount);
+					BaseLib_Memory_FreeCStyle((VOID**)&ptszMsgBuffer);
+					BaseLib_Memory_Free((XPPPMEM)&ppszHdrList, nHdrCount);
 				}
 			}
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
 	}
 	return 0;
 }
@@ -71,19 +71,19 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
 			return false;
 		}
 		//获取函数
-		BaseLib_OperatorString_GetKeyValue(ppSt_ListUrl[0], _X("="), tszKey, tszValue);
+		BaseLib_String_GetKeyValue(ppSt_ListUrl[0], _X("="), tszKey, tszValue);
 		if (0 == _tcsxnicmp(lpszAPIGet, tszValue, _tcsxlen(lpszAPIGet)))
 		{
 			memset(tszValue, '\0', MAX_PATH);
-			BaseLib_OperatorString_GetKeyValue(ppSt_ListUrl[1], _X("="), tszKey, tszValue);
+			BaseLib_String_GetKeyValue(ppSt_ListUrl[1], _X("="), tszKey, tszValue);
 			if (0 == _tcsxnicmp(lpszAPIUser, tszValue, _tcsxlen(lpszAPIUser)))
 			{
 				//用户 http://127.0.0.1:5202/api?function=get&method=user
 				int nListCount = 0;
 				XENGINE_PROTOCOL_USERINFO** ppSt_UserInfo;
 				DBModule_MQUser_UserList(&ppSt_UserInfo, &nListCount);
 				ProtocolModule_Packet_UserList(tszPKTBuffer, &nPKTLen, &ppSt_UserInfo, nListCount);
-				BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_UserInfo, nListCount);
+				BaseLib_Memory_Free((XPPPMEM)&ppSt_UserInfo, nListCount);
 
 				XEngine_MQXService_Send(lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP);
 				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,发送的获取用户列表请求成功,获取到的用户列表个数:%d"), lpszClientAddr, nListCount);
@@ -100,10 +100,10 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
 				int nListCount = 0;
 				XCHAR** pptszListAddr;
 				
-				BaseLib_OperatorString_GetKeyValue(ppSt_ListUrl[2], _X("="), tszKey, tszValue);
+				BaseLib_String_GetKeyValue(ppSt_ListUrl[2], _X("="), tszKey, tszValue);
 				SessionModule_Client_GetListAddr(&pptszListAddr, &nListCount, _ttxoi(tszValue));
 				ProtocolModule_Packet_OnlineList(tszPKTBuffer, &nPKTLen, &pptszListAddr, nListCount);
-				BaseLib_OperatorMemory_Free((XPPPMEM)&pptszListAddr, nListCount);
+				BaseLib_Memory_Free((XPPPMEM)&pptszListAddr, nListCount);
 				XEngine_MQXService_Send(lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP);
 				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,发送的获取在线用户列表请求成功,获取到的列表个数:%d"), lpszClientAddr, nListCount);
 			}
@@ -116,14 +116,14 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
 					XCHAR** ppszTableName;
 					DBModule_MQData_ShowTable(&ppszTableName, &nListCount);
 					ProtocolModule_Packet_TopicList(tszPKTBuffer, &nPKTLen, &ppszTableName, nListCount);
-					BaseLib_OperatorMemory_Free((XPPPMEM)&ppszTableName, nListCount);
+					BaseLib_Memory_Free((XPPPMEM)&ppszTableName, nListCount);
 					XEngine_MQXService_Send(lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP);
 					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,发送的获取主题列表请求成功,获取到的主题列表个数:%d"), lpszClientAddr, nListCount);
 				}
 				else
 				{
 					int nDBCount = 0;
-					BaseLib_OperatorString_GetKeyValue(ppSt_ListUrl[2], _X("="), tszKey, tszValue);
+					BaseLib_String_GetKeyValue(ppSt_ListUrl[2], _X("="), tszKey, tszValue);
 					DBModule_MQData_GetLeftCount(tszValue, 0, &nDBCount);
 					ProtocolModule_Packet_TopicName(tszPKTBuffer, &nPKTLen, tszValue, nDBCount);
 					XEngine_MQXService_Send(lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP);
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_MQTTTask.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_MQTTTask.cpp
@@ -25,17 +25,17 @@ XHTHREAD CALLBACK MessageQueue_MQTTThread(XPVOID lParam)
 				if (MQTTProtocol_Parse_Recv(ppSst_ListAddr[i]->tszClientAddr, &st_MQTTHdr, &ptszMSGBuffer, &nMSGLen))
 				{
 					MQService_MQTT_Handle(ppSst_ListAddr[i]->tszClientAddr, &st_MQTTHdr, ptszMSGBuffer, nMSGLen);
-					BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
+					BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
 				}
 			}
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);
 	}
 	return 0;
 }
 void Packet_Property(MQTTPROTOCOL_HDRPROPERTY*** pppSt_HDRProperty, int nListCount)
 {
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_HDRProperty, nListCount, sizeof(MQTTPROTOCOL_HDRPROPERTY));
+	BaseLib_Memory_Malloc((XPPPMEM)pppSt_HDRProperty, nListCount, sizeof(MQTTPROTOCOL_HDRPROPERTY));
 
 	(*pppSt_HDRProperty)[0]->nProLen = 4;
 	(*pppSt_HDRProperty)[0]->st_unValue.nValue = 1024000;
@@ -87,7 +87,7 @@ bool MQService_MQTT_Handle(LPCXSTR lpszClientAddr, MQTTPROTOCOL_FIXEDHEADER* pSt
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("MQTT客户端:%s,请求链接失败,错误码:%lX"), lpszClientAddr, MQTTProtocol_GetLastError());
 			return false;
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_HDRProperty, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSt_HDRProperty, nListCount);
 
 		XENGINE_PROTOCOLHDR st_ProtocolHdr = {};
 		XENGINE_PROTOCOL_USERAUTH st_ProtocolAuth = {};
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_Task.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_Task.cpp
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_WSTask.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_WSTask.cpp
diff --git a/XEngine_Source/XEngine_MQServiceApp/XEngine_MQServiceApp.cpp b/XEngine_Source/XEngine_MQServiceApp/XEngine_MQServiceApp.cpp

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ bool CDBModule_MQUser::DBModule_MQUser_UserList(XENGINE_PROTOCOL_USERINFO*** ppp`
`330`	`330`	`return false;`
`331`	`331`	`}`
`332`	`332`	`*pInt_ListCount = (int)nllLine;`
`333`		`- BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_UserInfo, (int)nllLine, sizeof(XENGINE_PROTOCOL_USERINFO));`
	`333`	`+ BaseLib_Memory_Malloc((XPPPMEM)pppSt_UserInfo, (int)nllLine, sizeof(XENGINE_PROTOCOL_USERINFO));`
`334`	`334`	`for (__int64u i = 0; i < nllLine; i++)`
`335`	`335`	`{`
`336`	`336`	`XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);`
`@@ -551,7 +551,7 @@ bool CDBModule_MQUser::DBModule_MQUser_KeyList(LPCXSTR lpszUser, LPCXSTR lpszKey`
`551`	`551`	`return false;`
`552`	`552`	`}`
`553`	`553`	`*pInt_ListCount = (int)nllLine;`
`554`		`- BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_UserKey, (int)nllLine, sizeof(XENGINE_DBUSERKEY));`
	`554`	`+ BaseLib_Memory_Malloc((XPPPMEM)pppSt_UserKey, (int)nllLine, sizeof(XENGINE_DBUSERKEY));`
`555`	`555`	`for (__int64u i = 0; i < nllLine; i++)`
`556`	`556`	`{`
`557`	`557`	`XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);`
`@@ -782,7 +782,7 @@ bool CDBModule_MQUser::DBModule_MQUser_TimeQuery(XENGINE_DBTIMERELEASE*** pppSt_`
`782`	`782`	`return false;`
`783`	`783`	`}`
`784`	`784`	`*pInt_ListCount = (int)nllLine;`
`785`		`- BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_DBInfo, *pInt_ListCount, sizeof(XENGINE_DBTIMERELEASE));`
	`785`	`+ BaseLib_Memory_Malloc((XPPPMEM)pppSt_DBInfo, *pInt_ListCount, sizeof(XENGINE_DBTIMERELEASE));`
`786`	`786`	`for (__int64u i = 0; i < nllLine; i++)`
`787`	`787`	`{`
`788`	`788`	`XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);`
`@@ -1141,7 +1141,7 @@ XHTHREAD CALLBACK CDBModule_MQUser::DBModule_MQUser_TimeThread(XPVOID lParam)`
`1141`	`1141`	`{`
`1142`	`1142`	`pClass_This->lpCall_TimePublish(ppSt_DBInfo[i], pClass_This->m_lParam);`
`1143`	`1143`	`}`
`1144`		`- BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_DBInfo, nListCount);`
	`1144`	`+ BaseLib_Memory_Free((XPPPMEM)&ppSt_DBInfo, nListCount);`
`1145`	`1145`	`std::this_thread::sleep_for(std::chrono::seconds(1));`
`1146`	`1146`	`}`
`1147`	`1147`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,7 @@ bool CProtocolModule_Packet::ProtocolModule_Packet_WSCommon(XENGINE_PROTOCOLHDR*`
`829`	`829`	`}`
`830`	`830`	`memset(ptszBaseBuffer, '\0', XENGINE_MEMORY_SIZE_MAX);`
`831`	`831`
`832`		`- OPenSsl_Codec_Base64(lpszMsgBuffer, ptszBaseBuffer, &nBLen, true);`
	`832`	`+ Cryption_Codec_Base64(lpszMsgBuffer, ptszBaseBuffer, &nBLen, true);`
`833`	`833`	`st_JsonPayload["nPayLen"] = nBLen;`
`834`	`834`	`st_JsonPayload["tszPayData"] = ptszBaseBuffer;`
`835`	`835`	`}`
`@@ -861,7 +861,7 @@ bool CProtocolModule_Packet::ProtocolModule_Packet_MQTTCommon(XENGINE_PROTOCOLHD`
`861`	`861`	`XCHAR tszRVBuffer[1024];`
`862`	`862`	`MQTTPROTOCOL_HDRPROPERTY** ppSt_HDRProperty;`
`863`	`863`
`864`		`- BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_HDRProperty, nListCount, sizeof(MQTTPROTOCOL_HDRPROPERTY));`
	`864`	`+ BaseLib_Memory_Malloc((XPPPMEM)&ppSt_HDRProperty, nListCount, sizeof(MQTTPROTOCOL_HDRPROPERTY));`
`865`	`865`
`866`	`866`	`ppSt_HDRProperty[0]->nProLen = 4;`
`867`	`867`	`ppSt_HDRProperty[0]->st_unValue.nValue = 1024000;`
`@@ -889,7 +889,7 @@ bool CProtocolModule_Packet::ProtocolModule_Packet_MQTTCommon(XENGINE_PROTOCOLHD`
`889`	`889`
`890`	`890`	`MQTTProtocol_Packet_REPConnect(tszRVBuffer, &nRVLen, 0, XENGINE_RFCCOMPONENTS_MQTT_PROTOCOL_REASON_SUCCESS, &ppSt_HDRProperty, nListCount);`
`891`	`891`	`MQTTProtocol_Packet_Header(ptszMsgBuffer, pInt_MsgLen, XENGINE_RFCCOMPONENTS_MQTT_PROTOCOL_TYPE_CONNACK, tszRVBuffer, nRVLen);`
`892`		`- BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_HDRProperty, nListCount);`
	`892`	`+ BaseLib_Memory_Free((XPPPMEM)&ppSt_HDRProperty, nListCount);`
`893`	`893`	`}`
`894`	`894`	`else`
`895`	`895`	`{`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ bool CProtocolModule_Parse::ProtocolModule_Parse_Websocket(LPCXSTR lpszMsgBuffer`
`209`	`209`	`if (ENUM_XENGINE_PROTOCOLHDR_PAYLOAD_TYPE_BIN == pSt_ProtocolHdr->byVersion)`
`210`	`210`	`{`
`211`	`211`	`int nBLen = st_JsonPayLoad["nPayLen"].asInt();`
`212`		`- OPenSsl_Codec_Base64(st_JsonPayLoad["tszPayData"].asCString(), ptszMsgBuffer + nPos, &nBLen, false);`
	`212`	`+ Cryption_Codec_Base64(st_JsonPayLoad["tszPayData"].asCString(), ptszMsgBuffer + nPos, &nBLen, false);`
`213`	`213`	`*pInt_MsgLen += nBLen;`
`214`	`214`	`}`
`215`	`215`	`else`