Skip to content

Commit fee307c

Browse files
xengine-qytxengine-qyt
committed
added:windows module file copy bat.
added:delete manage api. modify:The sql module file query interface requires the complete file path
1 parent bc54b65 commit fee307c

File tree

5 files changed

+103
-8
lines changed

5 files changed

+103
-8
lines changed

‎XEngine_Source/VSCopy.bat‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
copy /y "%XEngine_Library%\x86\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
2+
copy /y "%XEngine_Library%\x86\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
3+
copy /y "%XEngine_Library%\x86\XEngine_Core\XEngine_Core.dll" "./"
4+
copy /y "%XEngine_Library%\x86\XEngine_Core\XEngine_ManagePool.dll" "./"
5+
copy /y "%XEngine_Library%\x86\XEngine_Core\XEngine_NetXApi.dll" "./"
6+
copy /y "%XEngine_Library%\x86\XEngine_Core\XEngine_OPenSsl.dll" "./"
7+
8+
copy /y "%XEngine_Library%\x86\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
9+
10+
copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
11+
copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
12+
copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
13+
14+
copy /y "%XEngine_Library%\x86\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
15+
16+
copy /y "%XEngine_Library%\x86\XEngine_RfcComponents\RfcComponents_HttpServer.dll" "./"
17+
18+
copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\bson-1.0.dll" "./"
19+
copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\mongoc-1.0.dll" "./"
20+
copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\libmariadb.dll" "./"
21+
copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\libpq.dll" "./"
22+
copy /y "%XEngine_Library%\x86\XEngine_HelpComponents\libsqlite3.dll" "./"
23+
copy /y "%XEngine_Library%\x86\XEngine_LibEx\libcrypto-1_1.dll" "./"
24+
copy /y "%XEngine_Library%\x86\XEngine_LibEx\libssl-1_1.dll" "./"
25+
copy /y "%XEngine_Library%\x86\XEngine_LibEx\libcurl.dll" "./"

‎XEngine_Source/VSCopy_Debug.bat‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_BaseLib.dll" "./"
2+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Algorithm.dll" "./"
3+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Core.dll" "./"
4+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"
5+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_NetXApi.dll" "./"
6+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_OPenSsl.dll" "./"
7+
8+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"
9+
10+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_DataBase.dll" "./"
11+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_Packets.dll" "./"
12+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_XLog.dll" "./"
13+
14+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
15+
16+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\RfcComponents_HttpServer.dll" "./"

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp‎

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
8989
TCHAR tszFilePath[1024];
9090
memset(tszFilePath, '\0', sizeof(tszFilePath));
9191

92-
_stprintf(tszFilePath, _T("%s/%s"), ppSt_DBFile[i]->st_ProtocolFile.tszFilePath, ppSt_DBFile[i]->st_ProtocolFile.tszFileName);
93-
XStorageSQL_File_FileDelete(NULL, ppSt_DBFile[i]->st_ProtocolFile.tszFileHash);
92+
_stprintf(tszFilePath, _T("%s/%s"), ppSt_DBQuery[i]->st_ProtocolFile.tszFilePath, ppSt_DBQuery[i]->st_ProtocolFile.tszFileName);
93+
XStorageSQL_File_FileDelete(NULL, ppSt_DBQuery[i]->st_ProtocolFile.tszFileHash);
9494
}
9595
}
9696
else
@@ -102,20 +102,60 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
102102
TCHAR tszFilePath[1024];
103103
memset(tszFilePath, '\0', sizeof(tszFilePath));
104104

105-
_stprintf(tszFilePath, _T("%s/%s"), ppSt_DBFile[i]->st_ProtocolFile.tszFilePath, ppSt_DBFile[i]->st_ProtocolFile.tszFileName);
106-
XStorage_SQLite_FileDelete(NULL, ppSt_DBFile[i]->st_ProtocolFile.tszFileHash);
105+
_stprintf(tszFilePath, _T("%s/%s"), ppSt_DBQuery[i]->st_ProtocolFile.tszFilePath, ppSt_DBQuery[i]->st_ProtocolFile.tszFileName);
106+
XStorage_SQLite_FileDelete(NULL, ppSt_DBQuery[i]->st_ProtocolFile.tszFileHash);
107107
}
108108
}
109+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求删除文件HASH成功,文件名:%s"), lpszClientAddr, ppSt_DBFile[i]->st_ProtocolFile.tszFileHash);
109110
}
110111
else
111112
{
112-
113+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,请求删除文件失败,因为没有启用数据库,删除的HASH:%s"), lpszClientAddr, ppSt_DBFile[i]->st_ProtocolFile.tszFileHash);
113114
}
114115
}
115116
else
116117
{
118+
if (0 != st_ServiceCfg.st_XSql.nSQLType)
119+
{
120+
int nQueryCount = 0;
121+
TCHAR tszFileDir[1024];
122+
XSTORAGECORE_DBFILE** ppSt_DBQuery;
123+
124+
memset(tszFileDir, '\0', sizeof(tszFileDir));
125+
_stprintf(tszFileDir, _T("%s/%s"), ppSt_DBFile[i]->st_ProtocolFile.tszFilePath, ppSt_DBFile[i]->st_ProtocolFile.tszFileName);
126+
if (1 == st_ServiceCfg.st_XSql.nSQLType)
127+
{
128+
XStorageSQL_File_FileQuery(&ppSt_DBQuery, &nQueryCount, NULL, NULL, tszFileDir);
129+
//删除数据库与文件
130+
for (int i = 0; i < nQueryCount; i++)
131+
{
132+
TCHAR tszFilePath[1024];
133+
memset(tszFilePath, '\0', sizeof(tszFilePath));
134+
135+
_stprintf(tszFilePath, _T("%s/%s"), ppSt_DBQuery[i]->st_ProtocolFile.tszFilePath, ppSt_DBQuery[i]->st_ProtocolFile.tszFileName);
136+
XStorageSQL_File_FileDelete(NULL, ppSt_DBQuery[i]->st_ProtocolFile.tszFileHash);
137+
}
138+
}
139+
else
140+
{
141+
XStorage_SQLite_FileQuery(&ppSt_DBQuery, &nQueryCount, NULL, NULL, tszFileDir);
142+
//删除数据库与文件
143+
for (int i = 0; i < nQueryCount; i++)
144+
{
145+
TCHAR tszFilePath[1024];
146+
memset(tszFilePath, '\0', sizeof(tszFilePath));
147+
148+
_stprintf(tszFilePath, _T("%s/%s"), ppSt_DBQuery[i]->st_ProtocolFile.tszFilePath, ppSt_DBQuery[i]->st_ProtocolFile.tszFileName);
149+
XStorage_SQLite_FileDelete(NULL, ppSt_DBQuery[i]->st_ProtocolFile.tszFileHash);
150+
}
151+
}
152+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求删除文件名称成功,文件名:%s/%s"), lpszClientAddr, ppSt_DBFile[i]->st_ProtocolFile.tszFilePath, ppSt_DBFile[i]->st_ProtocolFile.tszFileName);
153+
}
154+
else
155+
{
156+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,请求删除文件名称失败,因为没有启用数据库,删除的HASH:%s"), lpszClientAddr, ppSt_DBFile[i]->st_ProtocolFile.tszFilePath, ppSt_DBFile[i]->st_ProtocolFile.tszFileName);
157+
}
117158
}
118-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求删除文件成功,文件名:%s/%s"), lpszClientAddr, ppSt_DBFile[i]->st_ProtocolFile.tszFilePath, ppSt_DBFile[i]->st_ProtocolFile.tszFileName);
119159
}
120160
st_HDRParam.bIsClose = TRUE;
121161
st_HDRParam.nHttpCode = 200;

‎XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorageSQL_File/XStorageSQL_File.cpp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,14 @@ BOOL CXStorageSQL_File::XStorageSQL_File_FileQuery(XSTORAGECORE_DBFILE*** pppSt_
311311
{
312312
if (_tcslen(lpszFile) > 0)
313313
{
314-
_stprintf_s(tszSQLStatement, _T("SELECT * FROM `%s` WHERE FileName = '%s'"), pptszResult[0], lpszFile);
314+
TCHAR tszFilePath[MAX_PATH];
315+
TCHAR tszFileName[MAX_PATH];
316+
317+
memset(tszFilePath, '\0', MAX_PATH);
318+
memset(tszFileName, '\0', MAX_PATH);
319+
320+
BaseLib_OperatorString_GetFileAndPath(lpszFile, tszFilePath, tszFileName);
321+
_stprintf_s(tszSQLStatement, _T("SELECT * FROM `%s` WHERE FilePath = '%s' AND FileName = '%s'"), pptszResult[0], tszFilePath, tszFileName);
315322
}
316323
else
317324
{

‎XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLite/XStorage_SQLite.cpp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,14 @@ BOOL CXStorage_SQLite::XStorage_SQLite_FileQuery(XSTORAGECORE_DBFILE*** pppSt_Li
303303
{
304304
if (_tcslen(lpszFile) > 0)
305305
{
306-
_stprintf_s(tszSQLStatement, _T("SELECT * FROM `%s` WHERE FileName = '%s'"), pptszResult[i], lpszFile);
306+
TCHAR tszFilePath[MAX_PATH];
307+
TCHAR tszFileName[MAX_PATH];
308+
309+
memset(tszFilePath, '\0', MAX_PATH);
310+
memset(tszFileName, '\0', MAX_PATH);
311+
312+
BaseLib_OperatorString_GetFileAndPath(lpszFile, tszFilePath, tszFileName);
313+
_stprintf_s(tszSQLStatement, _T("SELECT * FROM `%s` WHERE FilePath = '%s' AND FileName = '%s'"), pptszResult[i], tszFilePath, tszFileName);
307314
}
308315
else
309316
{

0 commit comments

Comments
 (0)