Skip to content

Commit e40b075

Browse files
xengine-qytxengine-qyt
committed
fixed:delete not parse protocol
update:depend library
1 parent 0154571 commit e40b075

File tree

4 files changed

+31
-3
lines changed

4 files changed

+31
-3
lines changed

‎XEngine_Source/XEngine_Depend‎

Submodule XEngine_Depend updated 23 files

‎XEngine_Source/XEngine_MQServiceApp.sln‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MQCore_MemoryCache", "MQCor
5050
EndProject
5151
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MQCore_HelpModule", "MQCore_HelpModule\MQCore_HelpModule.vcxproj", "{4B061F8B-A783-45EA-A8D1-78F9668C49D2}"
5252
EndProject
53+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_Token", "XEngine_Depend\XEngine_Module\XEngine_Token\XEngine_Token.vcxproj", "{E17E889F-D826-413F-854E-DBA6000B4DA7}"
54+
EndProject
5355
Global
5456
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5557
Debug|ARM64 = Debug|ARM64
@@ -168,13 +170,26 @@ Global
168170
{4B061F8B-A783-45EA-A8D1-78F9668C49D2}.Release|x64.Build.0 = Release|x64
169171
{4B061F8B-A783-45EA-A8D1-78F9668C49D2}.Release|x86.ActiveCfg = Release|Win32
170172
{4B061F8B-A783-45EA-A8D1-78F9668C49D2}.Release|x86.Build.0 = Release|Win32
173+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Debug|ARM64.ActiveCfg = Debug|ARM64
174+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Debug|ARM64.Build.0 = Debug|ARM64
175+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Debug|x64.ActiveCfg = Debug|x64
176+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Debug|x64.Build.0 = Debug|x64
177+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Debug|x86.ActiveCfg = Debug|Win32
178+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Debug|x86.Build.0 = Debug|Win32
179+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Release|ARM64.ActiveCfg = Release|ARM64
180+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Release|ARM64.Build.0 = Release|ARM64
181+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Release|x64.ActiveCfg = Release|x64
182+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Release|x64.Build.0 = Release|x64
183+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Release|x86.ActiveCfg = Release|Win32
184+
{E17E889F-D826-413F-854E-DBA6000B4DA7}.Release|x86.Build.0 = Release|Win32
171185
EndGlobalSection
172186
GlobalSection(SolutionProperties) = preSolution
173187
HideSolutionNode = FALSE
174188
EndGlobalSection
175189
GlobalSection(NestedProjects) = preSolution
176190
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {BAC91AAE-D438-4999-9541-EB8804B12F0C}
177191
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {BAC91AAE-D438-4999-9541-EB8804B12F0C}
192+
{E17E889F-D826-413F-854E-DBA6000B4DA7} = {BAC91AAE-D438-4999-9541-EB8804B12F0C}
178193
EndGlobalSection
179194
GlobalSection(ExtensibilityGlobals) = postSolution
180195
SolutionGuid = {EFADBBBD-43B1-4B9B-9DD8-04415EBEFDA7}

‎XEngine_Source/XEngine_MQServiceApp/MQService_HTTPTask/MQService_HTTPPost.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,13 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
8282
else if (0 == _tcsxnicmp(lpszAPIDelete, lpszFuncName, _tcsxlen(lpszAPIDelete)))
8383
{
8484
XENGINE_PROTOCOL_USERINFO st_UserInfo = {};
85-
85+
if (!ProtocolModule_Parse_Register(lpszMsgBuffer, nMsgLen, &st_UserInfo))
86+
{
87+
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_PARSE, _X("json load parse is failure"));
88+
XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_MQAPP_NETTYPE_HTTP);
89+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求注册消息失败,负载内容错误:%s"), lpszClientAddr, lpszMsgBuffer);
90+
return false;
91+
}
8692
if (!DBModule_MQUser_UserDelete(&st_UserInfo))
8793
{
8894
ProtocolModule_Packet_HTTPCommon(tszSDBuffer, &nSDLen, ERROR_XENGINE_MESSAGE_HTTP_DELETE, _X("delete user failure"));

‎XEngine_Source/XEngine_MQServiceApp/MQService_Hdr.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ using namespace std;
4545
#include <XEngine_Include/XEngine_RfcComponents/MQTTProtocol_Error.h>
4646
#include "../XEngine_Depend/XEngine_Module/XEngine_InfoReport/InfoReport_Define.h"
4747
#include "../XEngine_Depend/XEngine_Module/XEngine_InfoReport/InfoReport_Error.h"
48-
48+
#include "../XEngine_Depend/XEngine_Module/XEngine_Token/Session_Define.h"
49+
#include "../XEngine_Depend/XEngine_Module/XEngine_Token/Session_Error.h"
4950
#include "../XQueue_ProtocolHdr.h"
5051
#include "../MQCore_ConfigModule/Config_Define.h"
5152
#include "../MQCore_ConfigModule/Config_Error.h"
@@ -110,6 +111,7 @@ extern MESSAGEQUEUE_DBCONFIG st_DBConfig;
110111
#pragma comment(lib,"../x64/Debug/MQCore_DBModule.lib")
111112
#pragma comment(lib,"../x64/Debug/MQCore_HelpModule.lib")
112113
#pragma comment(lib,"../x64/Debug/XEngine_InfoReport.lib")
114+
#pragma comment(lib,"../x64/Debug/XEngine_Token.lib")
113115
#pragma comment(lib,"../x64/Debug/MQCore_MemoryCache.lib")
114116
#elif _M_ARM64
115117
#pragma comment(lib,"../ARM64/Debug/MQCore_ConfigModule.lib")
@@ -118,6 +120,7 @@ extern MESSAGEQUEUE_DBCONFIG st_DBConfig;
118120
#pragma comment(lib,"../ARM64/Debug/MQCore_DBModule.lib")
119121
#pragma comment(lib,"../ARM64/Debug/MQCore_HelpModule.lib")
120122
#pragma comment(lib,"../ARM64/Debug/XEngine_InfoReport.lib")
123+
#pragma comment(lib,"../ARM64/Debug/XEngine_Token.lib")
121124
#pragma comment(lib,"../ARM64/Debug/MQCore_MemoryCache.lib")
122125
#elif _M_IX86
123126
#pragma comment(lib,"../Debug/MQCore_ConfigModule.lib")
@@ -126,6 +129,7 @@ extern MESSAGEQUEUE_DBCONFIG st_DBConfig;
126129
#pragma comment(lib,"../Debug/MQCore_DBModule.lib")
127130
#pragma comment(lib,"../Debug/MQCore_HelpModule.lib")
128131
#pragma comment(lib,"../Debug/XEngine_InfoReport.lib")
132+
#pragma comment(lib,"../Debug/XEngine_Token.lib")
129133
#pragma comment(lib,"../Debug/MQCore_MemoryCache.lib")
130134
#endif
131135
#else
@@ -136,6 +140,7 @@ extern MESSAGEQUEUE_DBCONFIG st_DBConfig;
136140
#pragma comment(lib,"../x64/Release/MQCore_DBModule.lib")
137141
#pragma comment(lib,"../x64/Release/MQCore_HelpModule.lib")
138142
#pragma comment(lib,"../x64/Release/XEngine_InfoReport.lib")
143+
#pragma comment(lib,"../x64/Release/XEngine_Token.lib")
139144
#pragma comment(lib,"../x64/Release/MQCore_MemoryCache.lib")
140145
#elif _M_ARM64
141146
#pragma comment(lib,"../ARM64/Release/MQCore_ConfigModule.lib")
@@ -144,6 +149,7 @@ extern MESSAGEQUEUE_DBCONFIG st_DBConfig;
144149
#pragma comment(lib,"../ARM64/Release/MQCore_DBModule.lib")
145150
#pragma comment(lib,"../ARM64/Release/MQCore_HelpModule.lib")
146151
#pragma comment(lib,"../ARM64/Release/XEngine_InfoReport.lib")
152+
#pragma comment(lib,"../ARM64/Release/XEngine_Token.lib")
147153
#pragma comment(lib,"../ARM64/Release/MQCore_MemoryCache.lib")
148154
#elif _M_IX86
149155
#pragma comment(lib,"../Release/MQCore_ConfigModule.lib")
@@ -152,6 +158,7 @@ extern MESSAGEQUEUE_DBCONFIG st_DBConfig;
152158
#pragma comment(lib,"../Release/MQCore_DBModule.lib")
153159
#pragma comment(lib,"../Release/MQCore_HelpModule.lib")
154160
#pragma comment(lib,"../Release/XEngine_InfoReport.lib")
161+
#pragma comment(lib,"../Release/XEngine_Token.lib")
155162
#pragma comment(lib,"../Release/MQCore_MemoryCache.lib")
156163
#endif
157164
#endif

0 commit comments

Comments
 (0)