modify:text change function to xengine

Author: xengine-qyt

XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp

@@ -500,46 +500,5 @@ bool CAPIHelp_Api::APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl)
 	// 添加字符串结束符
 	ptszKeyStr[nLen] = '\0';
 
-	return true;
-}
-/********************************************************************
-函数名称：APIHelp_Api_UrlChange
-函数功能：URL修改
- 参数.一：ptszStr
-  In/Out：In/Out
-  类型：字符指针
-  可空：N
-  意思：输出修改后的内容,输入修改前的内容
- 参数.二：lpszSourceStr
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入要替换的字符串
- 参数.三：lpszDestStr
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入修改后的字符串
-返回值
-  类型：逻辑型
-  意思：是否成功
-备注：
-*********************************************************************/
-bool CAPIHelp_Api::APIHelp_Api_UrlChange(XCHAR* ptszStr, LPCXSTR lpszSourceStr, LPCXSTR lpszDestStr)
-{
-	APIHelp_IsErrorOccur = false;
-
-	std::string m_Str = ptszStr;
-	std::string m_StrSource = lpszSourceStr;
-	std::string m_StrDest = lpszDestStr;
-
-	size_t startPos = 0;
-	while ((startPos = m_Str.find(m_StrSource, startPos)) != std::string::npos)
-	{
-		m_Str.replace(startPos, m_StrSource.length(), m_StrDest);
-		startPos += m_StrDest.length(); // 防止在替换新字符串后陷入无限循环
-	}
-	_tcsxcpy(ptszStr, m_Str.c_str());
-
 	return true;
 }

XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.h

@@ -26,7 +26,6 @@ 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_UrlChange(XCHAR* ptszKeyStr, LPCXSTR lpszSourceStr, LPCXSTR lpszDestStr);
 protected:
 private:
 };

XEngine_Source/StorageModule_APIHelp/APIHelp_Define.h

@@ -370,28 +370,4 @@ extern "C" bool APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIRSiz
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" bool APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl);
-/********************************************************************
-函数名称：APIHelp_Api_UrlChange
-函数功能：URL修改
- 参数.一：ptszStr
-  In/Out：In/Out
-  类型：字符指针
-  可空：N
-  意思：输出修改后的内容,输入修改前的内容
- 参数.二：lpszSourceStr
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入要替换的字符串
- 参数.三：lpszDestStr
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入修改后的字符串
-返回值
-  类型：逻辑型
-  意思：是否成功
-备注：
-*********************************************************************/
-extern "C" bool APIHelp_Api_UrlChange(XCHAR* ptszKeyStr, LPCXSTR lpszSourceStr, LPCXSTR lpszDestStr);
+extern "C" bool APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl);

XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.def

@@ -17,5 +17,4 @@ EXPORTS
 	APIHelp_Api_UrlParse
 	APIHelp_Api_Boundary
 	APIHelp_Api_GetDIRSize
-	APIHelp_Api_UrlStr
-	APIHelp_Api_UrlChange
+	APIHelp_Api_UrlStr

XEngine_Source/StorageModule_APIHelp/pch.cpp

@@ -89,8 +89,4 @@ extern "C" bool APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u * pInt_DIRSi
 extern "C" bool APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl)
 {
 	return m_APIHelp.APIHelp_Api_UrlStr(ptszKeyStr, lpszUrl);
-}
-extern "C" bool APIHelp_Api_UrlChange(XCHAR* ptszKeyStr, LPCXSTR lpszSourceStr, LPCXSTR lpszDestStr)
-{
-	return m_APIHelp.APIHelp_Api_UrlChange(ptszKeyStr, lpszSourceStr, lpszDestStr);
 }

XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp

@@ -601,7 +601,8 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_Propfind(XCHAR* ptszMsgBuff
         APIHelp_Api_UrlStr(tszSourceStr, (*ppptszListFile)[i]);
         APIHelp_Api_UrlStr(tszDestStr, (*ppptszListFile)[i]);
 
-        APIHelp_Api_UrlChange(tszFileAlis, lpszBucketPath + 2, lpszBucketKey);
+        int nRLen = 0;
+        BaseLib_OperatorString_Replace(tszFileAlis, &nRLen, lpszBucketPath + 2, lpszBucketKey, true);
         XMLElement* pSt_XMLhref = m_XMLDocument.NewElement("d:href");
         pSt_XMLhref->SetText(tszFileAlis);
         pSt_XMLResponse->InsertEndChild(pSt_XMLhref);

XEngine_Source/XEngine_StorageApp/StorageApp_Webdav.cpp

@@ -52,6 +52,7 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 	LPCXSTR lpszMethodPropfind = _X("PROPFIND");
 	LPCXSTR lpszMethodGet = _X("GET");
 	LPCXSTR lpszMethodPut = _X("PUT");
+	LPCXSTR lpszMethodLock = _X("LOCK");
 
 	st_HDRParam.bIsClose = false;
 	st_HDRParam.nHttpCode = 200;
@@ -93,7 +94,7 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 		{
 			int nALen = 0;
 			_tcsxcpy(tszFindStr, pSt_HTTPParam->tszHttpUri + 1);
-			APIHelp_Api_UrlChange(tszFindStr, st_StorageBucket.tszBuckKey, st_StorageBucket.tszFilePath);
+			BaseLib_OperatorString_Replace(tszFindStr, &nALen, st_StorageBucket.tszBuckKey, st_StorageBucket.tszFilePath, true);
 		}
 		else
 		{
@@ -146,7 +147,8 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 		_xstprintf(tszPortWebdav, _X("%d"), st_ServiceCfg.nWebdavPort);
 		_xstprintf(tszPortDownload, _X("%d"), st_ServiceCfg.nStorageDLPort);
 		//转换端口
-		APIHelp_Api_UrlChange(tszHostStr, tszPortWebdav, tszPortDownload);
+		int nReplaceLen = 0;
+		BaseLib_OperatorString_Replace(tszHostStr, &nReplaceLen, tszPortWebdav, tszPortDownload, true);
 		_xstprintf(tszRequestAddr, _X("Location: http://%s%s\r\n"), tszHostStr, pSt_HTTPParam->tszHttpUri);
 
 		HttpProtocol_Server_SendMsgEx(xhWebdavHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszRequestAddr);
@@ -169,7 +171,8 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 		_xstprintf(tszPortWebdav, _X("%d"), st_ServiceCfg.nWebdavPort);
 		_xstprintf(tszPortDownload, _X("%d"), st_ServiceCfg.nStorageUPPort);
 		//转换端口
-		APIHelp_Api_UrlChange(tszHostStr, tszPortWebdav, tszPortDownload);
+		int nRLen = 0;
+		BaseLib_OperatorString_Replace(tszHostStr, &nRLen, tszPortWebdav, tszPortDownload, true);
 		//转换地址
 		XCHAR tszStroageKey[MAX_PATH] = {};
 		XCHAR tszFileName[MAX_PATH] = {};