added:time publish for message notify

Author: xengine-qyt

XEngine_Source/VSCopy_Arm64.bat

@@ -11,6 +11,7 @@ copy /y "%XEngine_LibArm64%\XEngine_Client\XClient_APIHelp.dll" "./"
 
 copy /y "%XEngine_LibArm64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
 copy /y "%XEngine_LibArm64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_LibArm64%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
 
 copy /y "%XEngine_LibArm64%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
 copy /y "%XEngine_LibArm64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"

XEngine_Source/VSCopy_Debug.bat

@@ -11,6 +11,7 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_APIHelp.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_XSocket.dll" "./"
+copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIAddr.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_Packets.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_XLog.dll" "./"

XEngine_Source/VSCopy_x64.bat

@@ -11,6 +11,7 @@ copy /y "%XEngine_Lib64%\XEngine_Client\XClient_APIHelp.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"

XEngine_Source/VSCopy_x86.bat

@@ -11,6 +11,7 @@ copy /y "%XEngine_Lib32%\XEngine_Client\XClient_APIHelp.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_XLog.dll" "./"

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -355,7 +355,6 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 							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, &st_MQProtocol.st_MSGAttr, tszTmpUser);
 						}
-						
 					}
 					else
 					{
@@ -378,13 +377,10 @@ bool MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCXSTR lpszC
 							//只有在线用户才需要即时通知
 							if (SessionModule_Client_GetExist(NULL, ppSt_ListUser[i]->tszUserName))
 							{
-								XCHAR tszTmpUser[XPATH_MID] = {};
-
 								SessionModule_Client_GetAddr(ppSt_ListUser[i]->tszUserName, tszUserAddr);
 								SessionModule_Client_GetType(tszUserAddr, &nClientType);
-								SessionModule_Client_GetUser(tszUserAddr, tszTmpUser);
 								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, &st_MQProtocol.st_MSGAttr, tszTmpUser);
+								XEngine_MQXService_Send(tszUserAddr, tszSDBuffer, nSDLen, nClientType, &st_MQProtocol.st_MSGAttr, ppSt_ListUser[i]->tszUserName);
 							}
 						}
 						BaseLib_Memory_Free((XPPPMEM)&ppSt_ListUser, nListCount);

XEngine_Source/XEngine_MQServiceApp/MQService_Task.cpp

@@ -47,7 +47,7 @@ void XCALLBACK MessageQueue_CBTask_TimePublish(XENGINE_DBTIMERELEASE* pSt_DBInfo
 		SessionModule_Client_GetAddr(ppSt_ListUser[i]->tszUserName, tszUserAddr);
 		SessionModule_Client_GetType(tszUserAddr, &nNetType);
 		ProtocolModule_Packet_Common(nNetType, &st_ProtocolHdr, &st_MQProtocol, tszMsgBuffer, &nMsgLen, st_DBInfo.tszMsgBuffer, st_DBInfo.nMsgLen);
-		XEngine_MQXService_Send(tszUserAddr, tszMsgBuffer, nMsgLen, nNetType);
+		XEngine_MQXService_Send(tszUserAddr, tszMsgBuffer, nMsgLen, nNetType, &st_MQProtocol.st_MSGAttr, ppSt_ListUser[i]->tszUserName);
 	}
 	BaseLib_Memory_Free((XPPPMEM)&ppSt_ListUser, nListCount);
 

XEngine_Source/XEngine_MQServiceApp/Makefile

@@ -3,7 +3,7 @@ PLATVER =
 LOADHDR = -I ./ 
 LOADSO = -L ../MQCore_ConfigModule -L ../MQCore_ProtocolModule -L ../MQCore_SessionModule -L ../MQCore_MemoryCache -L ../MQCore_DBModule -L ../MQCore_HelpModule \
 		 -L ../XEngine_DependLibrary/XEngine_Module/jsoncpp -L ../XEngine_DependLibrary/XEngine_Module/XEngine_InfoReport -L ../XEngine_DependLibrary/XEngine_Module/XEngine_Token -L ../XEngine_DependLibrary/XEngine_Module/XEngine_Verification -L ../XEngine_DependLibrary/XEngine_Module/XEngine_MSGNotify
-LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXClient_APIHelp -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_WSProtocol -lRfcComponents_HttpProtocol -lRfcComponents_MQTTProtocol \
+LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXClient_APIHelp -lNetHelp_APIAddr -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_WSProtocol -lRfcComponents_HttpProtocol -lRfcComponents_MQTTProtocol \
       -lMQCore_ConfigModule -lMQCore_ProtocolModule -lMQCore_SessionModule -lMQCore_MemoryCache -lMQCore_DBModule -lMQCore_HelpModule \
 	  -ljsoncpp -lXEngine_InfoReport -lXEngine_Token -lXEngine_Verification -lXEngine_MSGNotify
 LIBEX = 

XEngine_Source/XQueue_ProtocolHdr.h

@@ -100,8 +100,8 @@ typedef struct
 	XBYTE byAttrSelf : 1;                                                //自己也能接受
 	XBYTE byAttrReply : 1;                                               //对方必须回复
 	XBYTE byAttrActive : 1;                                              //主动获取不受限制,比如超时的,不是自己发给自己的
-	XBYTE byAttrEMail : 1;                                               //此消息需要邮件通知,仅限即时消息
-	XBYTE byAttrPhone : 1;                                               //此消息需要短信通知,仅限即时消息
+	XBYTE byAttrEMail : 1;                                               //此消息需要邮件通知,仅限即时和定时消息
+	XBYTE byAttrPhone : 1;                                               //此消息需要短信通知,仅限即时和定时消息
 	XBYTE byAttrResver6 : 1;
 	XBYTE byAttrResver7 : 1;
 	XBYTE byAttrResver;