improved:memory and process way for msg notify

fixed:client nettype is incorrent when message notify

Author: xengine-qyt

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -431,7 +431,6 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 							continue;
 						}
 						nSDLen = 0;
-						int nMSGLen = 0;
 						int nClientType = 0;
 						memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
 
@@ -448,29 +447,29 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 				{
 					int nListCount = 0;
 					XENGINE_DBUSERKEY** ppSt_ListUser;
-					if (DBModule_MQUser_KeyList(NULL, st_MQProtocol.tszMQKey, &ppSt_ListUser, &nListCount))
+					DBModule_MQUser_KeyList(NULL, st_MQProtocol.tszMQKey, &ppSt_ListUser, &nListCount);
+					
+					for (int i = 0; i < nListCount; i++)
 					{
-						int nTCPLen = 0;
-						XCHAR tszTCPBuffer[4096];
-						memset(tszTCPBuffer, '\0', sizeof(tszTCPBuffer));
-
-						pSt_ProtocolHdr->unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_MSGNOTIFY;
-						ProtocolModule_Packet_Common(nNetType, pSt_ProtocolHdr, &st_MQProtocol, tszTCPBuffer, &nTCPLen, lpszMsgBuffer + sizeof(XENGINE_PROTOCOL_XMQ), nMsgLen - sizeof(XENGINE_PROTOCOL_XMQ));
-						for (int i = 0; i < nListCount; i++)
+						//跳过自己
+						if (0 == _tcsxncmp(tszUserName, ppSt_ListUser[i]->tszUserName, _tcsxlen(tszUserName)))
 						{
-							//跳过自己
-							if (0 == _tcsxncmp(tszUserName, ppSt_ListUser[i]->tszUserName, _tcsxlen(tszUserName)))
-							{
-								continue;
-							}
-							XCHAR tszUserAddr[128];
-							memset(tszUserAddr, '\0', sizeof(tszUserAddr));
-
-							SessionModule_Client_GetAddr(ppSt_ListUser[i]->tszUserName, tszUserAddr);
-							XEngine_MQXService_Send(tszUserAddr, tszTCPBuffer, nTCPLen, nNetType);
+							continue;
 						}
-						BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListUser, nListCount);
+						nSDLen = 0;
+						int nClientType = 0;
+						XCHAR tszUserAddr[128];
+						memset(tszUserAddr, '\0', sizeof(tszUserAddr));
+						memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
+
+						pSt_ProtocolHdr->unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_MSGNOTIFY;
+
+						SessionModule_Client_GetAddr(ppSt_ListUser[i]->tszUserName, tszUserAddr);
+						SessionModule_Client_GetType(tszUserAddr, &nClientType);
+						ProtocolModule_Packet_Common(nClientType, pSt_ProtocolHdr, &st_MQProtocol, tszSDBuffer, &nSDLen, lpszMsgBuffer + sizeof(XENGINE_PROTOCOL_XMQ), nMsgLen - sizeof(XENGINE_PROTOCOL_XMQ));
+						XEngine_MQXService_Send(tszUserAddr, tszSDBuffer, nSDLen, nClientType);
 					}
+					BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListUser, nListCount);
 					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("%s消息端:%s,主题:%s,序列:%lld,投递数据到消息队列成功,通知客户端个数:%d"), lpszClientType, lpszClientAddr, st_DBQueue.tszQueueName, st_DBQueue.nQueueSerial, nListCount);
 				}
 			}