fixed:linux build error

Author: xengine-qyt

XEngine_Source/XEngine_ModuleHelp/Makefile

@@ -4,8 +4,8 @@ SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./ -I /usr/include/opencv4
-LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib 
-LIB = -lXEngine_BaseLib -lopencc
+LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Client 
+LIB = -lXEngine_BaseLib -lXClient_Socket -lopencc
 LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = ModuleHelp_IDCard.o ModuleHelp_Language.o ModuleHelp_P2PClient.o ModuleHelp_Locker.o ModuleHelp_QRCode.o ModuleHelp_SocketTest.o pch.o

XEngine_Source/XEngine_ModuleHelp/ModuleHelp_SocketTest/ModuleHelp_SocketTest.cpp

@@ -147,7 +147,7 @@ BOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StopConnect(XNETHANDLE xhToke
 
 		if (NULL != stl_MapIterator->second->lParam)
 		{
-			delete stl_MapIterator->second->lParam;
+			delete (TCHAR*)stl_MapIterator->second->lParam;
 			stl_MapIterator->second->lParam = NULL;
 		}
 
@@ -235,7 +235,7 @@ BOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhTok
 	{
 		ModuleHelp_IsErrorOccur = TRUE;
 		ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_THREAD;
-		return NULL;
+		return FALSE;
 	}
 	*pxhToken = pSt_DataSocket->xhToken;
     st_LockData.lock();
@@ -306,7 +306,7 @@ BOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StopDatas(XNETHANDLE xhToken)
 
 		if (NULL != stl_MapIterator->second->lParam)
 		{
-			delete stl_MapIterator->second->lParam;
+			delete (TCHAR*)stl_MapIterator->second->lParam;
 			stl_MapIterator->second->lParam = NULL;
 		}
 

XEngine_Source/XEngine_ModuleHelp/pch.h

@@ -57,4 +57,8 @@ extern DWORD ModuleHelp_dwErrorCode;
 #ifdef _MSC_BUILD
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
 #pragma comment(lib,"XEngine_Client/XClient_Socket")
+#else
+#if __linux__ && !__ANDROID__
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
+#endif
 #endif

XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Packet/ModuleProtocol_Packet.cpp

@@ -598,10 +598,10 @@ BOOL CModuleProtocol_Packet::ModuleProtocol_Packet_TestReport(TCHAR* ptszMsgBuff
 
 	st_JsonObject["lpszIPAddr"] = lpszIPAddr;
 	st_JsonObject["nIPPort"] = nIPPort;
-	st_JsonObject["xhToken"] = xhToken;
-	st_JsonObject["nNumber"] = nNumber;
-	st_JsonObject["nFailed"] = nFailed;
-	st_JsonObject["nSuccess"] = nSuccess;
+	st_JsonObject["xhToken"] = (Json::Value::Int64)xhToken;
+	st_JsonObject["nNumber"] = (Json::Value::Int64)nNumber;
+	st_JsonObject["nFailed"] = (Json::Value::Int64)nFailed;
+	st_JsonObject["nSuccess"] = (Json::Value::Int64)nSuccess;
 	st_JsonObject["nStatus"] = nStatus;
 
 	st_JsonRoot["code"] = 0;
@@ -650,7 +650,7 @@ BOOL CModuleProtocol_Packet::ModuleProtocol_Packet_TestReply(TCHAR* ptszMsgBuffe
 	Json::Value st_JsonObject;
 	Json::StreamWriterBuilder st_JsonBuilder;
 
-	st_JsonObject["xhToken"] = xhToken;
+	st_JsonObject["xhToken"] = (Json::Value::Int64)xhToken;
 
 	st_JsonRoot["code"] = 0;
 	st_JsonRoot["msg"] = "success";

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile

@@ -10,7 +10,7 @@ LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool
 LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = XEngine_Configure.o XEngine_Network.o XEngine_HTTPTask.o XEngine_PluginTask.o XEngine_HttpApp.o        \
-             HTTPTask_IDCard.o HTTPTask_Bank.o HTTPTask_Language.o HTTPTask_Translation.o HTTPTask_P2PClient.o HTTPTask_OPtions.o HTTPTask_Locker.o HTTPTask_PostCode.o HTTPTask_Log.o HTTPTask_QRCode.o
+             HTTPTask_IDCard.o HTTPTask_Bank.o HTTPTask_Language.o HTTPTask_Translation.o HTTPTask_P2PClient.o HTTPTask_OPtions.o HTTPTask_Locker.o HTTPTask_PostCode.o HTTPTask_Log.o HTTPTask_QRCode.o HTTPTask_SocketTest.o
 
 ifeq ($(shell uname),Darwin)
 	LOADSO = 
@@ -63,6 +63,8 @@ HTTPTask_Log.o:./XEngine_HTTPTask/HTTPTask_Log.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_Log.cpp
 HTTPTask_QRCode.o:./XEngine_HTTPTask/HTTPTask_QRCode.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_QRCode.cpp
+HTTPTask_SocketTest.o:./XEngine_HTTPTask/HTTPTask_SocketTest.cpp
+	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_SocketTest.cpp
 
 XEngine_HttpApp.o:./XEngine_HttpApp.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HttpApp.cpp   

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask/HTTPTask_SocketTest.cpp

@@ -11,7 +11,10 @@ void CALLBACK XEngine_HTTPTask_CBSocketTest(XNETHANDLE xhToken, LPCSTR lpszAddr,
 	{
 		//每次都报告
 		ModuleProtocol_Packet_TestReport(tszMsgBuffer, &nMsgLen, xhToken, lpszAddr, nPort, nNumber, nFailed, nSuccess, nStatus);
-		APIClient_Http_Request("POST", pSt_SocketTest->tszAPIUrl, tszMsgBuffer);
+		if (_tcslen(pSt_SocketTest->tszAPIUrl) > 0)
+		{
+			APIClient_Http_Request("POST", pSt_SocketTest->tszAPIUrl, tszMsgBuffer);
+		}
 	}
 	else if ((1 == pSt_SocketTest->nType) && (0 == nStatus))
 	{