@@ -172,32 +172,30 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
172172 return false ;
173173 }
174174 st_UserInfo.nUserLevel = ENUM_XENGINE_PROTOCOLHDR_LEVEL_TYPE_USER ;
175- if (!DBModule_MQUser_UserInsert (&st_UserInfo))
176- {
177- ProtocolModule_Packet_Http (tszPKTBuffer, &nPKTLen, ERROR_XENGINE_MESSAGE_HTTP_SERVICE , _X (" service is failure" ));
178- XEngine_MQXService_Send (lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP );
179- XLOG_PRINT (xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR , _X (" HTTP客户端:%s,请求用户注册失败,插入数据库失败,错误:%lX" ), lpszClientAddr, SessionModule_GetLastError ());
180- return false ;
181- }
182175 // 是否需要代理通知
183176 if (_tcsxlen (st_ServiceCfg.st_XPass .tszPassRegister ) > 0 )
184177 {
185178 int nHTTPCode = 0 ;
186- XCLIENT_APIHTTP st_HTTPParament;
187- memset (&st_HTTPParament, ' \0 ' , sizeof (XCLIENT_APIHTTP ));
179+ XCLIENT_APIHTTP st_HTTPParament = {};
188180
189181 st_HTTPParament.nTimeConnect = 2 ;
190182 ProtocolModule_Packet_PassUser (&st_UserInfo, tszPKTBuffer, &nPKTLen, XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQREGISTER );
191183 APIClient_Http_Request (_X (" POST" ), st_ServiceCfg.st_XPass .tszPassRegister , tszPKTBuffer, &nHTTPCode, NULL , NULL , NULL , NULL , &st_HTTPParament);
192184 if (200 != nHTTPCode)
193185 {
194- DBModule_MQUser_UserDelete (&st_UserInfo); // 删除
195186 ProtocolModule_Packet_Http (tszPKTBuffer, &nPKTLen, ERROR_XENGINE_MESSAGE_HTTP_APIREG , _X (" service is failure" ));
196187 XEngine_MQXService_Send (lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP );
197188 XLOG_PRINT (xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR , _X (" HTTP客户端:%s,请求远程注册失败,HTTPCode:%d" ), lpszClientAddr, nHTTPCode);
198189 return false ;
199190 }
200191 }
192+ if (!DBModule_MQUser_UserInsert (&st_UserInfo))
193+ {
194+ ProtocolModule_Packet_Http (tszPKTBuffer, &nPKTLen, ERROR_XENGINE_MESSAGE_HTTP_SERVICE , _X (" service is failure" ));
195+ XEngine_MQXService_Send (lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP );
196+ XLOG_PRINT (xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR , _X (" HTTP客户端:%s,请求用户注册失败,插入数据库失败,错误:%lX" ), lpszClientAddr, SessionModule_GetLastError ());
197+ return false ;
198+ }
201199 // 是否需要订阅公用消息队列
202200 if (st_DBConfig.st_MQData .bCommSub )
203201 {
@@ -226,13 +224,6 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
226224 XLOG_PRINT (xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR , _X (" HTTP客户端:%s,请求注册消息失败,负载内容错误:%s" ), lpszClientAddr, lpszMsgBuffer);
227225 return false ;
228226 }
229- if (!DBModule_MQUser_UserDelete (&st_UserInfo))
230- {
231- ProtocolModule_Packet_Http (tszPKTBuffer, &nPKTLen, ERROR_XENGINE_MESSAGE_HTTP_DELETE , _X (" delete user failure" ));
232- XEngine_MQXService_Send (lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP );
233- XLOG_PRINT (xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR , _X (" HTTP客户端:%s,请求用户删除失败,删除数据库失败,错误:%lX" ), lpszClientAddr, SessionModule_GetLastError ());
234- return false ;
235- }
236227 if (_tcsxlen (st_ServiceCfg.st_XPass .tszPassUNReg ) > 0 )
237228 {
238229 int nHTTPCode = 0 ;
@@ -250,11 +241,15 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
250241 XLOG_PRINT (xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR , _X (" HTTP客户端:%s,请求远程注销失败,错误:%lX,HTTPCode:%d" ), lpszClientAddr, nHTTPCode);
251242 }
252243 }
253- XENGINE_DBUSERKEY st_UserKey;
254- XENGINE_DBTOPICOWNER st_DBOwner;
255-
256- memset (&st_UserKey, ' \0 ' , sizeof (XENGINE_DBUSERKEY ));
257- memset (&st_DBOwner, ' \0 ' , sizeof (XENGINE_DBTOPICOWNER ));
244+ if (!DBModule_MQUser_UserDelete (&st_UserInfo))
245+ {
246+ ProtocolModule_Packet_Http (tszPKTBuffer, &nPKTLen, ERROR_XENGINE_MESSAGE_HTTP_DELETE , _X (" delete user failure" ));
247+ XEngine_MQXService_Send (lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP );
248+ XLOG_PRINT (xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR , _X (" HTTP客户端:%s,请求用户删除失败,删除数据库失败,错误:%lX" ), lpszClientAddr, SessionModule_GetLastError ());
249+ return false ;
250+ }
251+ XENGINE_DBUSERKEY st_UserKey = {};
252+ XENGINE_DBTOPICOWNER st_DBOwner = {};
258253
259254 _tcsxcpy (st_UserKey.tszUserName , st_UserInfo.tszUserName );
260255 _tcsxcpy (st_DBOwner.tszUserName , st_UserInfo.tszUserName );
0 commit comments