fixed:PROPFIND sometime have no name field

xengine-qyt · xengine-qyt · commit f3546618aac4 · 2025-05-29T10:47:24.000+08:00
modify:PROPFIND reply contact modify time and size
diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp b/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp
@@ -486,5 +486,45 @@ bool CAPIHelp_Api::APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl)
 	// 添加字符串结束符
 	ptszKeyStr[nLen] = '\0';
 
+	return true;
+}
+/********************************************************************
+函数名称：APIHelp_Api_GetLastName
+函数功能：获取最后文件名
+ 参数.一：ptszLastName
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出获取到的文件名
+ 参数.二：lpszPathStr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要获取的字符串
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+bool CAPIHelp_Api::APIHelp_Api_GetLastName(XCHAR* ptszLastName, LPCXSTR lpszPathStr)
+{
+	APIHelp_IsErrorOccur = false;
+
+	xstring m_StrPath = lpszPathStr;
+	// 如果以斜杠结尾，去掉末尾的斜杠
+	if (!m_StrPath.empty() && m_StrPath.back() == '/')
+	{
+		m_StrPath.pop_back();
+	}
+	// 找到最后一个斜杠的位置
+	size_t nPos = m_StrPath.find_last_of('/');
+	if (nPos == std::string::npos)
+	{
+		_tcsxcpy(ptszLastName, m_StrPath.c_str());
+	}
+	else
+	{
+		_tcsxcpy(ptszLastName, m_StrPath.substr(nPos + 1).c_str());
+	}
 	return true;
 }
diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.h b/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.h
@@ -26,6 +26,7 @@ class CAPIHelp_Api
 	bool APIHelp_Api_Boundary(XCHAR*** ppptszList, int nListCount, XCHAR* ptszBoundStr);
 	bool APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIRSize);
 	bool APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl);
+	bool APIHelp_Api_GetLastName(XCHAR* ptszLastName, LPCXSTR lpszPathStr);
 protected:
 private:
 };
diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Define.h b/XEngine_Source/StorageModule_APIHelp/APIHelp_Define.h
@@ -371,6 +371,25 @@ extern "C" bool APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIRSiz
 备注：
 *********************************************************************/
 extern "C" bool APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl);
+/********************************************************************
+函数名称：APIHelp_Api_GetLastName
+函数功能：获取最后文件名
+ 参数.一：ptszLastName
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出获取到的文件名
+ 参数.二：lpszPathStr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要获取的字符串
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+extern "C" bool APIHelp_Api_GetLastName(XCHAR* ptszLastName, LPCXSTR lpszPathStr);
 /************************************************************************/
 /*                       加解密函数                                     */
 /************************************************************************/
diff --git a/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.def b/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.def
@@ -17,4 +17,5 @@ EXPORTS
 	APIHelp_Api_UrlParse
 	APIHelp_Api_Boundary
 	APIHelp_Api_GetDIRSize
-	APIHelp_Api_UrlStr
+	APIHelp_Api_UrlStr
+	APIHelp_Api_GetLastName
diff --git a/XEngine_Source/StorageModule_APIHelp/pch.cpp b/XEngine_Source/StorageModule_APIHelp/pch.cpp
@@ -92,6 +92,10 @@ extern "C" bool APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl)
 {
 	return m_APIHelp.APIHelp_Api_UrlStr(ptszKeyStr, lpszUrl);
 }
+extern "C" bool APIHelp_Api_GetLastName(XCHAR* ptszLastName, LPCXSTR lpszPathStr)
+{
+	return m_APIHelp.APIHelp_Api_GetLastName(ptszLastName, lpszPathStr);
+}
 /************************************************************************/
 /*                       加解密函数                                     */
 /************************************************************************/
diff --git a/XEngine_Source/StorageModule_Config/Config_Define.h b/XEngine_Source/StorageModule_Config/Config_Define.h
@@ -66,6 +66,7 @@ typedef struct tag_XEngine_ServerConfig
 	{
         bool bResumable;
         bool bUPHash;
+        bool bWDLocation;
         int nHashMode;
     }st_XStorage;
     struct  
diff --git a/XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp b/XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp
@@ -135,7 +135,7 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG
 	_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLUser, st_JsonXSql["SQLUser"].asCString());
 	_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLPass, st_JsonXSql["SQLPass"].asCString());
 
-	if (st_JsonRoot["XStorage"].empty() || (3 != st_JsonRoot["XStorage"].size()))
+	if (st_JsonRoot["XStorage"].empty() || (4 != st_JsonRoot["XStorage"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_XSTORAGE;
@@ -145,6 +145,7 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG
 	pSt_ServerConfig->st_XStorage.nHashMode = st_JsonXStorage["nHashMode"].asInt();
 	pSt_ServerConfig->st_XStorage.bUPHash = st_JsonXStorage["bUPHash"].asBool();
 	pSt_ServerConfig->st_XStorage.bResumable = st_JsonXStorage["bResumable"].asBool();
+	pSt_ServerConfig->st_XStorage.bWDLocation = st_JsonXStorage["bWDLocation"].asBool();
 
 	if (st_JsonRoot["XProxy"].empty() || (6 != st_JsonRoot["XProxy"].size()))
 	{
diff --git a/XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp b/XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp
@@ -733,21 +733,25 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_WDPropfind(XCHAR* ptszMsgBu
         pSt_XMLPropstat->InsertEndChild(pSt_XMLProp);
 		//属性名称
 		XMLElement* pSt_XMLPropName = m_XMLDocument.NewElement("d:displayname");
-        pSt_XMLPropName->SetText(tszFileName);
+		if (_tcsxlen(tszFileName) <= 0)
+		{
+			APIHelp_Api_GetLastName(tszFileName, (*ppptszListFile)[i]);
+		}
+		pSt_XMLPropName->SetText(tszFileName);
         pSt_XMLProp->InsertEndChild(pSt_XMLPropName);
 
+		XCHAR tszFileSize[128] = {};
+		_xstprintf(tszFileSize, _X("%llu"), st_FileAttr.nFileSize);
+		//属性大小
+		XMLElement* pSt_XMLLength = m_XMLDocument.NewElement("d:getcontentlength");
+		pSt_XMLLength->SetText(tszFileSize);
+		pSt_XMLProp->InsertEndChild(pSt_XMLLength);
+		//属性修改时间
+		XMLElement* pSt_XMLModifyTime = m_XMLDocument.NewElement("d:getlastmodified");
+		pSt_XMLModifyTime->SetText(tszGMTTime);
+		pSt_XMLProp->InsertEndChild(pSt_XMLModifyTime);
         if (st_FileAttr.bFile)
         {
-            XCHAR tszFileSize[128] = {};
-            _xstprintf(tszFileSize, _X("%llu"), st_FileAttr.nFileSize);
-			//属性大小
-			XMLElement* pSt_XMLLength = m_XMLDocument.NewElement("d:getcontentlength");
-            pSt_XMLLength->SetText(tszFileSize);
-			pSt_XMLProp->InsertEndChild(pSt_XMLLength);
-			//属性修改时间
-			XMLElement* pSt_XMLModifyTime = m_XMLDocument.NewElement("d:getlastmodified");
-			pSt_XMLModifyTime->SetText(tszGMTTime);
-			pSt_XMLProp->InsertEndChild(pSt_XMLModifyTime);
 			//增加会话属性
 			//获得会话
 			XENGINE_WEBDAVLOCK st_WDLocker = {};
diff --git a/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj b/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj
@@ -104,7 +104,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;../XEngine_Depend/XEngine_Module/tinyxml2;$(IncludePath)</IncludePath>
+    <IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;../XEngine_Depend/XEngine_Module/tinyxml2;..\StorageModule_Protocol;$(IncludePath)</IncludePath>
     <LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -119,7 +119,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;../XEngine_Depend/XEngine_Module/tinyxml2;$(IncludePath)</IncludePath>
+    <IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;../XEngine_Depend/XEngine_Module/tinyxml2;..\StorageModule_Protocol;$(IncludePath)</IncludePath>
     <LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
diff --git a/XEngine_Source/XEngine_Depend b/XEngine_Source/XEngine_Depend
@@ -1 +1 @@
-Subproject commit 75f8d6cd77f1cd82506fe07f674891f68caea372
+Subproject commit 78d2ea2cfcfa4701e122ee3e4ac536f712831f86
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp
@@ -120,14 +120,14 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 		}
 		else if (0 == _tcsxnicmp(lpszAPIManage, tszStrVlu, _tcsxlen(lpszAPIManage)))
 		{
-			//http://127.0.0.1:5100/api?function=pass&param=xxx
+			//http://127.0.0.1:5100/api?function=manage&param=xxx
 			memset(tszStrVlu, '\0', sizeof(tszStrVlu));
 			BaseLib_String_GetKeyValueA(pptszUrlList[1], "=", tszStrKey, tszStrVlu);
 			XEngine_Task_Manage(tszStrVlu, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam);
 		}
 		else if (0 == _tcsxnicmp(lpszAPIAction, tszStrVlu, _tcsxlen(lpszAPIAction)))
 		{
-			//http://127.0.0.1:5100/api?function=pass&param=xxx
+			//http://127.0.0.1:5100/api?function=action&param=xxx
 			memset(tszStrVlu, '\0', sizeof(tszStrVlu));
 			BaseLib_String_GetKeyValueA(pptszUrlList[1], "=", tszStrKey, tszStrVlu);
 			Storage_TaskAction(tszStrVlu, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam);
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Webdav.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_Webdav.cpp
@@ -60,7 +60,7 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 
 	st_HDRParam.bIsClose = false;
 	st_HDRParam.nHttpCode = 200;
-
+	//http://127.0.0.1:5103/storagekey1
 	if (0 == _tcsxnicmp(lpszMethodOption, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodOption)))
 	{
 		//用于心跳
@@ -162,39 +162,46 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 	}
 	else if (0 == _tcsxnicmp(lpszMethodPut, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPut)))
 	{
-		//使用重定向实现上传
-		st_HDRParam.bIsClose = false;
-		st_HDRParam.nHttpCode = 302;
+		if (st_ServiceCfg.st_XStorage.bWDLocation)
+		{
+			//使用重定向实现上传
+			st_HDRParam.bIsClose = false;
+			st_HDRParam.nHttpCode = 302;
 
-		XCHAR tszRequestAddr[1024] = {};
-		XCHAR tszHostStr[128] = {};
-		HttpProtocol_ServerHelp_GetField(&pptszListHdr, nHdrCount, _X("Host"), tszHostStr);
+			XCHAR tszRequestAddr[1024] = {};
+			XCHAR tszHostStr[128] = {};
+			HttpProtocol_ServerHelp_GetField(&pptszListHdr, nHdrCount, _X("Host"), tszHostStr);
 
-		XCHAR tszPortWebdav[64] = {};
-		XCHAR tszPortDownload[64] = {};
-		_xstprintf(tszPortWebdav, _X("%d"), st_ServiceCfg.nWebdavPort);
-		_xstprintf(tszPortDownload, _X("%d"), st_ServiceCfg.nStorageUPPort);
-		//转换端口
-		int nRLen = 0;
-		BaseLib_String_Replace(tszHostStr, &nRLen, tszPortWebdav, tszPortDownload, true);
-		//转换地址
-		XCHAR tszStroageKey[XPATH_MAX] = {};
-		XCHAR tszFileName[XPATH_MAX] = {};
+			XCHAR tszPortWebdav[64] = {};
+			XCHAR tszPortDownload[64] = {};
+			_xstprintf(tszPortWebdav, _X("%d"), st_ServiceCfg.nWebdavPort);
+			_xstprintf(tszPortDownload, _X("%d"), st_ServiceCfg.nStorageUPPort);
+			//转换端口
+			int nRLen = 0;
+			BaseLib_String_Replace(tszHostStr, &nRLen, tszPortWebdav, tszPortDownload, true);
+			//转换地址
+			XCHAR tszStroageKey[XPATH_MAX] = {};
+			XCHAR tszFileName[XPATH_MAX] = {};
 
-		int nRet = _stxscanf(pSt_HTTPParam->tszHttpUri + 1, _X("%99[^/]/%199[^\n]"), tszStroageKey, tszFileName);
-		if (2 != nRet)
-		{
-			st_HDRParam.nHttpCode = 413;
-			HttpProtocol_Server_SendMsgEx(xhWebdavHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+			int nRet = _stxscanf(pSt_HTTPParam->tszHttpUri + 1, _X("%99[^/]/%199[^\n]"), tszStroageKey, tszFileName);
+			if (2 != nRet)
+			{
+				st_HDRParam.nHttpCode = 413;
+				HttpProtocol_Server_SendMsgEx(xhWebdavHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+				XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPWEBDAV);
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBDAV客户端:%s,处理WEBDAV协议上传方法失败,文件请求路径不正确,URL:%s"), lpszClientAddr, pSt_HTTPParam->tszHttpUri);
+				return false;
+			}
+			_xstprintf(tszRequestAddr, _X("Location: http://%s/api?filename=%s&storeagekey=%s\r\n"), tszHostStr, tszFileName, tszStroageKey);
+
+			HttpProtocol_Server_SendMsgEx(xhWebdavHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszRequestAddr);
 			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPWEBDAV);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBDAV客户端:%s,处理WEBDAV协议上传方法失败,文件请求路径不正确,URL:%s"), lpszClientAddr, pSt_HTTPParam->tszHttpUri);
-			return false;
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("WEBDAV客户端:%s,请求文件上传被重定向到:%s"), lpszClientAddr, tszRequestAddr);
+		}
+		else
+		{
+			XEngine_Task_HttpUPLoader(lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
 		}
-		_xstprintf(tszRequestAddr, _X("Location: http://%s/api?filename=%s&storeagekey=%s\r\n"), tszHostStr, tszFileName, tszStroageKey);
-
-		HttpProtocol_Server_SendMsgEx(xhWebdavHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszRequestAddr);
-		XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPWEBDAV);
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("WEBDAV客户端:%s,请求文件上传被重定向到:%s"), lpszClientAddr, tszRequestAddr);
 	}
 	else if (0 == _tcsxnicmp(lpszMethodLock, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodLock)))
 	{

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,10 @@ extern "C" bool APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl)`
`92`	`92`	`{`
`93`	`93`	`return m_APIHelp.APIHelp_Api_UrlStr(ptszKeyStr, lpszUrl);`
`94`	`94`	`}`
	`95`	`+extern "C" bool APIHelp_Api_GetLastName(XCHAR* ptszLastName, LPCXSTR lpszPathStr)`
	`96`	`+{`
	`97`	`+ return m_APIHelp.APIHelp_Api_GetLastName(ptszLastName, lpszPathStr);`
	`98`	`+}`
`95`	`99`	`/************************************************************************/`
`96`	`100`	`/* 加解密函数 */`
`97`	`101`	`/************************************************************************/`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ typedef struct tag_XEngine_ServerConfig`
`66`	`66`	`{`
`67`	`67`	`bool bResumable;`
`68`	`68`	`bool bUPHash;`
	`69`	`+ bool bWDLocation;`
`69`	`70`	`int nHashMode;`
`70`	`71`	`}st_XStorage;`
`71`	`72`	`struct`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG`
`135`	`135`	`_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLUser, st_JsonXSql["SQLUser"].asCString());`
`136`	`136`	`_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLPass, st_JsonXSql["SQLPass"].asCString());`
`137`	`137`
`138`		`- if (st_JsonRoot["XStorage"].empty() \|\| (3 != st_JsonRoot["XStorage"].size()))`
	`138`	`+ if (st_JsonRoot["XStorage"].empty() \|\| (4 != st_JsonRoot["XStorage"].size()))`
`139`	`139`	`{`
`140`	`140`	`Config_IsErrorOccur = true;`
`141`	`141`	`Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_XSTORAGE;`
`@@ -145,6 +145,7 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG`
`145`	`145`	`pSt_ServerConfig->st_XStorage.nHashMode = st_JsonXStorage["nHashMode"].asInt();`
`146`	`146`	`pSt_ServerConfig->st_XStorage.bUPHash = st_JsonXStorage["bUPHash"].asBool();`
`147`	`147`	`pSt_ServerConfig->st_XStorage.bResumable = st_JsonXStorage["bResumable"].asBool();`
	`148`	`+ pSt_ServerConfig->st_XStorage.bWDLocation = st_JsonXStorage["bWDLocation"].asBool();`
`148`	`149`
`149`	`150`	`if (st_JsonRoot["XProxy"].empty() \|\| (6 != st_JsonRoot["XProxy"].size()))`
`150`	`151`	`{`