Skip to content

Commit e2b2a13

Browse files
xengine-qytxengine-qyt
committed
modify:HTTP response encapsulation is now unified in the send function; HTTP responses all return 200, and whether they are correct or incorrect needs to be determined by the payload JSON
1 parent ee0ede3 commit e2b2a13

25 files changed

Lines changed: 225 additions & 514 deletions

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask.cpp‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ bool HTTPTask_TastPost_Verification(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
8383
if (!Verification_HTTP_GetType(pptszHDRList, nHDRCount, &nVType))
8484
{
8585
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
86-
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
86+
NetCore_TCPXCore_SendEx(xhHTTPSocket, lpszClientAddr, tszSDBuffer, nSDLen);
8787
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,验证方式:%d,错误:%lX"), lpszClientAddr, st_ServiceConfig.st_XVerifcation.nVType, Verification_GetLastError());
8888
return false;
8989
}
9090
//验证方式是否一致
9191
if (st_ServiceConfig.st_XVerifcation.nVType != nVType)
9292
{
9393
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
94-
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
94+
NetCore_TCPXCore_SendEx(xhHTTPSocket, lpszClientAddr, tszSDBuffer, nSDLen);
9595
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,验证方式错误,请求:%d,需求:%d"), lpszClientAddr, nVType, st_ServiceConfig.st_XVerifcation.nVType);
9696
return false;
9797
}
@@ -107,15 +107,15 @@ bool HTTPTask_TastPost_Verification(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
107107
{
108108
st_HDRParam.nHttpCode = 500;
109109
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
110-
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
110+
NetCore_TCPXCore_SendEx(xhHTTPSocket, lpszClientAddr, tszSDBuffer, nSDLen);
111111
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,GET请求验证服务:%s 失败,错误码:%lX"), lpszClientAddr, st_ServiceConfig.st_XVerifcation.tszAPIAuth, APIClient_GetLastError());
112112
return false;
113113
}
114114
if (200 != nHTTPCode)
115115
{
116116
st_HDRParam.nHttpCode = 500;
117117
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
118-
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
118+
NetCore_TCPXCore_SendEx(xhHTTPSocket, lpszClientAddr, tszSDBuffer, nSDLen);
119119
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,GET请求验证服务:%s 失败,错误:%d"), lpszClientAddr, st_ServiceConfig.st_XVerifcation.tszAPIAuth, nHTTPCode);
120120
return false;
121121
}
@@ -124,7 +124,7 @@ bool HTTPTask_TastPost_Verification(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
124124
{
125125
st_HDRParam.nHttpCode = 500;
126126
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
127-
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
127+
NetCore_TCPXCore_SendEx(xhHTTPSocket, lpszClientAddr, tszSDBuffer, nSDLen);
128128
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,返回内容:%s 错误,无法继续"), lpszClientAddr, ptszMSGBuffer);
129129
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
130130
return false;
@@ -155,7 +155,7 @@ bool HTTPTask_TastPost_Verification(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam,
155155
if (!bRet)
156156
{
157157
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
158-
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
158+
NetCore_TCPXCore_SendEx(xhHTTPSocket, lpszClientAddr, tszSDBuffer, nSDLen);
159159
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,验证处理错误,可能用户密码登信息不匹配,类型:%d"), lpszClientAddr, nVType);
160160
return false;
161161
}
@@ -167,15 +167,9 @@ bool HTTPTask_TastPost_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
167167
{
168168
bool bVerification = false;
169169
int nSDLen = 4096;
170-
int nRVLen = 4096;
171170
LPCXSTR lpszMethodPost = _X("POST");
172171
LPCXSTR lpszMethodGet = _X("GET");
173172
XCHAR tszSDBuffer[4096] = {};
174-
XCHAR tszRVBuffer[4096] = {};
175-
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam = {};
176-
177-
st_HDRParam.nHttpCode = 200; //HTTP CODE码
178-
st_HDRParam.bIsClose = true; //收到回复后就关闭
179173

180174
XCHAR** pptszList;
181175
XCHAR tszUrlName[128];
@@ -201,8 +195,7 @@ bool HTTPTask_TastPost_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
201195
{
202196
return true;
203197
}
204-
st_HDRParam.nHttpCode = 404;
205-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
198+
ModuleProtocol_Packet_Common(tszSDBuffer, &nSDLen, ERROR_XENGINE_PROTOCL_HTTP_FAILURE, _X("request url is incorrect"));
206199
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
207200
BaseLib_Memory_Free((XPPPMEM)&pptszList, nListCount);
208201
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,发送的URL请求参数不正确:%s"), lpszClientAddr, tszGBKBuffer);
@@ -255,8 +248,7 @@ bool HTTPTask_TastPost_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
255248

256249
if (0 != _tcsxncmp(lpszFuncName, tszUrlName, _tcsxlen(lpszFuncName)))
257250
{
258-
st_HDRParam.nHttpCode = 404;
259-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
251+
ModuleProtocol_Packet_Common(tszSDBuffer, &nSDLen, ERROR_XENGINE_PROTOCL_HTTP_FAILURE, _X("request url is incorrect"));
260252
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
261253
BaseLib_Memory_Free((XPPPMEM)&pptszList, nListCount);
262254
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,发送的URL请求参数不正确:%s"), lpszClientAddr, tszGBKBuffer);
@@ -266,8 +258,7 @@ bool HTTPTask_TastPost_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
266258
BaseLib_String_GetKeyValue(pptszList[0], "=", tszKey, tszValue);
267259
if (0 != _tcsxncmp(lpszParamFuncKey, tszKey, _tcsxlen(lpszParamFuncKey)))
268260
{
269-
st_HDRParam.nHttpCode = 404;
270-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
261+
ModuleProtocol_Packet_Common(tszSDBuffer, &nSDLen, ERROR_XENGINE_PROTOCL_HTTP_FAILURE, _X("request url is incorrect"));
271262
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
272263
BaseLib_Memory_Free((XPPPMEM)&pptszList, nListCount);
273264
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,发送的URL请求参数不正确:%s"), lpszClientAddr, tszGBKBuffer);
@@ -408,8 +399,7 @@ bool HTTPTask_TastPost_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
408399
}
409400
else
410401
{
411-
st_HDRParam.nHttpCode = 404;
412-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
402+
ModuleProtocol_Packet_Common(tszSDBuffer, &nSDLen, ERROR_XENGINE_PROTOCL_HTTP_FAILURE, _X("request url is incorrect"));
413403
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
414404
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,发送的请求不支持:%s，内容:\r\n%s"), lpszClientAddr, tszGBKBuffer, lpszMSGBuffer);
415405
}
@@ -546,8 +536,7 @@ bool HTTPTask_TastPost_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
546536
}
547537
else
548538
{
549-
st_HDRParam.nHttpCode = 404;
550-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszSDBuffer, &nSDLen, &st_HDRParam);
539+
ModuleProtocol_Packet_Common(tszSDBuffer, &nSDLen, ERROR_XENGINE_PROTOCL_HTTP_FAILURE, _X("request url is incorrect"));
551540
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen);
552541
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,发送的请求不支持:%s，内容:\r\n%s"), lpszClientAddr, tszGBKBuffer, lpszMSGBuffer);
553542
}

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ int main(int argc, char** argv)
564564
}
565565
else
566566
{
567-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,数据查询服务没有启用"));
567+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,HTTP验证服务没有启用"));
568568
}
569569
#ifndef _DEBUG
570570
//发送信息报告

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Network.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,16 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, bool bHeart)
7070
//////////////////////////////////////////////////////////////////////////
7171
bool XEngine_Network_Send(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen)
7272
{
73+
int nSDLen = 0;
74+
CXEngine_MemoryPoolEx m_MSGMemory(XENGINE_MEMORY_SIZE_MAX);
75+
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam = {}; //发送给客户端的参数
76+
77+
st_HDRParam.nHttpCode = 200; //HTTP CODE码
78+
st_HDRParam.bIsClose = true; //收到回复后就关闭
79+
80+
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, m_MSGMemory.get(), &nSDLen, &st_HDRParam, lpszMsgBuffer, nMsgLen);
7381
//发送数据给指定客户端
74-
if (!NetCore_TCPXCore_SendEx(xhHTTPSocket, lpszClientAddr, lpszMsgBuffer, nMsgLen))
82+
if (!NetCore_TCPXCore_SendEx(xhHTTPSocket, lpszClientAddr, m_MSGMemory.get(), nSDLen))
7583
{
7684
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,发送数据失败，错误:%lX"), lpszClientAddr, NetCore_GetLastError());
7785
return false;

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_TaskGet/TaskGet_APIModule.cpp‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,11 @@
33
bool HTTPTask_TaskGet_APIModule(LPCXSTR lpszClientAddr, LPCXSTR lpszQueryType, LPCXSTR lpszQueryStr, LPCXSTR lpszTPStr)
44
{
55
int nMsgLen = 4096;
6-
int nPktLen = 4096;
76
XCHAR tszMsgBuffer[4096] = {};
8-
XCHAR tszPktBuffer[4096] = {};
9-
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam = {}; //发送给客户端的参数
10-
11-
st_HDRParam.nHttpCode = 200; //HTTP CODE码
12-
st_HDRParam.bIsClose = true; //收到回复后就关闭
137

148
if (!st_ServiceConfig.st_XAPIModule.bEnable)
159
{
16-
ModuleProtocol_Packet_Common(tszPktBuffer, &nPktLen, 501, _X("function is closed"));
17-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
10+
ModuleProtocol_Packet_Common(tszMsgBuffer, &nMsgLen, ERROR_XENGINE_PROTOCL_HTTP_DISABLE, _X("function is closed"));
1811
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
1912
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的数据:%s 查询服务:%s 功能已经被服务器关闭,无法继续"), lpszClientAddr, lpszQueryType, lpszQueryStr);
2013
return false;
@@ -32,14 +25,12 @@ bool HTTPTask_TaskGet_APIModule(LPCXSTR lpszClientAddr, LPCXSTR lpszQueryType, L
3225

3326
if (!APIModule_PhoneNumber_Query(&st_PhoneInfo))
3427
{
35-
ModuleProtocol_Packet_Common(tszPktBuffer, &nPktLen, 404, _X("not found"));
36-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
28+
ModuleProtocol_Packet_Common(tszMsgBuffer, &nMsgLen, ERROR_XENGINE_PROTOCL_HTTP_NOTFOUND, _X("not found"));
3729
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
3830
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的数据:%s 查询服务:%s 失败,错误码:%lX"), lpszClientAddr, lpszQueryType, lpszQueryStr, APIPhone_GetLastError());
3931
return false;
4032
}
41-
ModuleProtocol_Packet_PhoneInfo(tszPktBuffer, &nPktLen, &st_PhoneInfo);
42-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
33+
ModuleProtocol_Packet_PhoneInfo(tszMsgBuffer, &nMsgLen, &st_PhoneInfo);
4334
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
4435
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的数据:%s 查询服务:%s 成功"), lpszClientAddr, lpszQueryType, lpszQueryStr);
4536
}
@@ -51,14 +42,12 @@ bool HTTPTask_TaskGet_APIModule(LPCXSTR lpszClientAddr, LPCXSTR lpszQueryType, L
5142

5243
if (!APIModule_IPAddr_Query(&st_IPAddr, lpszTPStr))
5344
{
54-
ModuleProtocol_Packet_Common(tszPktBuffer, &nPktLen, 404, _X("not found"));
55-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
45+
ModuleProtocol_Packet_Common(tszMsgBuffer, &nMsgLen, ERROR_XENGINE_PROTOCL_HTTP_NOTFOUND, _X("not found"));
5646
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
5747
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的数据:%s 查询服务:%s 失败,错误码:%lX"), lpszClientAddr, lpszQueryType, lpszQueryStr, APIPhone_GetLastError());
5848
return false;
5949
}
60-
ModuleProtocol_Packet_IPAddr(tszPktBuffer, &nPktLen, &st_IPAddr);
61-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
50+
ModuleProtocol_Packet_IPAddr(tszMsgBuffer, &nMsgLen, &st_IPAddr);
6251
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
6352
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的数据:%s 查询服务:%s 成功"), lpszClientAddr, lpszQueryType, lpszQueryStr);
6453
}
@@ -69,21 +58,18 @@ bool HTTPTask_TaskGet_APIModule(LPCXSTR lpszClientAddr, LPCXSTR lpszQueryType, L
6958

7059
if (!APIModule_MACInfo_Query(&st_MACInfo))
7160
{
72-
ModuleProtocol_Packet_Common(tszPktBuffer, &nPktLen, 404, _X("not found"));
73-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
61+
ModuleProtocol_Packet_Common(tszMsgBuffer, &nMsgLen, ERROR_XENGINE_PROTOCL_HTTP_NOTFOUND, _X("not found"));
7462
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
7563
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的数据:%s 查询服务:%s 失败,错误码:%lX"), lpszClientAddr, lpszQueryType, lpszQueryStr, APIPhone_GetLastError());
7664
return false;
7765
}
78-
ModuleProtocol_Packet_MacInfo(tszPktBuffer, &nPktLen, &st_MACInfo);
79-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
66+
ModuleProtocol_Packet_MacInfo(tszMsgBuffer, &nMsgLen, &st_MACInfo);
8067
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
8168
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的数据:%s 查询服务:%s 成功"), lpszClientAddr, lpszQueryType, lpszQueryStr);
8269
}
8370
else
8471
{
85-
ModuleProtocol_Packet_Common(tszPktBuffer, &nPktLen, 400, _X("not support"));
86-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
72+
ModuleProtocol_Packet_Common(tszMsgBuffer, &nMsgLen, ERROR_XENGINE_PROTOCL_HTTP_NOTSUPPORT, _X("not support"));
8773
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
8874
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的数据:%s 查询服务:%s 失败,不支持的查询类型"), lpszClientAddr, lpszQueryType, lpszQueryStr);
8975
}

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_TaskGet/TaskGet_Bank.cpp‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,15 @@
44
bool HTTPTask_TaskGet_BankInfo(LPCXSTR lpszClientAddr, LPCXSTR lpszBankNumber)
55
{
66
int nMsgLen = 4096;
7-
int nPktLen = 4096;
87
int nBLen = 0;
9-
XCHAR* ptszBodyBuffer;
10-
XCHAR tszMsgBuffer[4096];
11-
XCHAR tszPktBuffer[4096];
12-
XCHAR tszUrlBuffer[XPATH_MAX];
13-
XENGINE_BANKINFO st_BankInfo;
14-
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam; //发送给客户端的参数
15-
16-
memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
17-
memset(tszPktBuffer, '\0', sizeof(tszPktBuffer));
18-
memset(tszUrlBuffer, '\0', XPATH_MAX);
19-
memset(&st_BankInfo, '\0', sizeof(XENGINE_BANKINFO));
20-
memset(&st_HDRParam, '\0', sizeof(RFCCOMPONENTS_HTTP_HDRPARAM));
21-
22-
st_HDRParam.nHttpCode = 200; //HTTP CODE码
23-
st_HDRParam.bIsClose = true; //收到回复后就关闭
8+
XCHAR* ptszBodyBuffer = NULL;
9+
XCHAR tszMsgBuffer[4096] = {};
10+
XCHAR tszUrlBuffer[XPATH_MAX] = {};
11+
XENGINE_BANKINFO st_BankInfo = {};
2412

2513
if (!st_ServiceConfig.st_XSql.bEnable)
2614
{
27-
ModuleProtocol_Packet_Common(tszPktBuffer, &nPktLen, 501, _X("function is closed"));
28-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
15+
ModuleProtocol_Packet_Common(tszMsgBuffer, &nMsgLen, ERROR_XENGINE_PROTOCL_HTTP_DISABLE, _X("function is closed"));
2916
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
3017
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的银行卡查询功能已经被服务器关闭,无法继续"), lpszClientAddr);
3118
return false;
@@ -36,9 +23,8 @@ bool HTTPTask_TaskGet_BankInfo(LPCXSTR lpszClientAddr, LPCXSTR lpszBankNumber)
3623
//解析JSON信息
3724
if (!ModuleProtocol_Parse_Bank(ptszBodyBuffer, nBLen, &st_BankInfo))
3825
{
39-
ModuleProtocol_Packet_BankQuery(tszPktBuffer, &nPktLen, NULL, 1001, _X("banknumber is corrent"));
4026
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszBodyBuffer);
41-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
27+
ModuleProtocol_Packet_Common(tszMsgBuffer, &nMsgLen, ERROR_XENGINE_PROTOCL_HTTP_NOTFOUND, _X("bank number is incorrent"));
4228
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
4329
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的银行卡号码错误:%s"), lpszClientAddr, lpszBankNumber);
4430
return false;
@@ -47,15 +33,13 @@ bool HTTPTask_TaskGet_BankInfo(LPCXSTR lpszClientAddr, LPCXSTR lpszBankNumber)
4733
//查询对应名称
4834
if (!ModuleDatabase_Bank_Query(&st_BankInfo))
4935
{
50-
ModuleProtocol_Packet_BankQuery(tszPktBuffer, &nPktLen, NULL, 1010, _X("not found"));
51-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
36+
ModuleProtocol_Packet_Common(tszMsgBuffer, &nMsgLen, ERROR_XENGINE_PROTOCL_HTTP_NOTFOUND, _X("bank number is incorrent"));
5237
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
5338
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求的银行卡信息没有找到:%s"), lpszClientAddr, lpszBankNumber);
5439
return false;
5540
}
5641
//打包发送
57-
ModuleProtocol_Packet_BankQuery(tszPktBuffer, &nPktLen, &st_BankInfo);
58-
HttpProtocol_Server_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
42+
ModuleProtocol_Packet_BankQuery(tszMsgBuffer, &nMsgLen, &st_BankInfo);
5943
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
6044
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,发送银行卡信息获取请求给服务器,查询号码:%s"), lpszClientAddr, lpszBankNumber);
6145
return true;

0 commit comments

Comments
 (0)