added:delete topic support for http

Author: xengine-qyt

XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp

@@ -1070,7 +1070,7 @@ bool CDBModule_MQUser::DBModule_MQUser_OwnerDelete(XENGINE_DBTOPICOWNER* pSt_DBO
 			return false;
 		}
 	}
-	else
+	else if ((_tcsxlen(pSt_DBOwner->tszUserName) > 0) && (_tcsxlen(pSt_DBOwner->tszQueueName) <= 0))
 	{
 		_xstprintf(tszSQLStatement, _X("DELETE FROM `KeyOwner` WHERE tszUserName = '%s'"), pSt_DBOwner->tszUserName);
 		if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
@@ -1080,6 +1080,16 @@ bool CDBModule_MQUser::DBModule_MQUser_OwnerDelete(XENGINE_DBTOPICOWNER* pSt_DBO
 			return false;
 		}
 	}
+	else
+	{
+		_xstprintf(tszSQLStatement, _X("DELETE FROM `KeyOwner` WHERE tszKeyName = '%s'"), pSt_DBOwner->tszQueueName);
+		if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
+		{
+			DBModule_IsErrorOccur = true;
+			DBModule_dwErrorCode = DataBase_GetLastError();
+			return false;
+		}
+	}
 
 	return true;
 }

XEngine_Source/XEngine_MQServiceApp/MQService_HttpTask.cpp

@@ -168,6 +168,30 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
 				//type = 0 删除主题
 				memset(tszValue, '\0', MAX_PATH);
 				BaseLib_String_GetKeyValue(ppSt_ListUrl[nMethodPos + 3], _X("="), tszKey, tszValue);
+
+				XENGINE_DBTOPICOWNER st_DBOwner = {};
+				XENGINE_DBUSERKEY st_UserKey = {};
+				XENGINE_DBTIMERELEASE st_DBInfo = {};
+
+				_tcsxcpy(st_DBOwner.tszQueueName, tszValue);
+				_tcsxcpy(st_UserKey.tszKeyName, tszValue);
+				_tcsxcpy(st_DBInfo.tszQueueName, tszValue);
+				if (!DBModule_MQUser_OwnerDelete(&st_DBOwner))
+				{
+					ProtocolModule_Packet_Http(tszPKTBuffer, &nPKTLen, ERROR_XENGINE_MESSAGE_HTTP_NOTFOUND, "topic name not found");
+					XEngine_MQXService_Send(lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP);
+					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求HTTP删除主题失败,主题不存在:%s"), lpszClientAddr, tszValue);
+					return false;
+				}
+				//清楚数据库
+				APIHelp_Counter_SerialDel(tszValue);
+				DBModule_MQData_DeleteTable(tszValue);
+				DBModule_MQUser_KeyDelete(&st_UserKey);
+				DBModule_MQUser_TimeDelete(&st_DBInfo);
+
+				ProtocolModule_Packet_Http(tszPKTBuffer, &nPKTLen);
+				XEngine_MQXService_Send(lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP);
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求主题删除成功,主题名:%s"), lpszClientAddr, tszValue);
 			}
 			else
 			{
@@ -185,7 +209,7 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
 
 				if (!DBModule_MQUser_UserQuery(&st_UserInfo))
 				{
-					ProtocolModule_Packet_Http(tszPKTBuffer, &nPKTLen, ERROR_XENGINE_MESSAGE_AUTH_USERPASS, "user name not found");
+					ProtocolModule_Packet_Http(tszPKTBuffer, &nPKTLen, ERROR_XENGINE_MESSAGE_HTTP_NOTFOUND, "user name not found");
 					XEngine_MQXService_Send(lpszClientAddr, tszPKTBuffer, nPKTLen, XENGINE_MQAPP_NETTYPE_HTTP);
 					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求HTTP删除用户失败,用户不存在:%s"), lpszClientAddr, st_UserInfo.tszUserName);
 					return false;

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -776,6 +776,17 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 			_tcsxcpy(st_UserKey.tszKeyName, st_MQProtocol.tszMQKey);
 			_tcsxcpy(st_DBInfo.tszQueueName, st_MQProtocol.tszMQKey);
 
+			if (_tcsxlen(st_DBOwner.tszUserName) <= 0)
+			{
+				if (pSt_ProtocolHdr->byIsReply)
+				{
+					pSt_ProtocolHdr->wReserve = ERROR_XENGINE_MESSAGE_XMQ_DELOWNER;
+					ProtocolModule_Packet_Common(nNetType, pSt_ProtocolHdr, &st_MQProtocol, tszSDBuffer, &nSDLen);
+					XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, nNetType);
+				}
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("%s消息端:%s,删除主题失败,删除所有者失败,主题名称:%s,用户名为空"), lpszClientType, lpszClientAddr, st_MQProtocol.tszMQKey, tszUserName);
+				return false;
+			}
 			if (!DBModule_MQUser_OwnerDelete(&st_DBOwner))
 			{
 				if (pSt_ProtocolHdr->byIsReply)

XEngine_Source/XQueue_ProtocolHdr.h

@@ -84,6 +84,7 @@
 
 #define ERROR_XENGINE_MESSAGE_HTTP_PARAMENT 0x201                         //HTTP请求参数错误
 #define ERROR_XENGINE_MESSAGE_HTTP_AUTHORIZE 0x202                        //验证失败没有权限
+#define ERROR_XENGINE_MESSAGE_HTTP_NOTFOUND 0x203                         //没有找到请求的数据
 ///////////////////////////////////////////////////////////////////////////
 //                          导出的数据结构
 ///////////////////////////////////////////////////////////////////////////