Skip to content

Commit 40ee635

Browse files
xengine-qytxengine-qyt
committed
delete:redundant functions
1 parent e40b075 commit 40ee635

File tree

6 files changed

+9
-98
lines changed

6 files changed

+9
-98
lines changed

‎XEngine_Source/MQCore_ProtocolModule/MQCore_ProtocolModule.def‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ EXPORTS
44
Protocol_GetLastError
55

66
ProtocolModule_Packet_Common
7-
ProtocolModule_Packet_HTTPCommon
87
ProtocolModule_Packet_MQNumber
98
ProtocolModule_Packet_PassAuth
109
ProtocolModule_Packet_PassUser

‎XEngine_Source/MQCore_ProtocolModule/ProtocolModule_Packet/ProtocolModule_Packet.cpp‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -82,60 +82,6 @@ bool CProtocolModule_Packet::ProtocolModule_Packet_Common(int nNetType, XENGINE_
8282
return true;
8383
}
8484
/********************************************************************
85-
函数名称：ProtocolModule_Packet_HTTPCommon
86-
函数功能：HTTP通用消息打包
87-
参数.一：ptszMsgBuffer
88-
In/Out：Out
89-
类型：字符指针
90-
可空：N
91-
意思：导出包装好的缓冲区
92-
参数.二：pInt_MsgLen
93-
In/Out：Out
94-
类型：整数型指针
95-
可空：N
96-
意思：输出包装大小
97-
参数.三：nHTTPCode
98-
In/Out：In
99-
类型：整数型
100-
可空：Y
101-
意思：输入返回的code
102-
参数.四：lpszMSGBuffer
103-
In/Out：In
104-
类型：常量字符指针
105-
可空：N
106-
意思：输入返回的消息
107-
返回值
108-
类型：逻辑型
109-
意思：是否成功
110-
备注：
111-
*********************************************************************/
112-
bool CProtocolModule_Packet::ProtocolModule_Packet_HTTPCommon(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nHTTPCode /* = 0 */, LPCXSTR lpszMSGBuffer /* = NULL */)
113-
{
114-
Protocol_IsErrorOccur = false;
115-
116-
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
117-
{
118-
Protocol_IsErrorOccur = true;
119-
Protocol_dwErrorCode = ERROR_MQ_MODULE_PROTOCOL_PARAMENT;
120-
return false;
121-
}
122-
Json::Value st_JsonRoot;
123-
124-
st_JsonRoot["code"] = nHTTPCode;
125-
if (NULL == lpszMSGBuffer)
126-
{
127-
st_JsonRoot["msg"] = "success";
128-
}
129-
else
130-
{
131-
st_JsonRoot["msg"] = lpszMSGBuffer;
132-
}
133-
134-
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
135-
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
136-
return true;
137-
}
138-
/********************************************************************
13985
函数名称：ProtocolModule_Packet_MQNumber
14086
函数功能：获取序列打包函数
14187
参数.一：pSt_ProtocolHdr

‎XEngine_Source/MQCore_ProtocolModule/ProtocolModule_Packet/ProtocolModule_Packet.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class CProtocolModule_Packet
2626
~CProtocolModule_Packet();
2727
public:
2828
bool ProtocolModule_Packet_Common(int nNetType, XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, XENGINE_PROTOCOL_XMQ* pSt_MQProtocol, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBuffer = NULL, int nMsgLen = 0);
29-
bool ProtocolModule_Packet_HTTPCommon(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nHTTPCode = 0, LPCXSTR lpszMSGBuffer = NULL);
3029
bool ProtocolModule_Packet_MQNumber(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, XENGINE_MQNUMBER* pSt_MQNumber, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nNetType);
3130
bool ProtocolModule_Packet_PassAuth(XENGINE_PROTOCOL_USERAUTH* pSt_ProtocolAuth, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode);
3231
bool ProtocolModule_Packet_PassUser(XENGINE_PROTOCOL_USERINFO* pSt_ProtocolUser, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode);

‎XEngine_Source/MQCore_ProtocolModule/Protocol_Define.h‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -62,35 +62,6 @@ extern "C" XLONG Protocol_GetLastError(int* pInt_SysError = NULL);
6262
*********************************************************************/
6363
extern "C" bool ProtocolModule_Packet_Common(int nNetType, XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, XENGINE_PROTOCOL_XMQ* pSt_MQProtocol, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBuffer = NULL, int nMsgLen = 0);
6464
/********************************************************************
65-
函数名称：ProtocolModule_Packet_HTTPCommon
66-
函数功能：HTTP通用消息打包
67-
参数.一：ptszMsgBuffer
68-
In/Out：Out
69-
类型：字符指针
70-
可空：N
71-
意思：导出包装好的缓冲区
72-
参数.二：pInt_MsgLen
73-
In/Out：Out
74-
类型：整数型指针
75-
可空：N
76-
意思：输出包装大小
77-
参数.三：nHTTPCode
78-
In/Out：In
79-
类型：整数型
80-
可空：Y
81-
意思：输入返回的code
82-
参数.四：lpszMSGBuffer
83-
In/Out：In
84-
类型：常量字符指针
85-
可空：N
86-
意思：输入返回的消息
87-
返回值
88-
类型：逻辑型
89-
意思：是否成功
90-
备注：
91-
*********************************************************************/
92-
extern "C" bool ProtocolModule_Packet_HTTPCommon(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nHTTPCode = 0, LPCXSTR lpszMSGBuffer = NULL);
93-
/********************************************************************
9465
函数名称：ProtocolModule_Packet_MQNumber
9566
函数功能：获取序列打包函数
9667
参数.一：pSt_ProtocolHdr

‎XEngine_Source/MQCore_ProtocolModule/pch.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ extern "C" bool ProtocolModule_Packet_Common(int nNetType, XENGINE_PROTOCOLHDR *
3535
{
3636
return m_ProtocolPacket.ProtocolModule_Packet_Common(nNetType, pSt_ProtocolHdr, pSt_MQProtocol, ptszMsgBuffer, pInt_MsgLen, lpszMsgBuffer, nMsgLen);
3737
}
38-
extern "C" bool ProtocolModule_Packet_HTTPCommon(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nHTTPCode, LPCXSTR lpszMSGBuffer)
39-
{
40-
return m_ProtocolPacket.ProtocolModule_Packet_HTTPCommon(ptszMsgBuffer, pInt_MsgLen, nHTTPCode, lpszMSGBuffer);
41-
}
4238
extern "C" bool ProtocolModule_Packet_MQNumber(XENGINE_PROTOCOLHDR * pSt_ProtocolHdr, XENGINE_MQNUMBER * pSt_MQNumber, XCHAR * ptszMsgBuffer, int* pInt_MsgLen, int nNetType)
4339
{
4440
return m_ProtocolPacket.ProtocolModule_Packet_MQNumber(pSt_ProtocolHdr, pSt_MQNumber, ptszMsgBuffer, pInt_MsgLen, nNetType);

‎XEngine_Source/XEngine_MQServiceApp/MQService_HTTPTask/MQService_HTTPPost.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
2323
XENGINE_PROTOCOL_USERINFO st_UserInfo = {};
2424
if (!ProtocolModule_Parse_Register(lpszMsgBuffer, nMsgLen, &st_UserInfo))
2525
{
26-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_PARSE, _X("json load parse is failure"));
26+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_PARSE, _X("json load parse is failure"));
2727
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
2828
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求注册消息失败,负载内容错误:%s"), lpszClientAddr, lpszMsgBuffer);
2929
return false;
3030
}
3131
if (DBModule_MQUser_UserQuery(&st_UserInfo))
3232
{
33-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_EXISTED, _X("user is existed"));
33+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_EXISTED, _X("user is existed"));
3434
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
3535
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求用户注册失败,用户已经存在,错误:%lX"), lpszClientAddr, SessionModule_GetLastError());
3636
return false;
3737
}
3838
if (!DBModule_MQUser_UserInsert(&st_UserInfo))
3939
{
40-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_SERVICE, _X("service is failure"));
40+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_SERVICE, _X("service is failure"));
4141
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
4242
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求用户注册失败,插入数据库失败,错误:%lX"), lpszClientAddr, SessionModule_GetLastError());
4343
return false;
@@ -55,7 +55,7 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
5555
if (200 != nHTTPCode)
5656
{
5757
DBModule_MQUser_UserDelete(&st_UserInfo); //删除
58-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_APIREG, _X("service is failure"));
58+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_APIREG, _X("service is failure"));
5959
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
6060
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求远程注册失败,HTTPCode:%d"), lpszClientAddr, nHTTPCode);
6161
return false;
@@ -75,7 +75,7 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
7575
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("HTTP消息端:%s,绑定消息队列主题失败,主题名称:%s,错误：%lX"), lpszClientAddr, st_Userkey.tszKeyName, DBModule_GetLastError());
7676
}
7777
}
78-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen);
78+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen);
7979
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
8080
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求用户注册成功,用户名:%s,密码:%s"), lpszClientAddr, st_UserInfo.tszUserName, st_UserInfo.tszUserPass);
8181
}
@@ -84,14 +84,14 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
8484
XENGINE_PROTOCOL_USERINFO st_UserInfo = {};
8585
if (!ProtocolModule_Parse_Register(lpszMsgBuffer, nMsgLen, &st_UserInfo))
8686
{
87-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_PARSE, _X("json load parse is failure"));
87+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_PARSE, _X("json load parse is failure"));
8888
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
8989
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求注册消息失败,负载内容错误:%s"), lpszClientAddr, lpszMsgBuffer);
9090
return false;
9191
}
9292
if (!DBModule_MQUser_UserDelete(&st_UserInfo))
9393
{
94-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_DELETE, _X("delete user failure"));
94+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_DELETE, _X("delete user failure"));
9595
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
9696
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求用户删除失败,删除数据库失败,错误:%lX"), lpszClientAddr, SessionModule_GetLastError());
9797
return false;
@@ -108,7 +108,7 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
108108
APIClient_Http_Request(_X("POST"), st_ServiceCfg.st_XPass.tszPassUNReg, tszSDBuffer, &nHTTPCode, NULL, NULL, NULL, NULL, &st_HTTPParament);
109109
if (200 != nHTTPCode)
110110
{
111-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_APIDEL, _X("delete user failure"));
111+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_APIDEL, _X("delete user failure"));
112112
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
113113
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求远程注销失败,错误:%lX,HTTPCode:%d"), lpszClientAddr, nHTTPCode);
114114
}
@@ -124,7 +124,7 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
124124

125125
DBModule_MQUser_KeyDelete(&st_UserKey);
126126
DBModule_MQUser_OwnerDelete(&st_DBOwner);
127-
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen);
127+
ProtocolModule_Packet_Http(tszSDBuffer, &nSDLen);
128128
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
129129
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求用户删除成功,用户名:%s"), lpszClientAddr, st_UserInfo.tszUserName);
130130
}

0 commit comments

Comments
 (0)