modify:match example for xengine v7.48

xengine-qyt · xengine-qyt · commit f35dc105a295 · 2023-02-08T13:15:16.000+08:00
diff --git a/XEngine_APPClient/APPClient_Download/APPClient_Download.cpp b/XEngine_APPClient/APPClient_Download/APPClient_Download.cpp
@@ -6,8 +6,7 @@
 #include <windows.h>
 #include <tchar.h>
 #pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib")
-#pragma comment(lib,"x86/XEngine_NetHelp/NetHelp_APIHelp")
-#pragma comment(lib,"x86/XEngine_DownLoad/XEngine_DownLoad")
+#pragma comment(lib,"x86/XEngine_NetHelp/NetHelp_APIClient")
 #pragma comment(lib,"x86/XEngine_SystemSdk/XEngine_SystemApi")
 #pragma comment(lib,"Ws2_32")
 #pragma comment(lib,"../../XEngine_Source/Debug/jsoncpp")
@@ -21,10 +20,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_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
-#include <XEngine_Include/XEngine_DownLoad/DownLoad_Define.h>
-#include <XEngine_Include/XEngine_DownLoad/DownLoad_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 #include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
@@ -33,8 +30,8 @@ using namespace std;
 
 //需要优先配置XEngine
 //WINDOWS使用VS2022 x86 debug 编译
-//linux::g++ -std=c++17 -Wall -g APPClient_Download.cpp -o APPClient_Download.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_DownLoad -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIHelp -lXEngine_Download -lXEngine_SystemApi -ljsoncpp
-//macos::g++ -std=c++17 -Wall -g APPClient_Download.cpp -o APPClient_Download.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIHelp -lXEngine_Download -lXEngine_SystemApi -ljsoncpp
+//linux::g++ -std=c++17 -Wall -g APPClient_Download.cpp -o APPClient_Download.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
+//macos::g++ -std=c++17 -Wall -g APPClient_Download.cpp -o APPClient_Download.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
 
 typedef struct 
 {
@@ -115,23 +112,24 @@ void P2PFile_Create(list<P2PFILE_INFO>* pStl_ListFile, LPCTSTR lpszFile)
 			nPos += nPiece;
 			_stprintf(tszRange, _T("%lld-%lld"), pSt_P2PFile[i].nPosStart, pSt_P2PFile[i].nPosEnd);
 		}
-		pSt_P2PFile[i].xhToken = DownLoad_Http_Create(tszDLUrl, lpszFile, tszRange, NULL, NULL, NULL);
+		pSt_P2PFile[i].xhToken = APIClient_File_Create(tszDLUrl, lpszFile, TRUE, tszRange);
 		if (NULL == pSt_P2PFile[i].xhToken)
 		{
-			printf("create download task is failed:%X\n", Download_GetLastError());
+			printf("create download task is failed:%X\n", APIClient_GetLastError());
 		}
+		APIClient_File_Start(pSt_P2PFile[i].xhToken);
 	}
 	//直到所有完成
 	while (1)
 	{
 		BOOL bComplete = TRUE;
 		for (unsigned int i = 0; i < pStl_ListFile->size(); i++)
 		{
-			NETDOWNLOAD_TASKINFO st_TaskInfo;
-			memset(&st_TaskInfo, '\0', sizeof(NETDOWNLOAD_TASKINFO));
+			NETHELP_FILEINFO st_TaskInfo;
+			memset(&st_TaskInfo, '\0', sizeof(NETHELP_FILEINFO));
 
-			DownLoad_Http_Query(pSt_P2PFile[i].xhToken, &st_TaskInfo);
-			if (ENUM_XENGINE_DOWNLOAD_STATUS_COMPLETE != st_TaskInfo.en_DownStatus)
+			APIClient_File_Query(pSt_P2PFile[i].xhToken, &st_TaskInfo);
+			if (ENUM_NETHELP_APICLIENT_FILE_STATUS_COMPLETE != st_TaskInfo.en_DownStatus)
 			{
 				bComplete = FALSE;
 			}
@@ -146,7 +144,7 @@ void P2PFile_Create(list<P2PFILE_INFO>* pStl_ListFile, LPCTSTR lpszFile)
 
 	for (unsigned int i = 0; i < pStl_ListFile->size(); i++)
 	{
-		DownLoad_Http_Delete(pSt_P2PFile[i].xhToken);
+		APIClient_File_Delete(pSt_P2PFile[i].xhToken);
 	}
 	delete[] pSt_P2PFile;
 	pSt_P2PFile = NULL;
@@ -172,7 +170,7 @@ int main()
 	//st_JsonRoot["lpszFileName"] = "qq.exe";
 	st_JsonRoot["lpszFileHash"] = "D41D8CD98F00B204E9801998ECF8427E";
 
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nHTTPCode, &ptszMsgBody, &nBodyLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nHTTPCode, &ptszMsgBody, &nBodyLen))
 	{
 		return -1;
 	}
diff --git a/XEngine_APPClient/APPClient_RestApi/APPClient_RestApi.cpp b/XEngine_APPClient/APPClient_RestApi/APPClient_RestApi.cpp
@@ -3,7 +3,7 @@
 #include <tchar.h>
 #pragma comment(lib,"../../XEngine_Source/Debug/jsoncpp")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
 #pragma comment(lib,"Ws2_32")
 #endif
 #include <stdio.h>
@@ -16,15 +16,15 @@
 #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_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 using namespace std;
 
-//g++ -std=c++17 -Wall -g APPClient_RestApi.cpp -o APPClient_RestApi.exe -L ../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_BaseLib -L ../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIHelp -ljsoncpp -Wl,-rpath=../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_BaseLib:../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_NetHelp,--disable-new-dtags
+//g++ -std=c++17 -Wall -g APPClient_RestApi.cpp -o APPClient_RestApi.exe -L ../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_BaseLib -L ../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_NetHelp -lXEngine_BaseLib -lNetHelp_APIClient -ljsoncpp -Wl,-rpath=../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_BaseLib:../../../XEngine/XEngine_Release/XEngine_Linux/Ubuntu/XEngine_NetHelp,--disable-new-dtags
 //需要优先配置XEngine
 //WINDOWS使用VS2022 x86 debug 编译
 //linux使用下面的命令编译
-//g++ -std=c++17 -Wall -g APPClient_RestApi.cpp -o APPClient_RestApi.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIHelp -ljsoncpp
+//g++ -std=c++17 -Wall -g APPClient_RestApi.cpp -o APPClient_RestApi.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -ljsoncpp
 
 //查询
 void API_Manage_Query()
@@ -38,9 +38,9 @@ void API_Manage_Query()
 	st_JsonRoot["lpszTimeEnd"];
 	st_JsonRoot["lpszBuckKey"] = "storagekey2";
 
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
 	{
-		printf("API_Manage_Query:%lX\n", APIHelp_GetLastError());
+		printf("API_Manage_Query:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("API_Manage_Query:%d,%s\n", nCode, ptszMsgBuffer);
@@ -66,9 +66,9 @@ void API_Manage_Insert()
 	st_JsonRoot["List"] = st_JsonArray;
 	st_JsonRoot["Count"] = 1;
 
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
 	{
-		printf("API_Manage_Insert:%lX\n", APIHelp_GetLastError());
+		printf("API_Manage_Insert:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("API_Manage_Insert:%d,%s\n", nCode, ptszMsgBuffer);
@@ -91,9 +91,9 @@ void API_Manage_Delete()
 	st_JsonRoot["List"] = st_JsonArray;
 	st_JsonRoot["Count"] = 1;
 
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
 	{
-		printf("API_Manage_Delete:%lX\n", APIHelp_GetLastError());
+		printf("API_Manage_Delete:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("API_Manage_Delete:%d,%s\n", nCode, ptszMsgBuffer);
@@ -111,9 +111,9 @@ void API_Manage_Dir()
 	st_JsonRoot["lpszBuckKey"] = "storagekey1";
 	st_JsonRoot["lpszUserDir"] = "user";
 	st_JsonRoot["nOPerator"] = 1;
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
 	{
-		printf("API_Manage_Dir:%lX\n", APIHelp_GetLastError());
+		printf("API_Manage_Dir:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("API_Manage_Dir:%d,%s\n", nCode, ptszMsgBuffer);
@@ -123,9 +123,9 @@ void API_Manage_Dir()
 	st_JsonRoot["lpszBuckKey"] = "storagekey1";
 	st_JsonRoot["lpszUserDir"];
 	st_JsonRoot["nOPerator"] = 0;
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
 	{
-		printf("API_Manage_Dir:%lX\n", APIHelp_GetLastError());
+		printf("API_Manage_Dir:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("API_Manage_Dir:%d,%s\n", nCode, ptszMsgBuffer);
@@ -135,9 +135,9 @@ void API_Manage_Dir()
 	st_JsonRoot["lpszBuckKey"] = "storagekey1";
 	st_JsonRoot["lpszUserDir"] = "user";
 	st_JsonRoot["nOPerator"] = 2;
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))
 	{
-		printf("API_Manage_Dir:%lX\n", APIHelp_GetLastError());
+		printf("API_Manage_Dir:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("API_Manage_Dir:%d,%s\n", nCode, ptszMsgBuffer);
@@ -150,9 +150,9 @@ void API_Manage_Task()
 	int nLen = 0;
 	int nCode = 0;
 	TCHAR* ptszMsgBuffer = NULL;
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, NULL, &nCode, &ptszMsgBuffer, &nLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, NULL, &nCode, &ptszMsgBuffer, &nLen))
 	{
-		printf("API_Manage_Task:%lX\n", APIHelp_GetLastError());
+		printf("API_Manage_Task:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("API_Manage_Task:%d,%s\n", nCode, ptszMsgBuffer);
diff --git a/XEngine_APPClient/APPClient_UPDate/APPClient_UPFile/APPClient_UPFile.cpp b/XEngine_APPClient/APPClient_UPDate/APPClient_UPFile/APPClient_UPFile.cpp
@@ -13,9 +13,9 @@ int main(int argc, char** argv)
 	TCHAR* ptszMsgBuffer = NULL;
 	int nMsgLen = 0;
 
-	if (!APIHelp_HttpRequest_Custom(_T("GET"), lpszDownload, NULL, NULL, &ptszMsgBuffer, &nMsgLen))
+	if (!APIClient_Http_Request(_T("GET"), lpszDownload, NULL, NULL, &ptszMsgBuffer, &nMsgLen))
 	{
-		printf("APIHelp_HttpRequest_Custom:%lX\n", APIHelp_GetLastError());
+		printf("APIHelp_HttpRequest_Custom:%lX\n", APIClient_GetLastError());
 		return 0;
 	}
 	string m_StrDes;
@@ -72,26 +72,27 @@ int main(int argc, char** argv)
 	for (; stl_ListIterator != stl_ListUPDate.end(); stl_ListIterator++)
 	{
 		TCHAR tszPathFile[1024];
-		NETDOWNLOAD_TASKINFO st_TaskInfo;
+		NETHELP_FILEINFO st_TaskInfo;
 
 		memset(tszPathFile, '\0', sizeof(tszPathFile));
-		memset(&st_TaskInfo, '\0', sizeof(NETDOWNLOAD_TASKINFO));
+		memset(&st_TaskInfo, '\0', sizeof(NETHELP_FILEINFO));
 
 		_stprintf_s(tszPathFile, _T("%s%s"), stl_ListIterator->tszModulePath, stl_ListIterator->tszModuleName);
 		_tremove(tszPathFile);
-		XHANDLE xhDown = DownLoad_Http_Create(stl_ListIterator->tszModuleDownload, tszPathFile);
+		XHANDLE xhDown = APIClient_File_Create(stl_ListIterator->tszModuleDownload, tszPathFile);
+		APIClient_File_Start(xhDown);
 		while (TRUE)
 		{
-			if (!DownLoad_Http_Query(xhDown, &st_TaskInfo))
+			if (!APIClient_File_Query(xhDown, &st_TaskInfo))
 			{
 				break;
 			}
-			if (ENUM_XENGINE_DOWNLOAD_STATUS_DOWNLOADDING != st_TaskInfo.en_DownStatus)
+			if (ENUM_NETHELP_APICLIENT_FILE_STATUS_DOWNLOADDING != st_TaskInfo.en_DownStatus)
 			{
 				break;
 			}
 		}
-		DownLoad_Http_Delete(xhDown);
+		APIClient_File_Delete(xhDown);
 	}
 
 	if (!HelpModule_Api_Copy(&stl_ListUPDate))
diff --git a/XEngine_APPClient/APPClient_UPDate/APPClient_UPFile/APPClient_UPHdr.h b/XEngine_APPClient/APPClient_UPDate/APPClient_UPFile/APPClient_UPHdr.h
@@ -4,8 +4,7 @@
 #pragma comment(lib,"Ws2_32.lib")
 #pragma comment(lib,"../../../XEngine_Source/Debug/jsoncpp")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp.lib")
-#pragma comment(lib,"XEngine_DownLoad/XEngine_DownLoad.lib")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient.lib")
 #pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib")
 #endif
 #include <stdio.h>
@@ -21,10 +20,8 @@ using namespace std;
 #include <XEngine_Include/XEngine_Types.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
-#include <XEngine_Include/XEngine_DownLoad/DownLoad_Define.h>
-#include <XEngine_Include/XEngine_DownLoad/DownLoad_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 #include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
diff --git a/XEngine_APPClient/APPClient_UPDate/APPClient_UPMaker/APPClient_UPMaker.cpp b/XEngine_APPClient/APPClient_UPDate/APPClient_UPMaker/APPClient_UPMaker.cpp
@@ -6,7 +6,7 @@
 #pragma comment(lib,"../../../XEngine_Source/Debug/jsoncpp")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
 #pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp.lib")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient.lib")
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,8 +24,8 @@ using namespace std;
 #include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 
 typedef struct 
 {
@@ -203,7 +203,7 @@ int main(int argc, char** argv)
 	}
 	SystemApi_File_SaveBuffToFile(lpszLocalFile, ptszLocalBuffer, nLocalLen);
 	//如果服务器支持,可以直接把更新数据提交到服务器
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszPostFile, ptszRemoteBuffer, NULL, NULL, &nRemoteLen))
+	if (!APIClient_Http_Request(_T("POST"), lpszPostFile, ptszRemoteBuffer, NULL, NULL, &nRemoteLen))
 	{
 		printf("erron\n");
 	}
diff --git a/XEngine_APPClient/APPClient_UPDownload/APPClient_UPDownload.cpp b/XEngine_APPClient/APPClient_UPDownload/APPClient_UPDownload.cpp
@@ -3,7 +3,7 @@
 #include <tchar.h>
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
 #pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
 #pragma comment(lib,"Ws2_32")
 #pragma comment(lib,"../../XEngine_Source/Debug/jsoncpp")
 #else
@@ -20,14 +20,14 @@
 #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_NetHelp/APIHelp_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 using namespace std;
 
 //需要优先配置XEngine
 //WINDOWS使用VS2022 x86 debug 编译
-//linux::g++ -std=c++17 -Wall -g APPClient_UPDownload.cpp -o APPClient_UPDownload.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIHelp -ljsoncpp
-//macos::g++ -std=c++17 -Wall -g APPClient_UPDownload.cpp -o APPClient_UPDownload.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIHelp -ljsoncpp
+//linux::g++ -std=c++17 -Wall -g APPClient_UPDownload.cpp -o APPClient_UPDownload.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIClient -ljsoncpp
+//macos::g++ -std=c++17 -Wall -g APPClient_UPDownload.cpp -o APPClient_UPDownload.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXEngine_OPenSsl -lNetHelp_APIClient -ljsoncpp
 
 //上传文件
 void File_UPLoad()
@@ -48,9 +48,9 @@ void File_UPLoad()
 	OPenSsl_Help_BasicEncoder("123123aa", "123123", tszBaseBuffer);
 
 	_stprintf(tszHdrBuffer, _T("Range: bytes=0-5/10\r\nAuthorization: %s\r\n"), tszBaseBuffer);
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, lpszMsgBuffer, &nCode, &ptszMsgBuffer, &nLen, tszHdrBuffer))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, lpszMsgBuffer, &nCode, &ptszMsgBuffer, &nLen, tszHdrBuffer))
 	{
-		printf("upload failed:%lX\n", APIHelp_GetLastError());
+		printf("upload failed:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	JSONCPP_STRING st_JsonError;
@@ -69,9 +69,9 @@ void File_UPLoad()
 	nLen = 0;
 	memset(tszHdrBuffer, '\0', MAX_PATH);
 	_stprintf(tszHdrBuffer, _T("Range: bytes=5-9/10\r\nAuthorization: %s\r\nStorageKey: %s\r\n"), tszBaseBuffer, tszKeyBuffer);
-	if (!APIHelp_HttpRequest_Custom(_T("POST"), lpszUrl, lpszMsgBuffer2, &nCode, &ptszMsgBuffer, &nLen, tszHdrBuffer))
+	if (!APIClient_Http_Request(_T("POST"), lpszUrl, lpszMsgBuffer2, &nCode, &ptszMsgBuffer, &nLen, tszHdrBuffer))
 	{
-		printf("upload failed:%lX\n", APIHelp_GetLastError());
+		printf("upload failed:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("upload:%d\n%s\n", nCode, ptszMsgBuffer);
@@ -92,19 +92,19 @@ void File_Download()
 	OPenSsl_Help_BasicEncoder("123123aa", "123123", tszBaseBuffer);
 
 	_stprintf(tszHdrBuffer, _T("Range: bytes=0-5\r\nAuthorization: %s\r\n"), tszBaseBuffer);
-	if (!APIHelp_HttpRequest_Custom(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen, tszHdrBuffer))
+	if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen, tszHdrBuffer))
 	{
-		printf("download failed:%lX\n", APIHelp_GetLastError());
+		printf("download failed:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("download:%d,%s\n", nLen, ptszMsgBuffer);
 	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 
 	memset(tszHdrBuffer, '\0', MAX_PATH);
 	_stprintf(tszHdrBuffer, _T("Range: bytes=5-10\r\nAuthorization: %s\r\n"), tszBaseBuffer);
-	if (!APIHelp_HttpRequest_Custom(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen, tszHdrBuffer))
+	if (!APIClient_Http_Request(_T("GET"), lpszUrl, NULL, NULL, &ptszMsgBuffer, &nLen, tszHdrBuffer))
 	{
-		printf("download failed:%lX\n", APIHelp_GetLastError());
+		printf("download failed:%lX\n", APIClient_GetLastError());
 		return;
 	}
 	printf("download:%d,%s\n", nLen, ptszMsgBuffer);
diff --git a/XEngine_APPClient/VSCopy_x86.bat b/XEngine_APPClient/VSCopy_x86.bat

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ int main(int argc, char** argv)`
`13`	`13`	`TCHAR* ptszMsgBuffer = NULL;`
`14`	`14`	`int nMsgLen = 0;`
`15`	`15`
`16`		`- if (!APIHelp_HttpRequest_Custom(_T("GET"), lpszDownload, NULL, NULL, &ptszMsgBuffer, &nMsgLen))`
	`16`	`+ if (!APIClient_Http_Request(_T("GET"), lpszDownload, NULL, NULL, &ptszMsgBuffer, &nMsgLen))`
`17`	`17`	`{`
`18`		`- printf("APIHelp_HttpRequest_Custom:%lX\n", APIHelp_GetLastError());`
	`18`	`+ printf("APIHelp_HttpRequest_Custom:%lX\n", APIClient_GetLastError());`
`19`	`19`	`return 0;`
`20`	`20`	`}`
`21`	`21`	`string m_StrDes;`
`@@ -72,26 +72,27 @@ int main(int argc, char** argv)`
`72`	`72`	`for (; stl_ListIterator != stl_ListUPDate.end(); stl_ListIterator++)`
`73`	`73`	`{`
`74`	`74`	`TCHAR tszPathFile[1024];`
`75`		`- NETDOWNLOAD_TASKINFO st_TaskInfo;`
	`75`	`+ NETHELP_FILEINFO st_TaskInfo;`
`76`	`76`
`77`	`77`	`memset(tszPathFile, '\0', sizeof(tszPathFile));`
`78`		`- memset(&st_TaskInfo, '\0', sizeof(NETDOWNLOAD_TASKINFO));`
	`78`	`+ memset(&st_TaskInfo, '\0', sizeof(NETHELP_FILEINFO));`
`79`	`79`
`80`	`80`	`_stprintf_s(tszPathFile, _T("%s%s"), stl_ListIterator->tszModulePath, stl_ListIterator->tszModuleName);`
`81`	`81`	`_tremove(tszPathFile);`
`82`		`- XHANDLE xhDown = DownLoad_Http_Create(stl_ListIterator->tszModuleDownload, tszPathFile);`
	`82`	`+ XHANDLE xhDown = APIClient_File_Create(stl_ListIterator->tszModuleDownload, tszPathFile);`
	`83`	`+ APIClient_File_Start(xhDown);`
`83`	`84`	`while (TRUE)`
`84`	`85`	`{`
`85`		`- if (!DownLoad_Http_Query(xhDown, &st_TaskInfo))`
	`86`	`+ if (!APIClient_File_Query(xhDown, &st_TaskInfo))`
`86`	`87`	`{`
`87`	`88`	`break;`
`88`	`89`	`}`
`89`		`- if (ENUM_XENGINE_DOWNLOAD_STATUS_DOWNLOADDING != st_TaskInfo.en_DownStatus)`
	`90`	`+ if (ENUM_NETHELP_APICLIENT_FILE_STATUS_DOWNLOADDING != st_TaskInfo.en_DownStatus)`
`90`	`91`	`{`
`91`	`92`	`break;`
`92`	`93`	`}`
`93`	`94`	`}`
`94`		`- DownLoad_Http_Delete(xhDown);`
	`95`	`+ APIClient_File_Delete(xhDown);`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`if (!HelpModule_Api_Copy(&stl_ListUPDate))`