modify:can be delete owner info when delete user

Author: xengine-qyt

XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp

@@ -898,19 +898,33 @@ BOOL CDBModule_MQUser::DBModule_MQUser_OwnerDelete(XENGINE_DBTOPICOWNER* pSt_DBO
 	TCHAR tszSQLStatement[10240];
 	memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
 
-	_stprintf(tszSQLStatement, _T("DELETE FROM `KeyOwner` WHERE tszUserName = '%s' AND tszKeyName = '%s'"), pSt_DBOwner->tszUserName, pSt_DBOwner->tszQueueName);
-	if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement, &nAffectRow))
+	if ((_tcslen(pSt_DBOwner->tszUserName) > 0) && (_tcslen(pSt_DBOwner->tszQueueName) > 0))
 	{
-		DBModule_IsErrorOccur = TRUE;
-		DBModule_dwErrorCode = DataBase_GetLastError();
-		return FALSE;
+		_stprintf(tszSQLStatement, _T("DELETE FROM `KeyOwner` WHERE tszUserName = '%s' AND tszKeyName = '%s'"), pSt_DBOwner->tszUserName, pSt_DBOwner->tszQueueName);
+		if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement, &nAffectRow))
+		{
+			DBModule_IsErrorOccur = TRUE;
+			DBModule_dwErrorCode = DataBase_GetLastError();
+			return FALSE;
+		}
+		if (nAffectRow <= 0)
+		{
+			DBModule_IsErrorOccur = TRUE;
+			DBModule_dwErrorCode = ERROR_XENGINE_MQCORE_DATABASE_NOTFOUND;
+			return FALSE;
+		}
 	}
-	if (nAffectRow <= 0)
+	else
 	{
-		DBModule_IsErrorOccur = TRUE;
-		DBModule_dwErrorCode = ERROR_XENGINE_MQCORE_DATABASE_NOTFOUND;
-		return FALSE;
+		_stprintf(tszSQLStatement, _T("DELETE FROM `KeyOwner` WHERE tszUserName = '%s'"), pSt_DBOwner->tszUserName);
+		if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
+		{
+			DBModule_IsErrorOccur = TRUE;
+			DBModule_dwErrorCode = DataBase_GetLastError();
+			return FALSE;
+		}
 	}
+	
 	return TRUE;
 }
 /********************************************************************

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -254,10 +254,16 @@ BOOL MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCTSTR lpszC
 
 			pSt_ProtocolHdr->wReserve = 0;
 			XENGINE_DBUSERKEY st_UserKey;
+			XENGINE_DBTOPICOWNER st_DBOwner;
+
 			memset(&st_UserKey, '\0', sizeof(XENGINE_DBUSERKEY));
+			memset(&st_DBOwner, '\0', sizeof(XENGINE_DBTOPICOWNER));
 
 			_tcscpy(st_UserKey.tszUserName, st_UserInfo.tszUserName);
+			_tcscpy(st_DBOwner.tszUserName, st_UserInfo.tszUserName);
+
 			DBModule_MQUser_KeyDelete(&st_UserKey);
+			DBModule_MQUser_OwnerDelete(&st_DBOwner);
 			ProtocolModule_Packet_Common(nNetType, pSt_ProtocolHdr, NULL, tszSDBuffer, &nSDLen);
 			XEngine_MQXService_Send(lpszClientAddr, tszSDBuffer, nSDLen, nNetType);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("%s客户端:%s,请求用户删除成功,用户名:%s"), lpszClientType, lpszClientAddr, st_UserInfo.tszUserName);