fixed:get serial is incorrent

fixed:does not write message attr to database
fixed:does not work that time publish self attr

Author: xengine-qyt

XEngine_Source/MQCore_DBModule/DBModule_MQData/DBModule_MQData.cpp

@@ -460,6 +460,11 @@ bool CDBModule_MQData::DBModule_MQData_GetSerial(LPCXSTR lpszName, __int64x* pIn
 		}
 		nPos++;
 		if (NULL != pptszResult[nPos])
+		{
+			_tcsxcpy(pSt_DBStart->tszUserBelong, pptszResult[nPos]);
+		}
+		nPos++;
+		if (NULL != pptszResult[nPos])
 		{
 			_tcsxcpy(pSt_DBStart->tszQueueName, pptszResult[nPos]);
 		}
@@ -530,6 +535,11 @@ bool CDBModule_MQData::DBModule_MQData_GetSerial(LPCXSTR lpszName, __int64x* pIn
 		}
 		nPos++;
 		if (NULL != pptszResult[nPos])
+		{
+			_tcsxcpy(pSt_DBEnd->tszUserBelong, pptszResult[nPos]);
+		}
+		nPos++;
+		if (NULL != pptszResult[nPos])
 		{
 			_tcsxcpy(pSt_DBEnd->tszQueueName, pptszResult[nPos]);
 		}

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -333,6 +333,7 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 			_tcsxcpy(st_DBQueue.tszUserBelong, st_MQProtocol.tszMQUsr);
 			_tcsxcpy(st_DBQueue.tszQueueName, st_MQProtocol.tszMQKey);
 			memcpy(st_DBQueue.tszMsgBuffer, lpszMsgBuffer + sizeof(XENGINE_PROTOCOL_XMQ), st_DBQueue.nMsgLen);
+			memcpy(&st_DBQueue.nMsgAttr, &st_MQProtocol.st_MSGAttr, sizeof(XENGINE_PROTOCOL_MSGATTR));
 
 			if (st_MQProtocol.nKeepTime > 0)
 			{
@@ -421,7 +422,6 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 						XEngine_MQXService_Send(pptszListAddr[i], tszSDBuffer, nSDLen, nClientType);
 						BaseLib_OperatorMemory_Free((XPPPMEM)&pptszListAddr, 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);
 				}
 				else
 				{
@@ -453,7 +453,6 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 						}
 					}
 					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);
 				}
 				_xstprintf(st_DBQueue.tszQueuePublishTime, _X("0"));
 			}
@@ -481,6 +480,7 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 				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_INFO, _X("%s消息端:%s,主题:%s,序列:%lld,投递数据到消息队列成功,发布时间:%s"), lpszClientType, lpszClientAddr, st_DBQueue.tszQueueName, st_DBQueue.nQueueSerial, st_DBQueue.tszQueuePublishTime);
 		}
 		else if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQGET == pSt_ProtocolHdr->unOperatorCode)
 		{

XEngine_Source/XEngine_MQServiceApp/MQService_Task.cpp

@@ -40,8 +40,8 @@ void CALLBACK MessageQueue_CBTask_TimePublish(XENGINE_DBTIMERELEASE* pSt_DBInfo,
 
 		if (pSt_DBInfo->bBreak)
 		{
-			//跳过自己
-			if (0 == _tcsxncmp(st_DBInfo.tszUserName, ppSt_ListUser[i]->tszUserName, _tcsxlen(st_DBInfo.tszUserName)))
+			//是否跳过自己
+			if (0 == _tcsxncmp(st_DBInfo.tszUserName, ppSt_ListUser[i]->tszUserName, _tcsxlen(st_DBInfo.tszUserName)) && (0 == st_MQProtocol.st_MSGAttr.byAttrSelf))
 			{
 				continue;
 			}