fixed:build error

Author: xengine-qyt

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

@@ -209,7 +209,7 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
 				XStorage_SQLite_FileQuery(&ppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszFileName, tszFileHash);
 			}
 
-			Protocol_StoragePacket_QueryFile(tszMsgBuffer, &nMsgLen, &ppSt_ListFile, nListCount, st_ServiceCfg.st_XStorage.tszFileDir, tszTimeStart, tszTimeEnd);
+			Protocol_StoragePacket_QueryFile(tszMsgBuffer, &nMsgLen, &ppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
 			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszMsgBuffer, nMsgLen);
 			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
 			BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListFile, nListCount);
@@ -239,13 +239,15 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
 		int nListCount = 0;
 		CHAR** ppszListDir = NULL;
 		TCHAR tszUserDir[MAX_PATH];
+		TCHAR tszBuckKey[MAX_PATH];
 		TCHAR tszRealDir[1024];
 
 		memset(tszUserDir, '\0', MAX_PATH);
+		memset(tszBuckKey, '\0', MAX_PATH);
 		memset(tszRealDir, '\0', sizeof(tszRealDir));
 
-		Protocol_StorageParse_DirOperator(lpszMsgBuffer, tszUserDir, &nOPCode);
-		_stprintf(tszRealDir, _T("%s/%s"), st_ServiceCfg.st_XStorage.tszFileDir, tszUserDir);
+		Protocol_StorageParse_DirOperator(lpszMsgBuffer, tszUserDir, tszBuckKey, &nOPCode);
+		_stprintf(tszRealDir, _T("%s/%s"), tszBuckKey, tszUserDir);
 		if (0 == nOPCode)
 		{
 			if (!SystemApi_File_EnumFile(tszRealDir, &ppszListDir, &nListCount, NULL, NULL, TRUE, 2))

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskP2p.cpp

@@ -40,7 +40,7 @@ XHTHREAD XEngine_Task_P2PThread()
 					if (nListCount > 0)
 					{
 						_stprintf(pppSt_ListFile[0]->tszTableName, _T("%s:%d"), st_ServiceCfg.tszIPAddr, st_ServiceCfg.nStorageDLPort);
-						Protocol_StoragePacket_QueryFile(tszMsgBuffer, &nMsgLen, &pppSt_ListFile, nListCount, st_ServiceCfg.st_XStorage.tszFileDir, tszTimeStart, tszTimeEnd);
+						Protocol_StoragePacket_QueryFile(tszMsgBuffer, &nMsgLen, &pppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
 						BaseLib_OperatorMemory_Free((XPPPMEM)&pppSt_ListFile, nListCount);
 
 						SOCKET hSDSocket;
@@ -88,7 +88,7 @@ BOOL XEngine_Task_P2PGet(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPON
 			st_HDRParam.nHttpCode = 200;
 
 			_stprintf(pppSt_ListFile[0]->tszTableName, _T("127.0.0.1:%d"), st_ServiceCfg.nStorageDLPort);
-			Protocol_StoragePacket_QueryFile(tszRVBuffer, &nRVLen, &pppSt_ListFile, nListCount, st_ServiceCfg.st_XStorage.tszFileDir);
+			Protocol_StoragePacket_QueryFile(tszRVBuffer, &nRVLen, &pppSt_ListFile, nListCount);
 			BaseLib_OperatorMemory_Free((XPPPMEM)&pppSt_ListFile, nListCount);
 
 			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszRVBuffer, nRVLen);
@@ -177,7 +177,7 @@ BOOL XEngine_Task_P2PGet(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPON
 			int nListCount = 0;
 			XSTORAGECORE_DBFILE** ppSt_ListPacket;
 			APIHelp_Distributed_FileList(&stl_ListFile, &ppSt_ListPacket, &nListCount);
-			Protocol_StoragePacket_QueryFile(tszRVBuffer, &nRVLen, &ppSt_ListPacket, nListCount, st_ServiceCfg.st_XStorage.tszFileDir);
+			Protocol_StoragePacket_QueryFile(tszRVBuffer, &nRVLen, &ppSt_ListPacket, nListCount);
 			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszRVBuffer, nRVLen);
 			BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListPacket, nListCount);
 		}