modify:propfind add lock info

Author: xengine-qyt

XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp

@@ -629,6 +629,64 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_WDPropfind(XCHAR* ptszMsgBu
 			XMLElement* pSt_XMLModifyTime = m_XMLDocument.NewElement("d:getlastmodified");
 			pSt_XMLModifyTime->SetText(tszGMTTime);
 			pSt_XMLProp->InsertEndChild(pSt_XMLModifyTime);
+			//增加会话属性
+			//获得会话
+			XENGINE_WEBDAVLOCK st_WDLocker = {};
+			if (Session_Webdav_Get(tszFileAlis, &st_WDLocker))
+			{
+				// 子元素 <lockdiscovery>
+				XMLElement* pSt_XMLLockDiscovery = m_XMLDocument.NewElement("D:lockdiscovery");
+				pSt_XMLProp->InsertEndChild(pSt_XMLLockDiscovery);
+				// 子元素 <activelock>
+				XMLElement* pSt_XMLLockActive = m_XMLDocument.NewElement("D:activelock");
+				pSt_XMLLockDiscovery->InsertEndChild(pSt_XMLLockActive);
+				// 子元素 <locktype>
+				XMLElement* pSt_XMLLockType = m_XMLDocument.NewElement("D:locktype");
+				pSt_XMLLockActive->InsertEndChild(pSt_XMLLockType);
+				if (1 == st_WDLocker.byLockOP)
+				{
+					XMLElement* pSt_XMLLockWrite = m_XMLDocument.NewElement("D:write");
+					pSt_XMLLockType->InsertEndChild(pSt_XMLLockWrite);
+				}
+				else if (2 == st_WDLocker.byLockOP)
+				{
+					XMLElement* pSt_XMLLockRead = m_XMLDocument.NewElement("D:read");
+					pSt_XMLLockType->InsertEndChild(pSt_XMLLockRead);
+				}
+				// 子元素 <lockscope>
+				XMLElement* pSt_XMLLockScope = m_XMLDocument.NewElement("D:lockscope");
+				pSt_XMLLockActive->InsertEndChild(pSt_XMLLockScope);
+				if (1 == st_WDLocker.byLockType)
+				{
+					XMLElement* pSt_XMLLockExclusive = m_XMLDocument.NewElement("D:exclusive");
+					pSt_XMLLockScope->InsertEndChild(pSt_XMLLockExclusive);
+				}
+				else if (2 == st_WDLocker.byLockType)
+				{
+					XMLElement* pSt_XMLLockShared = m_XMLDocument.NewElement("D:shared");
+					pSt_XMLLockScope->InsertEndChild(pSt_XMLLockShared);
+				}
+				// 子元素 <depth>
+				XMLElement* pSt_XMLDepth = m_XMLDocument.NewElement("D:depth");
+				pSt_XMLDepth->SetText(_X("Infinity"));
+				pSt_XMLLockActive->InsertEndChild(pSt_XMLDepth);
+				// 子元素 <owner>
+				XMLElement* pSt_XMLOwner = m_XMLDocument.NewElement("D:owner");
+				pSt_XMLLockActive->InsertEndChild(pSt_XMLOwner);
+				XMLElement* pSt_XMHRef = m_XMLDocument.NewElement("D:href");
+				pSt_XMHRef->SetText(st_WDLocker.tszOwner);
+				pSt_XMLOwner->InsertEndChild(pSt_XMHRef);
+				// 子元素 <timeout>
+				XMLElement* pSt_XMLTimeout = m_XMLDocument.NewElement("D:timeout");
+				pSt_XMLTimeout->SetText(st_WDLocker.tszTimeout);
+				pSt_XMLLockActive->InsertEndChild(pSt_XMLTimeout);
+				// 子元素 <locktoken>
+				XMLElement* pSt_XMLLockToken = m_XMLDocument.NewElement("D:locktoken");
+				pSt_XMLLockActive->InsertEndChild(pSt_XMLLockToken);
+				XMLElement* pSt_XMHTokenRef = m_XMLDocument.NewElement("D:href");
+				pSt_XMHTokenRef->SetText(st_WDLocker.tszToken);
+				pSt_XMLLockToken->InsertEndChild(pSt_XMHTokenRef);
+			}
         }
         else
         {

XEngine_Source/StorageModule_Protocol/pch.h

@@ -44,6 +44,7 @@ using namespace tinyxml2;
 #include "../StorageModule_Config/Config_Define.h"
 #include "../StorageModule_Config/Config_Error.h"
 #include "../StorageModule_Session/Session_Define.h"
+#include "../StorageModule_Session/Session_Error.h"
 #include "../StorageModule_Database/Database_Define.h"
 #include "../StorageModule_APIHelp/APIHelp_Define.h"
 #include "../StorageModule_APIHelp/APIHelp_Error.h"
@@ -70,20 +71,24 @@ extern XLONG Protocol_dwErrorCode;
 #ifdef _WIN64
 #pragma comment(lib,"../x64/Debug/jsoncpp")
 #pragma comment(lib,"../x64/Debug/tinyxml2")
+#pragma comment(lib,"../x64/Debug/StorageModule_Session.lib")
 #pragma comment(lib,"../x64/Debug/StorageModule_APIHelp.lib")
 #else
 #pragma comment(lib,"../Debug/jsoncpp")
 #pragma comment(lib,"../Debug/tinyxml2")
+#pragma comment(lib,"../Debug/StorageModule_Session.lib")
 #pragma comment(lib,"../Debug/StorageModule_APIHelp.lib")
 #endif
 #else
 #ifdef _WIN64
 #pragma comment(lib,"../x64/Release/jsoncpp")
 #pragma comment(lib,"../x64/Release/tinyxml2")
+#pragma comment(lib,"../x64/Release/StorageModule_Session.lib")
 #pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib")
 #else
 #pragma comment(lib,"../Release/jsoncpp")
 #pragma comment(lib,"../Release/tinyxml2")
+#pragma comment(lib,"../Release/StorageModule_Session.lib")
 #pragma comment(lib,"../Release/StorageModule_APIHelp.lib")
 #endif
 #endif

XEngine_Source/XEngine_StorageApp/StorageApp_Webdav.cpp

@@ -208,8 +208,10 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBDAV客户端:%s,处理WEBDAV协议LOCK方法失败,协议不正确,内容:%s"), lpszClientAddr, lpszMsgBuffer);
 			return false;
 		}
-		Session_Webdav_Insert(pSt_HTTPParam->tszHttpUri + 1, &st_WDLock);
+		Session_Webdav_Insert(pSt_HTTPParam->tszHttpUri, &st_WDLock);
 		Protocol_StoragePacket_WDLock(tszRVBuffer, &nRVLen, &st_WDLock);
+		nRVLen -= 1;
+
 		HttpProtocol_Server_SendMsgEx(xhWebdavHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
 		XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPWEBDAV);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("WEBDAV客户端:%s,处理WEBDAV协议LOCK方法成功,锁用户:%s"), lpszClientAddr, st_WDLock.tszOwner);