Skip to content

Commit ddd2b98

Browse files
xengine-qytxengine-qyt
committed
modify:reply json information for http manage api
1 parent 5b4e141 commit ddd2b98

File tree

9 files changed

+127
-49
lines changed

9 files changed

+127
-49
lines changed

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,55 @@ CProtocol_StoragePacket::~CProtocol_StoragePacket()
2323
// 公有函数
2424
//////////////////////////////////////////////////////////////////////////
2525
/********************************************************************
26+
函数名称：Protocol_StoragePacket_HTTPPacket
27+
函数功能：查询回复打包协议
28+
参数.一：ptszMsgBuffer
29+
In/Out：Out
30+
类型：字符指针
31+
可空：N
32+
意思：输出组好包的请求缓冲区
33+
参数.二：pInt_MsgLen
34+
In/Out：Out
35+
类型：整数型指针
36+
可空：N
37+
意思：输出缓冲区大小
38+
参数.三：nCode
39+
In/Out：In
40+
类型：整数型
41+
可空：Y
42+
意思：输入HTTP错误码
43+
参数.四：lpszMSGInfo
44+
In/Out：In
45+
类型：常量字符指针
46+
可空：N
47+
意思：输入返回的消息信息
48+
返回值
49+
类型：逻辑型
50+
意思：是否成功
51+
备注：
52+
*********************************************************************/
53+
bool CProtocol_StoragePacket::Protocol_StoragePacket_HTTPPacket(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode /* = 0 */, LPCXSTR lpszMSGInfo /* = NULL */)
54+
{
55+
Protocol_IsErrorOccur = false;
56+
57+
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
58+
{
59+
Protocol_IsErrorOccur = true;
60+
Protocol_dwErrorCode = ERROR_XENGINE_STORAGE_PROTOCOL_PARAMENT;
61+
return false;
62+
}
63+
Json::Value st_JsonRoot;
64+
st_JsonRoot["code"] = nCode;
65+
if (NULL != lpszMSGInfo)
66+
{
67+
st_JsonRoot["msg"] = lpszMSGInfo;
68+
}
69+
//打包输出信息
70+
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
71+
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
72+
return true;
73+
}
74+
/********************************************************************
2675
函数名称：Protocol_StoragePacket_QueryFile
2776
函数功能：查询回复打包协议
2877
参数.一：ptszMsgBuffer

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class CProtocol_StoragePacket
1717
CProtocol_StoragePacket();
1818
~CProtocol_StoragePacket();
1919
public:
20+
bool Protocol_StoragePacket_HTTPPacket(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode = 0, LPCXSTR lpszMSGInfo = NULL);
2021
bool Protocol_StoragePacket_QueryFile(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCXSTR lpszTimeStart = NULL, LPCXSTR lpszTimeEnd = NULL, XNETHANDLE xhToken = 0);
2122
bool Protocol_StoragePacket_Info(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO*** pppSt_DLInfo, SESSION_STORAGEINFO*** pppSt_UPInfo, int nDLCount, int nUPCount);
2223
bool Protocol_StoragePacket_DirOperator(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XCHAR*** pppszListEnum, int nListCount);

‎XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ EXPORTS
1414
Protocol_StorageParse_WDLock
1515
Protocol_StorageParse_WDPropPatch
1616

17+
Protocol_StoragePacket_HTTPPacket
1718
Protocol_StoragePacket_BasicAuth
1819
Protocol_StoragePacket_UPDown
1920
Protocol_StoragePacket_QueryFile

‎XEngine_Source/StorageModule_Protocol/StorageProtocol_Define.h‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,35 @@ extern "C" bool Protocol_StorageParse_WDPropPatch(LPCXSTR lpszMsgBuffer, int nMs
297297
/* 打包协议导出 */
298298
/************************************************************************/
299299
/********************************************************************
300+
函数名称：Protocol_StoragePacket_HTTPPacket
301+
函数功能：查询回复打包协议
302+
参数.一：ptszMsgBuffer
303+
In/Out：Out
304+
类型：字符指针
305+
可空：N
306+
意思：输出组好包的请求缓冲区
307+
参数.二：pInt_MsgLen
308+
In/Out：Out
309+
类型：整数型指针
310+
可空：N
311+
意思：输出缓冲区大小
312+
参数.三：nCode
313+
In/Out：In
314+
类型：整数型
315+
可空：Y
316+
意思：输入HTTP错误码
317+
参数.四：lpszMSGInfo
318+
In/Out：In
319+
类型：常量字符指针
320+
可空：N
321+
意思：输入返回的消息信息
322+
返回值
323+
类型：逻辑型
324+
意思：是否成功
325+
备注：
326+
*********************************************************************/
327+
extern "C" bool Protocol_StoragePacket_HTTPPacket(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode = 0, LPCXSTR lpszMSGInfo = NULL);
328+
/********************************************************************
300329
函数名称：Protocol_StoragePacket_BasicAuth
301330
函数功能：基本验证协议代理转发
302331
参数.一：lpszMethod

‎XEngine_Source/StorageModule_Protocol/pch.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ extern "C" bool Protocol_StorageParse_WDPropPatch(LPCXSTR lpszMsgBuffer, int nMs
6868
/************************************************************************/
6969
/* 打包协议导出 */
7070
/************************************************************************/
71+
extern "C" bool Protocol_StoragePacket_HTTPPacket(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode, LPCXSTR lpszMSGInfo)
72+
{
73+
return m_StoragePacket.Protocol_StoragePacket_HTTPPacket(ptszMsgBuffer, pInt_MsgLen, nCode, lpszMSGInfo);
74+
}
7175
extern "C" bool Protocol_StoragePacket_BasicAuth(LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR * ptszMsgBuffer, int* pInt_MsgLen)
7276
{
7377
return m_StoragePacket.Protocol_StoragePacket_BasicAuth(lpszMethod, lpszPostUrl, lpszClientAddr, lpszUser, lpszPass, ptszMsgBuffer, pInt_MsgLen);

‎XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ XHTHREAD CALLBACK XEngine_Center_HTTPThread(XPVOID lParam)
4343
bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, XCHAR** pptszListHdr, int nHdrCount)
4444
{
4545
int nSDLen = 2048;
46-
XCHAR tszSDBuffer[2048];
46+
int nRVLen = 2048;
47+
XCHAR tszSDBuffer[2048] = {};
48+
XCHAR tszRVBuffer[2048] = {};
4749
XCHAR tszAPIVersion[64];
4850
XCHAR tszAPIMethod[64];
4951
XCHAR tszAPIName[64];
5052
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam;
5153

52-
memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
5354
memset(tszAPIVersion, '\0', sizeof(tszAPIVersion));
5455
memset(tszAPIMethod, '\0', sizeof(tszAPIMethod));
5556
memset(tszAPIName, '\0', sizeof(tszAPIName));
@@ -58,6 +59,8 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
5859
LPCXSTR lpszMethodPost = _X("POST");
5960
LPCXSTR lpszMethodOption = _X("OPTIONS");
6061

62+
st_HDRParam.bIsClose = true;
63+
st_HDRParam.nHttpCode = 200;
6164
if (st_ServiceCfg.st_XProxy.bAuthPass)
6265
{
6366
XCHAR tszUserName[64];
@@ -104,10 +107,8 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
104107

105108
if (!HttpProtocol_ServerHelp_GetUrlApi(pSt_HTTPParam->tszHttpUri, tszAPIVersion, tszAPIMethod, tszAPIName))
106109
{
107-
st_HDRParam.bIsClose = true;
108-
st_HDRParam.nHttpCode = 404;
109-
110-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
110+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_APINAME, "api name is incorrect");
111+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
111112
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
112113
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求的API不支持"), lpszClientAddr);
113114
return false;
@@ -129,8 +130,6 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
129130
else if (0 == _tcsxnicmp(lpszMethodOption, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodOption)))
130131
{
131132
//用于心跳
132-
st_HDRParam.bIsClose = true;
133-
st_HDRParam.nHttpCode = 200;
134133
LPCXSTR lpszHdrBuffer = _X("Allow: POST GET PUT\r\n");
135134
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, lpszHdrBuffer);
136135
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskAction.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
8585

8686
if (!Protocol_StorageParse_Action(lpszMsgBuffer, nMsgLen, &st_ActionInfo))
8787
{
88-
st_HDRParam.nHttpCode = 400;
89-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
88+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_PARSE, "parse json is incorrect");
89+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
9090
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
9191
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,处理用户转录动作失败,协议解析失败,负载内容:%s"), lpszClientAddr, lpszMsgBuffer);
9292
return false;
@@ -95,8 +95,8 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
9595
XENGINE_STORAGEBUCKET st_StorageBucket = {};
9696
if (!APIHelp_Distributed_CTStorage(st_ActionInfo.tszBucketStr, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket, &st_StorageBucket))
9797
{
98-
st_HDRParam.nHttpCode = 400;
99-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
98+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_NOTFOUND, "bucket name is incorrect");
99+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
100100
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
101101
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,处理用户转录动作失败,存储Key解析失败,URL:%s,路径:%s,Bucket:%s"), lpszClientAddr, st_ActionInfo.tszFileUrl, st_ActionInfo.tszFileName, st_ActionInfo.tszBucketStr);
102102
return false;
@@ -113,8 +113,8 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
113113
XHANDLE xhAction = APIClient_File_Create(st_ActionInfo.tszFileUrl, tszFileName, true);
114114
if (NULL == xhAction)
115115
{
116-
st_HDRParam.nHttpCode = 501;
117-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
116+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVER, "server execution failure");
117+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
118118
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
119119
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,处理用户转录动作失败,下载文件失败,URL:%s,路径:%s,Bucket:%s,类型:%d"), lpszClientAddr, st_ActionInfo.tszFileUrl, tszFileName, st_ActionInfo.tszBucketStr, st_ActionInfo.byType);
120120
return false;
@@ -135,8 +135,8 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
135135
XHANDLE xhAction = APIClient_File_Create(st_ActionInfo.tszFileUrl, tszFileName, false);
136136
if (NULL == xhAction)
137137
{
138-
st_HDRParam.nHttpCode = 501;
139-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
138+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVER, "server execution failure");
139+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
140140
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
141141
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,处理用户转录动作失败,下载文件失败,URL:%s,路径:%s,Bucket:%s,类型:%d"), lpszClientAddr, st_ActionInfo.tszFileUrl, tszFileName, st_ActionInfo.tszBucketStr, st_ActionInfo.byType);
142142
return false;
@@ -158,8 +158,8 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
158158
XHANDLE xhAction = BTorrent_DLoader_Create(st_ActionInfo.tszFileUrl, tszFileName);
159159
if (NULL == xhAction)
160160
{
161-
st_HDRParam.nHttpCode = 501;
162-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
161+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVER, "server execution failure");
162+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
163163
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
164164
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,处理用户转录动作失败,下载文件失败,URL:%s,路径:%s,Bucket:%s,类型:%d"), lpszClientAddr, st_ActionInfo.tszFileUrl, tszFileName, st_ActionInfo.tszBucketStr, st_ActionInfo.byType);
165165
return false;

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,17 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
5656
//查找数据库
5757
if (!st_ServiceCfg.st_XSql.bEnable)
5858
{
59-
st_HDRParam.bIsClose = true;
60-
st_HDRParam.nHttpCode = 501;
61-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
59+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_NOENABLE, "Function not enabled");
60+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
6261
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
6362
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求查询文件失败,没有启用数据库,无法使用此功能!"), lpszClientAddr);
6463
return false;
6564
}
6665
Database_File_FileQuery(&ppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszBucketKey, NULL, tszFileName, tszFileHash);
6766
if (0 == nListCount)
6867
{
69-
st_HDRParam.bIsClose = true;
70-
st_HDRParam.nHttpCode = 404;
71-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
68+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_NOTFOUND, "data does not found");
69+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
7270
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
7371
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求查询文件失败,没有找到文件,查找文件名:%s,文件HASH:%s!"), lpszClientAddr, tszFileName, tszFileHash);
7472
return false;
@@ -106,10 +104,8 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
106104

107105
if (!NetCore_BroadCast_Send(hSDSocket, tszSDBuffer, nSDLen))
108106
{
109-
st_HDRParam.bIsClose = true;
110-
st_HDRParam.nHttpCode = 500;
111-
112-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
107+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVER, "server failure");
108+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
113109
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
114110
NetCore_BroadCast_Close(hSDSocket);
115111
NetCore_BroadCast_Close(hRVSocket);
@@ -185,9 +181,8 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
185181
_xstprintf(tszFileDir, _X("%s/%s"), ppSt_DBFile[i]->st_ProtocolFile.tszFilePath, ppSt_DBFile[i]->st_ProtocolFile.tszFileName);
186182
if (0 != _xtaccess(tszFileDir, 0))
187183
{
188-
st_HDRParam.bIsClose = true;
189-
st_HDRParam.nHttpCode = 404;
190-
HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
184+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_NOTFOUND, "file not found");
185+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
191186
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
192187
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求添加文件到数据库失败,文件不存在,文件;%s"), lpszClientAddr, tszFileDir);
193188
return false;
@@ -222,9 +217,8 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
222217

223218
if (!st_ServiceCfg.st_XSql.bEnable)
224219
{
225-
st_HDRParam.bIsClose = true;
226-
st_HDRParam.nHttpCode = 501;
227-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
220+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_NOENABLE, "function not enable");
221+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
228222
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
229223
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求删除文件:%s HASH失败,没有启用数据库,无法使用此功能!"), lpszClientAddr, ppSt_DBFile[i]->st_ProtocolFile.tszFileHash);
230224
return true;
@@ -257,9 +251,8 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
257251

258252
if (!st_ServiceCfg.st_XSql.bEnable)
259253
{
260-
st_HDRParam.bIsClose = true;
261-
st_HDRParam.nHttpCode = 501;
262-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
254+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_NOENABLE, "function not enable");
255+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
263256
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
264257
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求删除文件:%s 名称失败,没有启用数据库,无法使用此功能!"), lpszClientAddr, tszFileDir);
265258
return true;
@@ -323,10 +316,8 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
323316
{
324317
if (!SystemApi_File_CreateMutilFolder(tszRealDir))
325318
{
326-
st_HDRParam.bIsClose = true;
327-
st_HDRParam.nHttpCode = 404;
328-
329-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
319+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVER, "create dir is failed");
320+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
330321
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
331322
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求创建文件夹:%s,失败,错误:%lX"), lpszClientAddr, tszRealDir, SystemApi_GetLastError());
332323
return false;
@@ -339,10 +330,8 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
339330
{
340331
if (!SystemApi_File_DeleteMutilFolder(tszRealDir))
341332
{
342-
st_HDRParam.bIsClose = true;
343-
st_HDRParam.nHttpCode = 404;
344-
345-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
333+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVER, "delete dir is failed");
334+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
346335
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
347336
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求删除文件夹:%s,失败,错误:%lX"), lpszClientAddr, tszRealDir, SystemApi_GetLastError());
348337
return false;
@@ -361,10 +350,8 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
361350
XENGINE_STORAGEBUCKET st_StorageBucket = {};
362351
if (!APIHelp_Distributed_CTStorage(tszBuckKey, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket, &st_StorageBucket))
363352
{
364-
st_HDRParam.bIsClose = true;
365-
st_HDRParam.nHttpCode = 404;
366-
367-
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
353+
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_NOTFOUND, "bucket not found");
354+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
368355
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
369356
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求获取BUCKET:%s,信息失败,错误:%lX"), lpszClientAddr, tszBuckKey, StorageHelp_GetLastError());
370357
return false;

0 commit comments

Comments
 (0)