delete:time publish break field

Author: xengine-qyt

XEngine_Source/MQCore_DBModule/DBModule_Define.h

@@ -35,7 +35,6 @@ typedef struct
 	__int64x nIDMsg;                                                      //消息ID
 	__int64x nIDTime;                                                     //发布时间
 	bool bActive;                                                         //是否激活过
-	bool bBreak;                                                          //跳过自身
 }XENGINE_DBTIMERELEASE;
 //用户消息
 typedef struct

XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp

@@ -731,7 +731,7 @@ bool CDBModule_MQUser::DBModule_MQUser_TimeInsert(XENGINE_DBTIMERELEASE* pSt_DBI
 	XCHAR tszSQLStatement[10240];
 	memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
 
-	_xstprintf(tszSQLStatement, _X("INSERT INTO `UserTime` (tszQueueName,nIDMsg,nIDTime,bActive,bBreak,tszCreateTime) VALUES('%s',%lld,%lld,0,%d,now())"), pSt_DBInfo->tszQueueName, pSt_DBInfo->nIDMsg, pSt_DBInfo->nIDTime, pSt_DBInfo->bBreak);
+	_xstprintf(tszSQLStatement, _X("INSERT INTO `UserTime` (tszQueueName,nIDMsg,nIDTime,bActive,tszCreateTime) VALUES('%s',%lld,%lld,0,now())"), pSt_DBInfo->tszQueueName, pSt_DBInfo->nIDMsg, pSt_DBInfo->nIDTime);
 	if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
 	{
 		DBModule_IsErrorOccur = true;
@@ -804,11 +804,7 @@ bool CDBModule_MQUser::DBModule_MQUser_TimeQuery(XENGINE_DBTIMERELEASE*** pppSt_
 		}
 		if (NULL != pptszResult[4])
 		{
-			(*pppSt_DBInfo)[i]->bBreak = _ttxoi(pptszResult[4]);
-		}
-		if (NULL != pptszResult[5])
-		{
-			_tcsxcpy((*pppSt_DBInfo)[i]->tszCreateTime, pptszResult[5]);
+			_tcsxcpy((*pppSt_DBInfo)[i]->tszCreateTime, pptszResult[4]);
 		}
 	}
 	DataBase_MySQL_FreeResult(xhDBSQL, xhTable);

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -389,7 +389,6 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 
 				st_DBTime.nIDMsg = st_DBQueue.nQueueSerial;
 				st_DBTime.nIDTime = st_MQProtocol.nPubTime;
-				st_DBTime.bBreak = pSt_ProtocolHdr->wReserve;
 				_tcsxcpy(st_DBTime.tszQueueName, st_DBQueue.tszQueueName);
 
 				BaseLib_OperatorTime_TTimeToStuTime(st_MQProtocol.nPubTime, &st_LibTime);

XEngine_Source/XEngine_MQServiceApp/MQService_Task.cpp

@@ -37,14 +37,10 @@ void CALLBACK MessageQueue_CBTask_TimePublish(XENGINE_DBTIMERELEASE* pSt_DBInfo,
 		int nNetType = 0;
 		XCHAR tszUserAddr[128];
 		memset(tszUserAddr, '\0', sizeof(tszUserAddr));
-
-		if (pSt_DBInfo->bBreak)
+		//是否跳过自己
+		if (0 == _tcsxncmp(st_DBInfo.tszUserName, ppSt_ListUser[i]->tszUserName, _tcsxlen(st_DBInfo.tszUserName)) && (0 == st_MQProtocol.st_MSGAttr.byAttrSelf))
 		{
-			//是否跳过自己
-			if (0 == _tcsxncmp(st_DBInfo.tszUserName, ppSt_ListUser[i]->tszUserName, _tcsxlen(st_DBInfo.tszUserName)) && (0 == st_MQProtocol.st_MSGAttr.byAttrSelf))
-			{
-				continue;
-			}
+			continue;
 		}
 		SessionModule_Client_GetAddr(ppSt_ListUser[i]->tszUserName, tszUserAddr);
 		SessionModule_Client_GetType(tszUserAddr, &nNetType);

XEngine_Source/XQueue_ProtocolHdr.h

@@ -71,7 +71,7 @@ typedef struct
 	XCHAR tszMQKey[MAX_PATH];                                             //此消息的KEY，不能为空
 	XCHAR tszMQUsr[MAX_PATH];                                             //此消息接受用户
 	__int64x nSerial;                                                     //包序列号
-	__int64x nPubTime;                                                    //发布时间，根据自己需求配置时区
+	__int64x nPubTime;                                                    //发布时间，根据自己需求配置时区,-1表示投递的消息通过用户主动获取,0表示即时发布消息给当前订阅的在线用户,>0表示发布的日期
 	int nKeepTime;                                                        //可用时间,单位秒,>0 超时秒数
 	XENGINE_PROTOCOL_MSGATTR st_MSGAttr;                                  //消息属性
 }XENGINE_PROTOCOL_XMQ, * LPXENGINE_PROTOCOL_XMQ;