From a9386ea275b2efcd853e391c2a8b0834f998fb49 Mon Sep 17 00:00:00 2001
From: heavyrain2012 <heavyrain.lee@gmail.com>
Date: Sun, 17 Mar 2019 20:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E5=A5=BD=E5=8F=8B=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=97=B6=EF=BC=8C=E4=BC=9A=E8=AF=9D=E4=B8=8D=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imhandler/HandleFriendRequestHandler.java         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
index 47cadf78..6be2c6c9 100644
--- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
@@ -29,22 +29,29 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
 
             if (errorCode == ERROR_CODE_SUCCESS) {
                 long messageId = MessageShardingUtil.generateId();
+                long timestamp = System.currentTimeMillis();
                 builder.setMessageId(messageId);
-                saveAndPublish(request.getTargetUid(), null, builder.build(), System.currentTimeMillis());
+                builder.setServerTimestamp(timestamp);
+                saveAndPublish(request.getTargetUid(), null, builder.build(), timestamp);
 
                 WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder().setType(90).setContent("以上是打招呼信息");
                 builder = WFCMessage.Message.newBuilder();
                 builder.setFromUser(request.getTargetUid());
                 builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
                 builder.setContent(contentBuilder);
+                timestamp = System.currentTimeMillis();
+                builder.setServerTimestamp(timestamp);
+
                 messageId = MessageShardingUtil.generateId();
                 builder.setMessageId(messageId);
-                saveAndPublish(request.getTargetUid(), null, builder.build(), System.currentTimeMillis());
+                saveAndPublish(request.getTargetUid(), null, builder.build(), timestamp);
 
                 contentBuilder.setContent("你们已经成为好友了，现在可以开始聊天了");
                 builder.setContent(contentBuilder);
                 messageId = MessageShardingUtil.generateId();
                 builder.setMessageId(messageId);
+                timestamp = System.currentTimeMillis();
+                builder.setServerTimestamp(timestamp);
                 saveAndPublish(request.getTargetUid(), null, builder.build(), System.currentTimeMillis());
 
                 publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);