support upload proxy for completion notification

improve the close code after upload and download

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -47,8 +47,8 @@
     "XProxyPass": {
       "bUPGet": 1,
       "bDLGet": 1,
-      "tszUPPass": "http://192.168.1.9:5010/Api/Pass/upfile",
-      "tszDLPass": "http://192.168.1.9:5010/Api/Pass/dlfile"
+      "tszUPPass": "http://192.168.1.7:5200/Api/Pass/UPFile",
+      "tszDLPass": "http://192.168.1.7:5200/Api/Pass/UPFile"
     }
   },
   "XLimit": {

XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp

@@ -104,7 +104,7 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 
 	LPCTSTR lpszEvent = _T("Event");
 	LPCTSTR lpszQuery = _T("Query");
-	LPCTSTR lpszNotify = _T("Notify");
+	LPCTSTR lpszNotify = _T("Pass");
 
 	LPCTSTR lpszUPFile = _T("UPFile");
 	LPCTSTR lpszDLFile = _T("DLFile");
@@ -114,7 +114,27 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 	if (0 == _tcsnicmp(lpszNotify, tszAPIMethod, _tcslen(lpszNotify)))
 	{
 		//下载
-		if (0 == _tcsnicmp(lpszDLFile, tszAPIName, _tcslen(lpszDLFile)))
+		if (0 == _tcsnicmp(lpszUPFile, tszAPIName, _tcslen(lpszUPFile)))
+		{
+			__int64x nFileSize = 0;
+			TCHAR tszFileName[MAX_PATH];
+			TCHAR tszFileHash[MAX_PATH];
+			TCHAR tszClientAddr[128];
+
+			memset(tszFileName, '\0', MAX_PATH);
+			memset(tszFileHash, '\0', MAX_PATH);
+			memset(tszClientAddr, '\0', sizeof(tszClientAddr));
+
+			XStorageProtocol_Proxy_ParseNotify(lpszMsgBuffer, nMsgLen, tszClientAddr, tszFileName, tszFileHash, &nFileSize);
+
+			st_HDRParam.bIsClose = TRUE;
+			st_HDRParam.nHttpCode = 200;
+
+			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求的上传文件通知协议成功,文件:%s,大小:%lld"), lpszClientAddr, tszFileName, nFileSize);
+		}
+		else if (0 == _tcsnicmp(lpszDLFile, tszAPIName, _tcslen(lpszDLFile)))
 		{
 			__int64x nFileSize = 0;
 			TCHAR tszFileName[MAX_PATH];

XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp

@@ -174,10 +174,12 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 		st_HDRParam.st_Range.nPosEnd = nPosEnd;
 		st_HDRParam.st_Range.nPosCount = ullCount;
 		st_HDRParam.nHttpCode = 206;
+		st_HDRParam.bIsClose = FALSE;
 	}
 	else
 	{
 		st_HDRParam.nHttpCode = 200;
+		st_HDRParam.bIsClose = FALSE;
 	}
 	_tcscpy(st_HDRParam.tszMimeType, _T("bin"));
 	RfcComponents_HttpServer_SendMsgEx(xhDLHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, (int)ullSize);
@@ -188,6 +190,6 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 BOOL XEngine_Task_SendDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsgLen)
 {
 	XEngine_Net_SendMsg(lpszClientAddr, lpszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPDOWNLOAD);
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("下载客户端:%s,正在发送文件数据,大小:%d"), lpszClientAddr, nMsgLen);
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("下载客户端:%s,正在发送文件数据,大小:%d"), lpszClientAddr, nMsgLen);
 	return TRUE;
 }

XEngine_Source/XEngine_StorageApp/StorageApp_Network.cpp

@@ -118,15 +118,15 @@ BOOL XEngine_Net_SendMsg(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsg
 	if (STORAGE_NETTYPE_HTTPDOWNLOAD == nType)
 	{
 		bRet = NetCore_TCPXCore_SendEx(xhNetDownload, lpszClientAddr, lpszMsgBuffer, nMsgLen);
-		if (bRet)
+		if (bRet && st_ServiceCfg.st_XTime.bHBTime)
 		{
 			SocketOpt_HeartBeat_ActiveAddrEx(xhHBDownload, lpszClientAddr);
 		}
 	}
 	else if (STORAGE_NETTYPE_HTTPUPLOADER == nType)
 	{
 		bRet = NetCore_TCPXCore_SendEx(xhNetUPLoader, lpszClientAddr, lpszMsgBuffer, nMsgLen);
-		if (bRet)
+		if (bRet && st_ServiceCfg.st_XTime.bHBTime)
 		{
 			SocketOpt_HeartBeat_ActiveAddrEx(xhHBUPLoader, lpszClientAddr);
 		}

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

@@ -150,13 +150,15 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 					APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyPass.tszUPPass, tszProxyStr, &nHttpCode);
 					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_NOTICE, _T("上传客户端:%s,请求完成通知返回值:%d,文件:%s,地址:%s"), lpszClientAddr, nHttpCode, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.st_XProxyPass.tszUPPass);
 				}
+				st_HDRParam.bIsClose = FALSE;
 				st_HDRParam.nHttpCode = 200;
 				RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
 				XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
 				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("上传客户端:%s,请求上传文件成功,文件名:%s,大小:%d"), lpszClientAddr, tszFileDir, nRVCount);
 			}
 			else
 			{
+				st_HDRParam.bIsClose = FALSE;
 				st_HDRParam.nHttpCode = 403;
 				RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
 				XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
@@ -171,7 +173,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 	}
 	else
 	{
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("上传客户端:%s,请求上传文件中,文件名:%s,大小:%d"), lpszClientAddr, tszFileDir, nMsgLen);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("上传客户端:%s,请求上传文件中,文件名:%s,大小:%d"), lpszClientAddr, tszFileDir, nMsgLen);
 	}
 
 	return TRUE;