Skip to content

Commit 4472db7

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #33 from libxengine/develop
V3.12.1.1001 Merge
2 parents e9a3a76 + 7dca8e5 commit 4472db7

File tree

8 files changed

+30
-43
lines changed

8 files changed

+30
-43
lines changed

‎CHANGELOG

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
XEngine_Storage V3.12.1.1001
2+
3+
修改:不在插入数据当HTTP的HOOK出错
4+
修改:当http的hook和数据库插入出错上传的文件会被删除了
5+
修正:编译问题
6+
7+
modify:does not insert db when http pass is failed
8+
modify:remove upload file when http pass and insert db are failed
9+
fixed:build error
10+
======================================================================================
111
XEngine_Storage V3.12.0.1001
212

313
增加:为P2P启用内存数据库支持

‎XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
"tszCertKey":"./XEngine_Cert/2_www.xyry.org.key"
7373
},
7474
"XVer":[
75+
"3.12.1.1001 Build20240104",
7576
"3.12.0.1001 Build20231025",
7677
"3.11.1.1001 Build20230804",
7778
"3.11.0.1001 Build20230421",

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ bool CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(list<XENGINE_STORAGEBUC
340340
_tcsxcat(tszFilePath, _X("/*"));
341341
}
342342
}
343-
SystemApi_File_EnumFile(tszFilePath, &ppListFile, &nListCount, NULL, NULL, true, 1);
343+
SystemApi_File_EnumFile(tszFilePath, &ppListFile, &nListCount, true, 1);
344344
for (int j = 0; j < nListCount; j++)
345345
{
346346
struct _xtstat st_FStat;

‎XEngine_Source/StorageModule_Database/Database_Memory/Database_Memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ bool CDatabase_Memory::Database_Memory_Flush()
288288
_tcsxcpy(tszFoundDir, stl_ListIterator->tszFilePath);
289289
_tcsxcat(tszFoundDir, _X("/*"));
290290

291-
SystemApi_File_EnumFile(tszFoundDir, &pptszListFile, &nListCount, NULL, NULL, true, 1);
291+
SystemApi_File_EnumFile(tszFoundDir, &pptszListFile, &nListCount, true, 1);
292292
for (int i = 0; i < nListCount; i++)
293293
{
294294
int nHashLen = 0;

‎XEngine_Source/VSCopy_x64.bat

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,4 @@ copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
99

1010
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
1111
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
12-
copy /y "%XEngine_Lib64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"
13-
14-
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\bson-1.0.dll" "./"
15-
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\mongoc-1.0.dll" "./"
16-
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\libmariadb.dll" "./"
17-
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\libpq.dll" "./"
18-
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\sqlite3.dll" "./"
19-
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\zlib1.dll" "./"
20-
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\plugin\caching_sha2_password.dll" "./"
21-
copy /y "%XEngine_Lib64%\XEngine_NetHelp\libcurl.dll" "./"
22-
copy /y "%XEngine_Lib64%\XEngine_NetHelp\nghttp2.dll" "./"
23-
copy /y "%XEngine_Lib64%\XEngine_LibEx\libcrypto-3-x64.dll" "./"
24-
copy /y "%XEngine_Lib64%\XEngine_LibEx\libssl-3-x64.dll" "./"
12+
copy /y "%XEngine_Lib64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"

‎XEngine_Source/VSCopy_x86.bat

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,4 @@ copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
99

1010
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./"
1111
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"
12-
copy /y "%XEngine_Lib32%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"
13-
14-
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\bson-1.0.dll" "./"
15-
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\mongoc-1.0.dll" "./"
16-
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\libmariadb.dll" "./"
17-
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\libpq.dll" "./"
18-
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\sqlite3.dll" "./"
19-
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\zlib1.dll" "./"
20-
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\plugin\caching_sha2_password.dll" "./"
21-
copy /y "%XEngine_Lib32%\XEngine_NetHelp\libcurl.dll" "./"
22-
copy /y "%XEngine_Lib32%\XEngine_NetHelp\nghttp2.dll" "./"
23-
copy /y "%XEngine_Lib32%\XEngine_LibEx\libcrypto-3.dll" "./"
24-
copy /y "%XEngine_Lib32%\XEngine_LibEx\libssl-3.dll" "./"
12+
copy /y "%XEngine_Lib32%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"

‎XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,20 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
324324
return false;
325325
}
326326
}
327-
328327
Protocol_StoragePacket_UPDown(tszPassNotify, &nPLen, st_StorageInfo.tszBuckKey, st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullCount, false, st_ProtocolFile.st_ProtocolFile.tszFileHash);
328+
//PASS代理
329+
if (st_ServiceCfg.st_XProxy.bUPPass)
330+
{
331+
int nHttpCode = 0;
332+
if (!APIClient_Http_Request(_X("POST"), st_ServiceCfg.st_XProxy.tszUPPass, tszPassNotify, &nHttpCode))
333+
{
334+
_xtremove(st_StorageInfo.tszFileDir);
335+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("上传客户端:%s,请求完成通知失败,可能服务器不正确:文件:%s,地址:%s"), lpszClientAddr, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.tszUPPass);
336+
return false;
337+
}
338+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("上传客户端:%s,请求完成通知返回值:%d,文件:%s,地址:%s"), lpszClientAddr, nHttpCode, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.tszUPPass);
339+
}
340+
//数据库写
329341
if (st_ServiceCfg.st_XSql.bEnable)
330342
{
331343
if (Database_File_FileInsert(&st_ProtocolFile, st_StorageInfo.bRewrite))
@@ -340,6 +352,7 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
340352
{
341353
st_HDRParam.bIsClose = true;
342354
st_HDRParam.nHttpCode = 403;
355+
_xtremove(st_StorageInfo.tszFileDir);
343356
HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszPassNotify, nPLen);
344357
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
345358
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("上传客户端:%s,请求上传文件失败,插入数据库失败:%s,错误:%lX"), lpszClientAddr, tszFileDir, Database_GetLastError());
@@ -353,19 +366,6 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
353366
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
354367
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("上传客户端:%s,请求上传文件成功,文件名:%s,大小:%d,数据库没有启用,不插入数据库"), lpszClientAddr, tszFileDir, nRVCount);
355368
}
356-
//PASS代理
357-
if (st_ServiceCfg.st_XProxy.bUPPass)
358-
{
359-
int nHttpCode = 0;
360-
if (APIClient_Http_Request(_X("POST"), st_ServiceCfg.st_XProxy.tszUPPass, tszPassNotify, &nHttpCode))
361-
{
362-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("上传客户端:%s,请求完成通知返回值:%d,文件:%s,地址:%s"), lpszClientAddr, nHttpCode, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.tszUPPass);
363-
}
364-
else
365-
{
366-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("上传客户端:%s,请求完成通知失败,可能服务器不正确:文件:%s,地址:%s"), lpszClientAddr, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.tszUPPass);
367-
}
368-
}
369369
}
370370
else
371371
{

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
319319
_tcsxcat(tszRealDir, _X("/*"));
320320
}
321321
}
322-
if (!SystemApi_File_EnumFile(tszRealDir, &ppszListDir, &nListCount, NULL, NULL, true, 2))
322+
if (!SystemApi_File_EnumFile(tszRealDir, &ppszListDir, &nListCount, true, 2))
323323
{
324324
st_HDRParam.bIsClose = true;
325325
st_HDRParam.nHttpCode = 404;

0 commit comments

Comments
 (0)