Skip to content

Commit 0574515

Browse files
xengine-qytxengine-qyt
committed
modify:protocol packet Protocol_StoragePacket_QueryFile function delete lpszRootDir parament
modify:protocol parse Protocol_StorageParse_DirOperator function add ptszBuckKey parament
1 parent a90c9b0 commit 0574515

File tree

6 files changed

+28
-41
lines changed

6 files changed

+28
-41
lines changed

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,12 @@ CProtocol_StoragePacket::~CProtocol_StoragePacket()
4545
类型：整数型
4646
可空：N
4747
意思：输入文件列表个数
48-
参数.五：lpszRootDir
49-
In/Out：In
50-
类型：常量字符指针
51-
可空：Y
52-
意思：某些时候可能需要跳过字符串
53-
参数.六：lpszTimeStart
48+
参数.五：lpszTimeStart
5449
In/Out：In
5550
类型：常量字符指针
5651
可空：Y
5752
意思：输入查询请求的开始时间
58-
参数.七：lpszTimeEnd
53+
参数.六：lpszTimeEnd
5954
In/Out：In
6055
类型：常量字符指针
6156
可空：Y
@@ -65,7 +60,7 @@ CProtocol_StoragePacket::~CProtocol_StoragePacket()
6560
意思：是否成功
6661
备注：
6762
*********************************************************************/
68-
BOOL CProtocol_StoragePacket::Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszRootDir, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd)
63+
BOOL CProtocol_StoragePacket::Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd)
6964
{
7065
Protocol_IsErrorOccur = FALSE;
7166

@@ -82,21 +77,7 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuf
8277
{
8378
Json::Value st_JsonObject;
8479

85-
if (NULL == lpszRootDir)
86-
{
87-
st_JsonObject["tszFilePath"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFilePath;
88-
}
89-
else
90-
{
91-
if (NULL == _tcsstr((*pppSt_DBFile)[i]->st_ProtocolFile.tszFilePath, lpszRootDir))
92-
{
93-
st_JsonObject["tszFilePath"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFilePath;
94-
}
95-
else
96-
{
97-
st_JsonObject["tszFilePath"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFilePath + _tcslen(lpszRootDir);
98-
}
99-
}
80+
st_JsonObject["tszFilePath"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFilePath;
10081
st_JsonObject["tszFileName"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFileName;
10182
st_JsonObject["tszFileUser"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFileUser;
10283
st_JsonObject["tszFileHash"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFileHash;

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class CProtocol_StoragePacket
1717
CProtocol_StoragePacket();
1818
~CProtocol_StoragePacket();
1919
public:
20-
BOOL Protocol_StoragePacket_QueryFile(TCHAR *ptszMsgBuffer, int *pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszRootDir, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL);
20+
BOOL Protocol_StoragePacket_QueryFile(TCHAR *ptszMsgBuffer, int *pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL);
2121
BOOL Protocol_StoragePacket_Info(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO*** pppSt_DLInfo, SESSION_STORAGEINFO*** pppSt_UPInfo, int nDLCount, int nUPCount);
2222
BOOL Protocol_StoragePacket_DirOperator(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, TCHAR*** pppszListEnum, int nListCount);
2323
BOOL Protocol_StoragePacket_BasicAuth(LPCTSTR lpszMethod, LPCTSTR lpszPostUrl, LPCTSTR lpszClientAddr, LPCTSTR lpszUser, LPCTSTR lpszPass, TCHAR* ptszMsgBuffer, int* pInt_MsgLen);

‎XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_StorageParse.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,12 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuf
209209
类型：字符指针
210210
可空：N
211211
意思：导出获取到的文件夹
212-
参数.三：pInt_Operator
212+
参数.三：ptszBuckKey
213+
In/Out：Out
214+
类型：字符指针
215+
可空：N
216+
意思：导出桶的KEY
217+
参数.四：pInt_Operator
213218
In/Out：Out
214219
类型：整数型指针
215220
可空：N
@@ -219,7 +224,7 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuf
219224
意思：是否成功
220225
备注：
221226
*********************************************************************/
222-
BOOL CProtocol_StorageParse::Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBuffer, TCHAR* ptszUserDir, int* pInt_Operator)
227+
BOOL CProtocol_StorageParse::Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBuffer, TCHAR* ptszUserDir, TCHAR* ptszBuckKey, int* pInt_Operator)
223228
{
224229
Protocol_IsErrorOccur = FALSE;
225230

@@ -246,6 +251,7 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBu
246251

247252
*pInt_Operator = st_JsonRoot["nOPerator"].asInt();
248253
_tcscpy(ptszUserDir, st_JsonRoot["lpszUserDir"].asCString());
254+
_tcscpy(ptszBuckKey, st_JsonRoot["lpszBuckKey"].asCString());
249255
return TRUE;
250256
}
251257
/********************************************************************

‎XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_StorageParse.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ class CProtocol_StorageParse
1919
public:
2020
BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR *ptszTimeStart, TCHAR *ptszTimeEnd, TCHAR *ptszFileName = NULL, TCHAR * ptszFileHash = NULL);
2121
BOOL Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int* pInt_ListCount);
22-
BOOL Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBuffer, TCHAR* ptszUserDir, int* pInt_Operator);
22+
BOOL Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBuffer, TCHAR* ptszUserDir, TCHAR* ptszBuckKey, int* pInt_Operator);
2323
BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize);
2424
};

‎XEngine_Source/StorageModule_Protocol/StorageProtocol_Define.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,12 @@ extern "C" BOOL Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuffer, int nMsg
233233
类型：字符指针
234234
可空：N
235235
意思：导出获取到的文件夹
236-
参数.三：pInt_Operator
236+
参数.三：ptszBuckKey
237+
In/Out：Out
238+
类型：字符指针
239+
可空：N
240+
意思：导出桶的KEY
241+
参数.四：pInt_Operator
237242
In/Out：Out
238243
类型：整数型指针
239244
可空：N
@@ -243,7 +248,7 @@ extern "C" BOOL Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuffer, int nMsg
243248
意思：是否成功
244249
备注：
245250
*********************************************************************/
246-
extern "C" BOOL Protocol_StorageParse_DirOperator(LPCSTR lpszMsgBuffer, CHAR * ptszUserDir, int* pInt_Operator);
251+
extern "C" BOOL Protocol_StorageParse_DirOperator(LPCSTR lpszMsgBuffer, CHAR * ptszUserDir, TCHAR * ptszBuckKey, int* pInt_Operator);
247252
/************************************************************************/
248253
/* 打包协议导出 */
249254
/************************************************************************/
@@ -537,17 +542,12 @@ extern "C" BOOL Protocol_StoragePacket_UPDown(LPCTSTR lpszFileName, LPCTSTR lpsz
537542
类型：整数型
538543
可空：N
539544
意思：输入文件列表个数
540-
参数.五：lpszRootDir
541-
In/Out：In
542-
类型：常量字符指针
543-
可空：Y
544-
意思：某些时候可能需要跳过字符串
545-
参数.六：lpszTimeStart
545+
参数.五：lpszTimeStart
546546
In/Out：In
547547
类型：常量字符指针
548548
可空：Y
549549
意思：输入查询请求的开始时间
550-
参数.七：lpszTimeEnd
550+
参数.六：lpszTimeEnd
551551
In/Out：In
552552
类型：常量字符指针
553553
可空：Y
@@ -557,7 +557,7 @@ extern "C" BOOL Protocol_StoragePacket_UPDown(LPCTSTR lpszFileName, LPCTSTR lpsz
557557
意思：是否成功
558558
备注：
559559
*********************************************************************/
560-
extern "C" BOOL Protocol_StoragePacket_QueryFile(CHAR * ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int nListCount, LPCTSTR lpszRootDir, LPCSTR lpszTimeStart = NULL, LPCSTR lpszTimeEnd = NULL);
560+
extern "C" BOOL Protocol_StoragePacket_QueryFile(CHAR * ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int nListCount, LPCSTR lpszTimeStart = NULL, LPCSTR lpszTimeEnd = NULL);
561561
/********************************************************************
562562
函数名称：Protocol_StoragePacket_Info
563563
函数功能：返回信息获取请求打包函数

‎XEngine_Source/StorageModule_Protocol/pch.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ extern "C" BOOL Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuffer, int nMsg
6262
{
6363
return m_StorageParse.Protocol_StorageParse_ReportFile(lpszMsgBuffer, nMsgLen, pppSt_DBFile, pInt_ListCount);
6464
}
65-
extern "C" BOOL Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBuffer, TCHAR * ptszUserDir, int* pInt_Operator)
65+
extern "C" BOOL Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBuffer, TCHAR * ptszUserDir, TCHAR * ptszBuckKey, int* pInt_Operator)
6666
{
67-
return m_StorageParse.Protocol_StorageParse_DirOperator(lpszMsgBuffer, ptszUserDir, pInt_Operator);
67+
return m_StorageParse.Protocol_StorageParse_DirOperator(lpszMsgBuffer, ptszUserDir, ptszBuckKey, pInt_Operator);
6868
}
6969
/************************************************************************/
7070
/* 打包协议导出 */
@@ -102,9 +102,9 @@ extern "C" BOOL Protocol_StoragePacket_UPDown(LPCTSTR lpszFileName, LPCTSTR lpsz
102102
{
103103
return m_StoragePacket.Protocol_StoragePacket_UPDown(lpszFileName, lpszClientAddr, nFileSize, ptszMsgBuffer, pInt_MsgLen, lpszFileHash);
104104
}
105-
extern "C" BOOL Protocol_StoragePacket_QueryFile(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int nListCount, LPCTSTR lpszRootDir, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd)
105+
extern "C" BOOL Protocol_StoragePacket_QueryFile(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd)
106106
{
107-
return m_StoragePacket.Protocol_StoragePacket_QueryFile(ptszMsgBuffer, pInt_MsgLen, pppSt_DBFile, nListCount, lpszRootDir, lpszTimeStart, lpszTimeEnd);
107+
return m_StoragePacket.Protocol_StoragePacket_QueryFile(ptszMsgBuffer, pInt_MsgLen, pppSt_DBFile, nListCount, lpszTimeStart, lpszTimeEnd);
108108
}
109109
extern "C" BOOL Protocol_StoragePacket_Info(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO * **pppSt_DLInfo, SESSION_STORAGEINFO * **pppSt_UPInfo, int nDLCount, int nUPCount)
110110
{

0 commit comments

Comments
 (0)