update:match xengine v8.25

Author: xengine-qyt

XEngine_Source/MQCore_DBModule/Makefile

@@ -7,7 +7,7 @@ LIBFLAG =
 RELEASE = 0
 UNICODE = 0
 LOADHDR = -I ./
-LOADSO = -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents
+LOADSO = 
 LIB = -lHelpComponents_DataBase
 LIBEX = 
 OBJECTS = DBModule_MQData.o DBModule_MQUser.o pch.o

XEngine_Source/XEngine_MQServiceApp/MQService_Hdr.h

@@ -27,6 +27,8 @@ using namespace std;
 #include <XEngine_Include/XEngine_Core/NetCore_Error.h>
 #include <XEngine_Include/XEngine_Core/ManagePool_Define.h>
 #include <XEngine_Include/XEngine_Core/ManagePool_Error.h>
+#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
+#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
 #include <XEngine_Include/XEngine_HelpComponents/XLog_Define.h>
 #include <XEngine_Include/XEngine_HelpComponents/XLog_Error.h>
 #include <XEngine_Include/XEngine_HelpComponents/Packets_Define.h>
@@ -37,8 +39,7 @@ using namespace std;
 #include <XEngine_Include/XEngine_RfcComponents/HttpProtocol_Error.h>
 #include <XEngine_Include/XEngine_RfcComponents/WSProtocol_Define.h>
 #include <XEngine_Include/XEngine_RfcComponents/WSProtocol_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
+
 
 #ifdef _UNICODE
 typedef std::wstring tstring;
@@ -83,11 +84,11 @@ extern MESSAGEQUEUE_DBCONFIG st_DBConfig;
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
 #pragma comment(lib,"XEngine_Core/XEngine_Core.lib")
 #pragma comment(lib,"XEngine_Core/XEngine_ManagePool.lib")
+#pragma comment(lib,"XEngine_Client/XClient_APIHelp.lib")
 #pragma comment(lib,"XEngine_HelpComponents/HelpComponents_XLog.lib")
 #pragma comment(lib,"XEngine_HelpComponents/HelpComponents_Packets.lib")
 #pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol.lib")
 #pragma comment(lib,"XEngine_RfcComponents/RfcComponents_WSProtocol.lib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient.lib")
 #pragma comment(lib,"Ws2_32.lib")
 #ifdef _DEBUG
 #ifdef _WIN64

XEngine_Source/XEngine_MQServiceApp/MQService_Net.cpp

@@ -103,11 +103,11 @@ void XEngine_MQXService_Close(LPCXSTR lpszClientAddr, int nIPProto, bool bHeart)
             int nSDLen = 0;
 			int nHTTPCode = 0;
 			XCHAR tszSDBuffer[1024];
-            NETHELP_HTTPCLIENT st_HTTPParament;
+            XCLIENT_APIHTTP st_HTTPParament;
 			XENGINE_PROTOCOL_USERAUTH st_ProtocolAuth;
 
             memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
-			memset(&st_HTTPParament, '\0', sizeof(NETHELP_HTTPCLIENT));
+			memset(&st_HTTPParament, '\0', sizeof(XCLIENT_APIHTTP));
             memset(&st_ProtocolAuth, '\0', sizeof(XENGINE_PROTOCOL_USERAUTH));
 
 			st_HTTPParament.nTimeConnect = 2;

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -97,9 +97,9 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 				int nRVLen = 0;
 				int nHTTPCode = 0;
 				XCHAR* ptszSDBuffer = NULL;
-				NETHELP_HTTPCLIENT st_HTTPParament;
+				XCLIENT_APIHTTP st_HTTPParament;
 
-				memset(&st_HTTPParament, '\0', sizeof(NETHELP_HTTPCLIENT));
+				memset(&st_HTTPParament, '\0', sizeof(XCLIENT_APIHTTP));
 
 				st_HTTPParament.nTimeConnect = 2;
 
@@ -162,11 +162,11 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 					int nSDLen = 0;
 					int nHTTPCode = 0;
 					XCHAR tszSDBuffer[1024];
-					NETHELP_HTTPCLIENT st_HTTPParament;
+					XCLIENT_APIHTTP st_HTTPParament;
 					XENGINE_PROTOCOL_USERAUTH st_ProtocolAuth;
 
 					memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
-					memset(&st_HTTPParament, '\0', sizeof(NETHELP_HTTPCLIENT));
+					memset(&st_HTTPParament, '\0', sizeof(XCLIENT_APIHTTP));
 					memset(&st_ProtocolAuth, '\0', sizeof(XENGINE_PROTOCOL_USERAUTH));
 
 					st_HTTPParament.nTimeConnect = 2;
@@ -203,8 +203,8 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 			if (_tcsxlen(st_ServiceCfg.st_XPass.tszPassRegister) > 0)
 			{
 				int nHTTPCode = 0;
-				NETHELP_HTTPCLIENT st_HTTPParament;
-				memset(&st_HTTPParament, '\0', sizeof(NETHELP_HTTPCLIENT));
+				XCLIENT_APIHTTP st_HTTPParament;
+				memset(&st_HTTPParament, '\0', sizeof(XCLIENT_APIHTTP));
 
 				st_HTTPParament.nTimeConnect = 2;
 
@@ -254,8 +254,8 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 			if (_tcsxlen(st_ServiceCfg.st_XPass.tszPassUNReg) > 0)
 			{
 				int nHTTPCode = 0;
-				NETHELP_HTTPCLIENT st_HTTPParament;
-				memset(&st_HTTPParament, '\0', sizeof(NETHELP_HTTPCLIENT));
+				XCLIENT_APIHTTP st_HTTPParament;
+				memset(&st_HTTPParament, '\0', sizeof(XCLIENT_APIHTTP));
 
 				st_HTTPParament.nTimeConnect = 2;
 

XEngine_Source/XEngine_MQServiceApp/Makefile

@@ -5,10 +5,9 @@ PLATDIR =
 RELEASE = 0
 UNICODE = 0
 LOADHDR = -I ./ 
-LOADSO = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L /usr/local/lib/XEngine_Release/XEngine_NetHelp  \
-         -L ../MQCore_ConfigModule -L ../MQCore_ProtocolModule -L ../MQCore_SessionModule -L ../MQCore_DBModule \
+LOADSO = -L ../MQCore_ConfigModule -L ../MQCore_ProtocolModule -L ../MQCore_SessionModule -L ../MQCore_DBModule \
 		 -L ../XEngine_ThirdPart/jsoncpp
-LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_WSProtocol -lRfcComponents_HttpProtocol -lNetHelp_APIClient \
+LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXClient_APIHelp -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_WSProtocol -lRfcComponents_HttpProtocol \
       -lMQCore_ConfigModule -lMQCore_ProtocolModule -lMQCore_SessionModule -lMQCore_DBModule \
 	  -ljsoncpp
 LIBEX =