Skip to content

Commit 9a2471c

Browse files
xengine-qytxengine-qyt
committed
added P2P file request with query
support broadcase file query
1 parent 0a94fac commit 9a2471c

File tree

18 files changed

+260
-99
lines changed

18 files changed

+260
-99
lines changed

‎XEngine_Source/StorageModule_Config/Config_Define.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ typedef struct tag_XEngine_ServerConfig
8989
}st_XLimit;
9090
struct
9191
{
92+
BOOL bBroad;
93+
int nSDPort;
94+
int nRVPort;
9295
TCHAR tszQQWryFile[MAX_PATH];
9396
}st_P2xp;
9497
struct

‎XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,16 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
165165
pSt_ServerConfig->st_XLimit.nMaxDNLoader = st_JsonXLimit["nMaxDNLoad"].asInt64();
166166
pSt_ServerConfig->st_XLimit.nMaxUPLoader = st_JsonXLimit["nMaxUPLoad"].asInt64();
167167

168-
if (st_JsonRoot["XP2xp"].empty() || (1 != st_JsonRoot["XP2xp"].size()))
168+
if (st_JsonRoot["XP2xp"].empty() || (4 != st_JsonRoot["XP2xp"].size()))
169169
{
170170
Config_IsErrorOccur = TRUE;
171171
Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_P2XP;
172172
return FALSE;
173173
}
174174
Json::Value st_JsonP2xp = st_JsonRoot["XP2xp"];
175+
pSt_ServerConfig->st_P2xp.bBroad = st_JsonP2xp["bBroad"].asInt();
176+
pSt_ServerConfig->st_P2xp.nRVPort = st_JsonP2xp["nRVPort"].asInt();
177+
pSt_ServerConfig->st_P2xp.nSDPort = st_JsonP2xp["nSDPort"].asInt();
175178
_tcscpy(pSt_ServerConfig->st_P2xp.tszQQWryFile, st_JsonP2xp["tszQQWryFile"].asCString());
176179

177180
if (st_JsonRoot["XVer"].empty() || (1 != st_JsonRoot["XVer"].size()))

‎XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp‎

Lines changed: 66 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -55,68 +55,85 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
5555
memset(tszAPIName, '\0', sizeof(tszAPIName));
5656
memset(&st_HDRParam, '\0', sizeof(RFCCOMPONENTS_HTTP_HDRPARAM));
5757

58-
LPCTSTR lpszMethodName = _T("POST");
59-
if (0 != _tcsncmp(lpszMethodName, pSt_HTTPParam->tszHttpMethod, _tcslen(lpszMethodName)))
58+
LPCTSTR lpszMethodPost = _T("POST");
59+
LPCTSTR lpszMethodGet = _T("GET");
60+
if (0 == _tcsnicmp(lpszMethodPost, pSt_HTTPParam->tszHttpMethod, _tcslen(lpszMethodPost)))
6061
{
61-
st_HDRParam.bIsClose = TRUE;
62-
st_HDRParam.nHttpCode = 405;
62+
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, lpszMethodPost, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPCENTER))
63+
{
64+
return FALSE;
65+
}
66+
if (st_ServiceCfg.st_XProxy.st_XProxyAuth.bAuth)
67+
{
68+
st_HDRParam.bAuth = TRUE;
69+
}
70+
//使用重定向?
71+
if (APIHelp_Distributed_IsMode(st_LoadbalanceCfg.st_LoadBalance.pStl_ListUseMode, STORAGE_NETTYPE_HTTPCENTER))
72+
{
73+
TCHAR tszHdrBuffer[1024];
74+
TCHAR tszStorageAddr[128];
6375

64-
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
65-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
66-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,发送的方法不支持"), lpszClientAddr);
67-
return FALSE;
68-
}
69-
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, lpszMethodName, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPCENTER))
70-
{
71-
return FALSE;
72-
}
73-
if (st_ServiceCfg.st_XProxy.st_XProxyAuth.bAuth)
74-
{
75-
st_HDRParam.bAuth = TRUE;
76-
}
77-
//使用重定向?
78-
if (APIHelp_Distributed_IsMode(st_LoadbalanceCfg.st_LoadBalance.pStl_ListUseMode, STORAGE_NETTYPE_HTTPCENTER))
79-
{
80-
TCHAR tszHdrBuffer[1024];
81-
TCHAR tszStorageAddr[128];
76+
memset(tszHdrBuffer, '\0', sizeof(tszHdrBuffer));
77+
memset(tszStorageAddr, '\0', sizeof(tszStorageAddr));
8278

83-
memset(tszHdrBuffer, '\0', sizeof(tszHdrBuffer));
84-
memset(tszStorageAddr, '\0', sizeof(tszStorageAddr));
79+
st_HDRParam.bIsClose = TRUE;
80+
st_HDRParam.nHttpCode = 302;
8581

86-
st_HDRParam.bIsClose = TRUE;
87-
st_HDRParam.nHttpCode = 302;
82+
APIHelp_Distributed_RandomAddr(st_LoadbalanceCfg.st_LoadBalance.pStl_ListCenter, tszStorageAddr);
83+
_stprintf(tszHdrBuffer, _T("Location: %s%s\r\n"), tszStorageAddr, pSt_HTTPParam->tszHttpUri);
8884

89-
APIHelp_Distributed_RandomAddr(st_LoadbalanceCfg.st_LoadBalance.pStl_ListCenter, tszStorageAddr);
90-
_stprintf(tszHdrBuffer, _T("Location: %s%s\r\n"), tszStorageAddr, pSt_HTTPParam->tszHttpUri);
85+
RfcComponents_HttpServer_SendMsgEx(xhDLHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHdrBuffer);
86+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
87+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求的函数被要求重定向到:%s%s"), lpszClientAddr, tszStorageAddr, pSt_HTTPParam->tszHttpUri);
88+
return TRUE;
89+
}
9190

92-
RfcComponents_HttpServer_SendMsgEx(xhDLHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHdrBuffer);
93-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
94-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求的函数被要求重定向到:%s%s"), lpszClientAddr, tszStorageAddr, pSt_HTTPParam->tszHttpUri);
95-
return TRUE;
96-
}
91+
if (!RfcComponents_HttpHelp_GetUrlApi(pSt_HTTPParam->tszHttpUri, tszAPIVersion, tszAPIMethod, tszAPIName))
92+
{
93+
st_HDRParam.bIsClose = TRUE;
94+
st_HDRParam.nHttpCode = 404;
9795

98-
if (!RfcComponents_HttpHelp_GetUrlApi(pSt_HTTPParam->tszHttpUri, tszAPIVersion, tszAPIMethod, tszAPIName))
96+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
97+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
98+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,请求的API不支持"), lpszClientAddr);
99+
return FALSE;
100+
}
101+
//通知类型.用于多服务器
102+
if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_PASS, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_PASS)))
103+
{
104+
XEngine_Task_Pass(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
105+
}
106+
else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_QUERY, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_QUERY)))
107+
{
108+
XEngine_Task_Query(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
109+
}
110+
else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_EVENT, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_EVENT)))
111+
{
112+
XEngine_Task_Event(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
113+
}
114+
}
115+
else if (0 == _tcsnicmp(lpszMethodGet, pSt_HTTPParam->tszHttpMethod, _tcslen(lpszMethodGet)))
116+
{
117+
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, lpszMethodGet, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPCENTER))
118+
{
119+
return FALSE;
120+
}
121+
if (st_ServiceCfg.st_XProxy.st_XProxyAuth.bAuth)
122+
{
123+
st_HDRParam.bAuth = TRUE;
124+
}
125+
XEngine_Task_P2p(pSt_HTTPParam->tszHttpUri, lpszClientAddr, pSt_HTTPParam);
126+
}
127+
else
99128
{
100129
st_HDRParam.bIsClose = TRUE;
101-
st_HDRParam.nHttpCode = 404;
130+
st_HDRParam.nHttpCode = 405;
102131

103132
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
104133
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
105-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,请求的API不支持"), lpszClientAddr);
134+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,发送的方法不支持"), lpszClientAddr);
106135
return FALSE;
107136
}
108-
//通知类型.用于多服务器
109-
if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_PASS, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_PASS)))
110-
{
111-
XEngine_Task_Pass(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
112-
}
113-
else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_QUERY, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_QUERY)))
114-
{
115-
XEngine_Task_Query(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
116-
}
117-
else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_TASK_EVENT, tszAPIMethod, _tcslen(XENGINE_STORAGE_APP_TASK_EVENT)))
118-
{
119-
XEngine_Task_Event(tszAPIName, lpszClientAddr, lpszMsgBuffer, nMsgLen, pSt_HTTPParam, pptszListHdr, nHdrCount);
120-
}
137+
121138
return TRUE;
122139
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ extern XHANDLE xhDLHttp;
8989
extern XHANDLE xhCenterHttp;
9090
extern XNETHANDLE xhP2XPPacket;
9191

92+
extern SOCKET hBroadSocket;
93+
extern shared_ptr<std::thread> pSTDThread;
94+
9295
extern XENGINE_SERVERCONFIG st_ServiceCfg;
9396
extern XENGINE_LBCONFIG st_LoadbalanceCfg;
9497

@@ -101,6 +104,7 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
101104
#include "Storage_APPTask/Storage_TaskEvent.h"
102105
#include "Storage_APPTask/Storage_TaskPass.h"
103106
#include "Storage_APPTask/Storage_TaskQuery.h"
107+
#include "Storage_APPTask/Storage_TaskP2p.h"
104108
#include "Storage_APPHelp/Storage_APPHelp.h"
105109

106110
#ifdef _WINDOWS

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskEvent.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ BOOL XEngine_Task_Event(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lps
2222

2323
memset(tszContentStr, '\0', MAX_PATH);
2424
memset(tszBoundarTmp, '\0', MAX_PATH);
25-
memset(tszContentStr, '\0', MAX_PATH);
2625
memset(tszFileDir, '\0', MAX_PATH);
2726
memset(tszBoundarStr, '\0', sizeof(tszBoundarStr));
2827
memset(&st_DBFile, '\0', sizeof(XSTORAGECORE_DBFILE));

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskP2p.cpp‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
#include "../StorageApp_Hdr.h"
2+
3+
XHTHREAD XEngine_Task_P2PThread()
4+
{
5+
TCHAR tszMsgBuffer[2048];
6+
TCHAR tszIPAddr[128];
7+
TCHAR tszFileName[MAX_PATH];
8+
TCHAR tszFileHash[MAX_PATH];
9+
10+
while (bIsRun)
11+
{
12+
int nMsgLen = 2048;
13+
memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
14+
memset(tszFileName, '\0', MAX_PATH);
15+
memset(tszFileHash, '\0', MAX_PATH);
16+
17+
if (NetCore_BroadCast_Recv(hBroadSocket, tszMsgBuffer, &nMsgLen, tszIPAddr))
18+
{
19+
//收到文件查询请求
20+
if (XStorageProtocol_Core_REQQueryFile(tszMsgBuffer, NULL, NULL, tszFileName, tszFileHash))
21+
{
22+
//查询文件是否存在数据库,不存在不关心
23+
if (0 != st_ServiceCfg.st_XSql.nSQLType)
24+
{
25+
int nListCount;
26+
XSTORAGECORE_DBFILE** pppSt_ListFile;
27+
if (1 == st_ServiceCfg.st_XSql.nSQLType)
28+
{
29+
XStorageSQL_File_FileQuery(&pppSt_ListFile, &nListCount, NULL, NULL, tszFileName, tszFileHash);
30+
}
31+
else
32+
{
33+
XStorage_SQLite_FileQuery(&pppSt_ListFile, &nListCount, NULL, NULL, tszFileName, tszFileHash);
34+
}
35+
if (nListCount > 0)
36+
{
37+
XStorageProtocol_Core_REPQueryFile(tszMsgBuffer, &nMsgLen, &pppSt_ListFile, nListCount);
38+
BaseLib_OperatorMemory_Free((XPPPMEM)&pppSt_ListFile, nListCount);
39+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("广播端:%s,请求查询文件成功,列表个数:%d"), tszIPAddr, nListCount);
40+
}
41+
}
42+
}
43+
}
44+
}
45+
return 0;
46+
}
47+
BOOL XEngine_Task_P2p(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam)
48+
{
49+
int nSDLen = 2048;
50+
int nRVLen = 2048;
51+
int nMsgLen = 2048;
52+
TCHAR tszSDBuffer[2048];
53+
TCHAR tszRVBuffer[2048];
54+
TCHAR tszMsgBuffer[2048];
55+
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam;
56+
57+
memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
58+
memset(tszRVBuffer, '\0', sizeof(tszRVBuffer));
59+
memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
60+
memset(&st_HDRParam, '\0', sizeof(RFCCOMPONENTS_HTTP_HDRPARAM));
61+
//根据使用模式来操作
62+
if (st_ServiceCfg.st_P2xp.bBroad)
63+
{
64+
st_HDRParam.bIsClose = TRUE;
65+
st_HDRParam.nHttpCode = 405;
66+
67+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam);
68+
XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
69+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,暂时不支持的请求"), lpszClientAddr);
70+
return FALSE;
71+
}
72+
else
73+
{
74+
SOCKET hSDSocket;
75+
TCHAR tszIPAddr[128];
76+
77+
memset(tszIPAddr, '\0', sizeof(tszIPAddr));
78+
//开始广播请求文件
79+
XStorageProtocol_Client_REQQueryFile(tszSDBuffer, &nSDLen, NULL, lpszFileHash);
80+
if (!NetCore_BroadCast_SendInit(&hSDSocket, st_ServiceCfg.st_P2xp.nSDPort, st_ServiceCfg.tszIPAddr))
81+
{
82+
st_HDRParam.bIsClose = TRUE;
83+
st_HDRParam.nHttpCode = 500;
84+
85+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam);
86+
XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
87+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,初始化广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
88+
return FALSE;
89+
}
90+
if (NetCore_BroadCast_Send(hSDSocket, tszSDBuffer, nSDLen))
91+
{
92+
st_HDRParam.bIsClose = TRUE;
93+
st_HDRParam.nHttpCode = 500;
94+
95+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam);
96+
XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
97+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,发送广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
98+
NetCore_BroadCast_Close(hSDSocket);
99+
return FALSE;
100+
}
101+
if (!NetCore_BroadCast_Recv(hSDSocket, tszRVBuffer, &nRVLen, tszIPAddr, 2000))
102+
{
103+
st_HDRParam.bIsClose = TRUE;
104+
st_HDRParam.nHttpCode = 404;
105+
106+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam);
107+
XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
108+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,发送广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
109+
NetCore_BroadCast_Close(hSDSocket);
110+
return FALSE;
111+
}
112+
st_HDRParam.bIsClose = TRUE;
113+
st_HDRParam.nHttpCode = 200;
114+
115+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszRVBuffer, nRVLen);
116+
XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
117+
NetCore_BroadCast_Close(hSDSocket);
118+
printf("%s\n", tszRVBuffer);
119+
}
120+
121+
return TRUE;
122+
}

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskP2p.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#pragma once
2+
3+
XHTHREAD XEngine_Task_P2PThread();
4+
BOOL XEngine_Task_P2p(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam);

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskQuery.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ BOOL XEngine_Task_Query(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lps
3131
XStorageProtocol_Core_REQQueryFile(lpszMsgBuffer, tszTimeStart, tszTimeEnd, tszFileHash);
3232

3333
if (0 == st_ServiceCfg.st_XSql.nSQLType)
34+
{
35+
st_HDRParam.bIsClose = TRUE;
36+
st_HDRParam.nHttpCode = 406;
37+
38+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
39+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
40+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("业务客户端:%s,请求查询文件列表失败,服务器没有启用这个功能"), lpszClientAddr);
41+
}
42+
else
3443
{
3544
if (1 == st_ServiceCfg.st_XSql.nSQLType)
3645
{
@@ -49,15 +58,6 @@ BOOL XEngine_Task_Query(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lps
4958
BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListFile, nListCount);
5059
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求查询文件列表成功,列表个数:%d"), lpszClientAddr, nListCount);
5160
}
52-
else
53-
{
54-
st_HDRParam.bIsClose = TRUE;
55-
st_HDRParam.nHttpCode = 406;
56-
57-
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
58-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
59-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("业务客户端:%s,请求查询文件列表失败,服务器没有启用这个功能"), lpszClientAddr);
60-
}
6161
}
6262
return TRUE;
6363
}

0 commit comments

Comments
 (0)