fix:complie warnning message...

xengine-qyt · xengine-qyt · commit 332b62369d3c · 2021-06-28T11:26:12.000+08:00
distributed:
    Supported completion notification of other servers
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp
@@ -77,8 +77,8 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 	//使用重定向?
 	if ((3 == st_ServiceCfg.st_XStorage.nUseMode) || (4 == st_ServiceCfg.st_XStorage.nUseMode))
 	{
-		TCHAR tszHdrBuffer[MAX_PATH];
-		memset(tszHdrBuffer, '\0', MAX_PATH);
+		TCHAR tszHdrBuffer[1024];
+		memset(tszHdrBuffer, '\0', sizeof(tszHdrBuffer));
 
 		st_HDRParam.bIsClose = TRUE;
 		st_HDRParam.nHttpCode = 302;
@@ -103,13 +103,44 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 	}
 
 	LPCTSTR lpszEvent = _T("Event");
-	LPCTSTR lpszQuery = _T("query");
-	LPCTSTR lpszEventUPFile = _T("UPFile");
-	LPCTSTR lpszQueryFile = _T("file");
-	if (0 == _tcsnicmp(lpszQuery, tszAPIMethod, _tcslen(lpszQuery)))
+	LPCTSTR lpszQuery = _T("Query");
+	LPCTSTR lpszNotify = _T("Notify");
+
+	LPCTSTR lpszUPFile = _T("UPFile");
+	LPCTSTR lpszDLFile = _T("DLFile");
+	LPCTSTR lpszFile = _T("File");
+
+	//通知类型.用于多服务器
+	if (0 == _tcsnicmp(lpszNotify, tszAPIMethod, _tcslen(lpszNotify)))
+	{
+		//下载
+		if (0 == _tcsnicmp(lpszDLFile, tszAPIName, _tcslen(lpszDLFile)))
+		{
+			__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(lpszQuery, tszAPIMethod, _tcslen(lpszQuery)))
 	{
-		if (0 == _tcsnicmp(lpszQueryFile, tszAPIName, _tcslen(lpszQueryFile)))
+		//文件查询类型
+		if (0 == _tcsnicmp(lpszFile, tszAPIName, _tcslen(lpszFile)))
 		{
+			//查询文件列表
 			int nMsgLen = 10240;
 			TCHAR tszFileName[MAX_PATH];
 			TCHAR tszFileHash[MAX_PATH];
@@ -140,7 +171,8 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 	}
 	else if (0 == _tcsnicmp(lpszEvent, tszAPIMethod, _tcslen(lpszEvent)))
 	{
-		if (0 == _tcsnicmp(lpszEventUPFile, tszAPIName, _tcslen(lpszEventUPFile)))
+		//事件处理类型,上传事件,用于NGINX
+		if (0 == _tcsnicmp(lpszUPFile, tszAPIName, _tcslen(lpszUPFile)))
 		{
 			LPCTSTR lpszContentType = _T("Content-Type");
 			LPCTSTR lpszBoundaryStr = _T("boundary=");
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp
@@ -127,8 +127,8 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 	//使用重定向?
 	if ((1 == st_ServiceCfg.st_XStorage.nUseMode) || (4 == st_ServiceCfg.st_XStorage.nUseMode))
 	{
-		TCHAR tszHdrBuffer[MAX_PATH];
-		memset(tszHdrBuffer, '\0', MAX_PATH);
+		TCHAR tszHdrBuffer[1024];
+		memset(tszHdrBuffer, '\0', sizeof(tszHdrBuffer));
 
 		st_HDRParam.bIsClose = TRUE;
 		st_HDRParam.nHttpCode = 302;
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp
@@ -73,8 +73,8 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 	//使用重定向?
 	if ((2 == st_ServiceCfg.st_XStorage.nUseMode) || (4 == st_ServiceCfg.st_XStorage.nUseMode))
 	{
-		TCHAR tszHdrBuffer[MAX_PATH];
-		memset(tszHdrBuffer, '\0', MAX_PATH);
+		TCHAR tszHdrBuffer[1024];
+		memset(tszHdrBuffer, '\0', sizeof(tszHdrBuffer));
 
 		st_HDRParam.bIsClose = TRUE;
 		st_HDRParam.nHttpCode = 302;
diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Define.h b/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Define.h
@@ -95,6 +95,45 @@ extern "C" BOOL XStorageProtocol_Proxy_PacketBasicAuth(LPCTSTR lpszPostUrl, LPCT
 备注：
 *********************************************************************/
 extern "C" BOOL XStorageProtocol_Proxy_PacketUPDown(LPCTSTR lpszFileName, LPCTSTR lpszClientAddr, __int64x nFileSize, TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileHash = NULL);
+/********************************************************************
+函数名称：XStorageProtocol_Proxy_ParseUPDown
+函数功能：解析上传下载通知协议
+ 参数.一：lpszMsgBuffer
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要解析的内容
+ 参数.二：nMsgLen
+  In/Out：In
+  类型：整数型
+  可空：N
+  意思：输入要解析的大小
+ 参数.三：ptszClientAddr
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出文件客户端地址
+ 参数.四：ptszFileName
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出文件名称
+ 参数.五：ptszFileHash
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出文件HASH
+ 参数.六：pInt_FileSize
+  In/Out：Out
+  类型：整数型
+  可空：N
+  意思：输出文件大小
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+extern "C" BOOL XStorageProtocol_Proxy_ParseNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize);
 /************************************************************************/
 /*                      客户端协议操作导出函数                          */
 /************************************************************************/
diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Error.h b/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Error.h
@@ -11,9 +11,10 @@
 //	History:
 *********************************************************************/
 //////////////////////////////////////////////////////////////////////////
-//                        导出的公用协议错误
+//                        导出的协议错误
 //////////////////////////////////////////////////////////////////////////
-#define ERROR_XENGINE_XSTROGE_PROTOCOL_COMM_PARAMENT 0x130C0000
+#define ERROR_XENGINE_XSTROGE_PROTOCOL_PARAMENT 0x130C0000
+#define ERROR_XENGINE_XSTROGE_PROTOCOL_PARSE 0x130C0001
 //////////////////////////////////////////////////////////////////////////
 //                        导出的客户端协议错误
 //////////////////////////////////////////////////////////////////////////
diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Proxy/XStorageProtocol_Proxy.cpp b/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Proxy/XStorageProtocol_Proxy.cpp
@@ -67,7 +67,7 @@ BOOL CXStorageProtocol_Proxy::XStorageProtocol_Proxy_PacketBasicAuth(LPCTSTR lps
     if ((NULL == lpszUser) || (NULL == lpszPass))
     {
         XStorage_IsErrorOccur = TRUE;
-        XStorage_dwErrorCode = ERROR_XENGINE_XSTROGE_PROTOCOL_COMM_PARAMENT;
+        XStorage_dwErrorCode = ERROR_XENGINE_XSTROGE_PROTOCOL_PARAMENT;
         return FALSE;
     }
     Json::Value st_JsonRoot;
@@ -126,7 +126,7 @@ BOOL CXStorageProtocol_Proxy::XStorageProtocol_Proxy_PacketUPDown(LPCTSTR lpszFi
 	if ((NULL == lpszFileName) || (NULL == lpszClientAddr))
 	{
 		XStorage_IsErrorOccur = TRUE;
-		XStorage_dwErrorCode = ERROR_XENGINE_XSTROGE_PROTOCOL_COMM_PARAMENT;
+		XStorage_dwErrorCode = ERROR_XENGINE_XSTROGE_PROTOCOL_PARAMENT;
 		return FALSE;
 	}
 	Json::Value st_JsonRoot;
@@ -138,5 +138,75 @@ BOOL CXStorageProtocol_Proxy::XStorageProtocol_Proxy_PacketUPDown(LPCTSTR lpszFi
 
 	*pInt_MsgLen = st_JsonRoot.toStyledString().length();
 	_tcscpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str());
+	return TRUE;
+}
+/********************************************************************
+函数名称：XStorageProtocol_Proxy_ParseUPDown
+函数功能：解析上传下载通知协议
+ 参数.一：lpszMsgBuffer
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要解析的内容
+ 参数.二：nMsgLen
+  In/Out：In
+  类型：整数型
+  可空：N
+  意思：输入要解析的大小
+ 参数.三：ptszClientAddr
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出文件客户端地址
+ 参数.四：ptszFileName
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出文件名称
+ 参数.五：ptszFileHash
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出文件HASH
+ 参数.六：pInt_FileSize
+  In/Out：Out
+  类型：整数型
+  可空：N
+  意思：输出文件大小
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+BOOL CXStorageProtocol_Proxy::XStorageProtocol_Proxy_ParseNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize)
+{
+	XStorage_IsErrorOccur = FALSE;
+
+	if ((NULL == lpszMsgBuffer) || (NULL == ptszClientAddr))
+	{
+		XStorage_IsErrorOccur = TRUE;
+		XStorage_dwErrorCode = ERROR_XENGINE_XSTROGE_PROTOCOL_PARAMENT;
+		return FALSE;
+	}
+	Json::Value st_JsonRoot;
+	Json::CharReaderBuilder st_JsonBuild;
+	Json::CharReader* pSt_JsonReader(st_JsonBuild.newCharReader());
+
+	JSONCPP_STRING st_JsonError;
+	//解析JSON
+	if (!pSt_JsonReader->parse(lpszMsgBuffer, lpszMsgBuffer + _tcslen(lpszMsgBuffer), &st_JsonRoot, &st_JsonError))
+	{
+		XStorage_IsErrorOccur = TRUE;
+		XStorage_dwErrorCode = ERROR_XENGINE_XSTROGE_PROTOCOL_PARSE;
+		return FALSE;
+	}
+	delete pSt_JsonReader;
+	pSt_JsonReader = NULL;
+
+	_tcscpy(ptszClientAddr, st_JsonRoot["lpszClientAddr"].asCString());
+	_tcscpy(ptszFileName, st_JsonRoot["lpszFileName"].asCString());
+	_tcscpy(ptszFileHash, st_JsonRoot["lpszFileHash"].asCString());
+	*pInt_FileSize = st_JsonRoot["nFileSize"].asInt64();
+
 	return TRUE;
 }
diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Proxy/XStorageProtocol_Proxy.h b/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Proxy/XStorageProtocol_Proxy.h
@@ -19,6 +19,7 @@ class CXStorageProtocol_Proxy
 public:
     BOOL XStorageProtocol_Proxy_PacketBasicAuth(LPCTSTR lpszPostUrl, LPCTSTR lpszClientAddr, LPCTSTR lpszUser, LPCTSTR lpszPass, TCHAR* ptszMsgBuffer, int* pInt_MsgLen);
     BOOL XStorageProtocol_Proxy_PacketUPDown(LPCTSTR lpszFileName, LPCTSTR lpszClientAddr, __int64x nFileSize, TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileHash = NULL);
+    BOOL XStorageProtocol_Proxy_ParseNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize);
 protected:
 private:
 };
diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/pch.cpp b/XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/pch.cpp
@@ -41,6 +41,10 @@ extern "C" BOOL XStorageProtocol_Proxy_PacketUPDown(LPCTSTR lpszFileName, LPCTST
 {
 	return m_ProtocolProxy.XStorageProtocol_Proxy_PacketUPDown(lpszFileName, lpszClientAddr, nFileSize, ptszMsgBuffer, pInt_MsgLen, lpszFileHash);
 }
+extern "C" BOOL XStorageProtocol_Proxy_ParseNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR * ptszClientAddr, TCHAR * ptszFileName, TCHAR * ptszFileHash, __int64x * pInt_FileSize)
+{
+	return m_ProtocolProxy.XStorageProtocol_Proxy_ParseNotify(lpszMsgBuffer, nMsgLen, ptszClientAddr, ptszFileName, ptszFileHash, pInt_FileSize);
+}
 /************************************************************************/
 /*                      客户端协议操作导出函数                          */
 /************************************************************************/

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,10 @@ extern "C" BOOL XStorageProtocol_Proxy_PacketUPDown(LPCTSTR lpszFileName, LPCTST`
`41`	`41`	`{`
`42`	`42`	`return m_ProtocolProxy.XStorageProtocol_Proxy_PacketUPDown(lpszFileName, lpszClientAddr, nFileSize, ptszMsgBuffer, pInt_MsgLen, lpszFileHash);`
`43`	`43`	`}`
	`44`	`+extern "C" BOOL XStorageProtocol_Proxy_ParseNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR * ptszClientAddr, TCHAR * ptszFileName, TCHAR * ptszFileHash, __int64x * pInt_FileSize)`
	`45`	`+{`
	`46`	`+ return m_ProtocolProxy.XStorageProtocol_Proxy_ParseNotify(lpszMsgBuffer, nMsgLen, ptszClientAddr, ptszFileName, ptszFileHash, pInt_FileSize);`
	`47`	`+}`
`44`	`48`	`/************************************************************************/`
`45`	`49`	`/* 客户端协议操作导出函数 */`
`46`	`50`	`/************************************************************************/`