Skip to content

Commit 9fdd000

Browse files
committed
fixed:http does not contain the length and does not return a message
modify:Upload supports distributed processing
1 parent f88e0e7 commit 9fdd000

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
168168
}
169169
XENGINE_STORAGEBUCKET st_StorageBucket;
170170
memset(&st_StorageBucket, '\0', sizeof(XENGINE_STORAGEBUCKET));
171-
171+
//分布式存储
172172
if (!APIHelp_Distributed_DLStorage(pSt_HTTPParam->tszHttpUri, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket, &st_StorageBucket))
173173
{
174174
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("下载客户端:%s,请求文件失败,可能BUCKET:% 不正确,错误:%lX"), lpszClientAddr, pSt_HTTPParam->tszHttpUri, APIHelp_GetLastError());

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
102102
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("上传客户端:%s,请求上传文件失败,可能BUCKET:% 不正确,错误:%lX"), lpszClientAddr, pSt_HTTPParam->tszHttpUri, APIHelp_GetLastError());
103103
return FALSE;
104104
}
105-
_stprintf(tszFileDir, _T("%s%s"), st_StorageBucket.tszFilePath, st_StorageBucket.tszFileName);
105+
_stprintf(tszFileDir, _T("%s%s"), st_StorageBucket.tszFilePath, pSt_HTTPParam->tszHttpUri);
106106

107107
if (!Session_UPStroage_Exist(lpszClientAddr))
108108
{
@@ -142,8 +142,12 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
142142
}
143143
if (nMsgLen <= 0)
144144
{
145+
st_HDRParam.bIsClose = TRUE;
146+
st_HDRParam.nHttpCode = 411;
147+
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
148+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
145149
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("上传客户端:%s,用户数据大小为0?"), lpszClientAddr);
146-
return TRUE;
150+
return FALSE;
147151
}
148152
Session_UPStroage_Write(lpszClientAddr, lpszMsgBuffer, nMsgLen);
149153
RfcComponents_HttpServer_GetRecvModeEx(xhUPHttp, lpszClientAddr, &nRVMode, &nRVCount, &nHDSize);
@@ -189,6 +193,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
189193
BOOL bRet = TRUE;
190194
if (0 != st_ServiceCfg.st_XSql.nSQLType)
191195
{
196+
_tcscpy(st_ProtocolFile.tszPathKey, st_StorageBucket.tszBuckKey);
192197
if (1 == st_ServiceCfg.st_XSql.nSQLType)
193198
{
194199
bRet = XStorage_MySql_FileInsert(&st_ProtocolFile);

0 commit comments

Comments
 (0)