From 8ef92d0c1b97a90079846f03d3967a3f34d7f21f Mon Sep 17 00:00:00 2001 From: heavyrain2012 Date: Thu, 4 Apr 2019 07:39:41 +0800 Subject: [PATCH] fix modify group notification timestamp issue --- .gitignore | 2 ++ broker/config/git.properties | 15 --------------- .../java/io/moquette/imhandler/GroupHandler.java | 6 +++--- .../imhandler/HandleFriendRequestHandler.java | 6 +++--- .../java/io/moquette/imhandler/IMHandler.java | 4 ++-- .../io/moquette/imhandler/SendMessageHandler.java | 2 +- .../moquette/persistence/MemoryMessagesStore.java | 2 +- .../main/java/io/moquette/spi/IMessagesStore.java | 2 +- distribution/src/main/resources/git.properties | 15 --------------- 9 files changed, 13 insertions(+), 41 deletions(-) delete mode 100644 broker/config/git.properties delete mode 100644 distribution/src/main/resources/git.properties diff --git a/.gitignore b/.gitignore index d1d98431..b154040c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ broker/nbactions-Server.xml maven-metadata.xml /.gradle/ /bin/ +broker/config/git.properties +distribution/src/main/resources/git.properties diff --git a/broker/config/git.properties b/broker/config/git.properties deleted file mode 100644 index d8ec57bc..00000000 --- a/broker/config/git.properties +++ /dev/null @@ -1,15 +0,0 @@ -#Generated by Git-Commit-Id-Plugin -#Wed Apr 03 15:25:25 CST 2019 -git.commit.id.abbrev=cc82c5b -git.commit.user.email=heavyrain.lee@gmail.com -git.commit.message.full=update version to 0.1.1\n -git.commit.id=cc82c5b420061994bc0621e807bb6c961370aef2 -git.commit.message.short=update version to 0.1.1 -git.commit.user.name=heavyrain2012 -git.build.user.name=heavyrain2012 -git.commit.id.describe=0.1.1-dirty -git.build.user.email=heavyrain.lee@gmail.com -git.branch=wildfirechat -git.commit.time=20190403134707 -git.build.time=20190403152525 -git.remote.origin.url=https\://github.com/wildfirechat/server.git diff --git a/broker/src/main/java/io/moquette/imhandler/GroupHandler.java b/broker/src/main/java/io/moquette/imhandler/GroupHandler.java index 7bb6fb3e..e1e62b47 100644 --- a/broker/src/main/java/io/moquette/imhandler/GroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GroupHandler.java @@ -26,13 +26,13 @@ abstract public class GroupHandler extends IMHandler { } for (int line : lines) { - WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder().setContent(content); - builder.setConversation(builder.getConversationBuilder().setType(ProtoConstants.ConversationType.ConversationType_Group).setTarget(targetId).setLine(line)); long timestamp = System.currentTimeMillis(); + WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder().setContent(content).setServerTimestamp(timestamp); + builder.setConversation(builder.getConversationBuilder().setType(ProtoConstants.ConversationType.ConversationType_Group).setTarget(targetId).setLine(line)); builder.setFromUser(fromUser); long messageId = MessageShardingUtil.generateId(); builder.setMessageId(messageId); - saveAndPublish(fromUser, null, builder.build(), timestamp); + saveAndPublish(fromUser, null, builder.build()); } } diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java index 6be2c6c9..15215b1f 100644 --- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java @@ -32,7 +32,7 @@ public class HandleFriendRequestHandler extends IMHandler { } - protected long saveAndPublish(String username, String clientID, WFCMessage.Message message, long timestamp) { + protected long saveAndPublish(String username, String clientID, WFCMessage.Message message) { Set notifyReceivers = new LinkedHashSet<>(); - message = m_messagesStore.storeMessage(username, clientID, message, timestamp); + message = m_messagesStore.storeMessage(username, clientID, message); int pullType = m_messagesStore.getNotifyReceivers(username, message, notifyReceivers); this.publisher.publish2Receivers(message, notifyReceivers, clientID, pullType); return message.getMessageId(); diff --git a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java index 9723033e..3961ff29 100644 --- a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java @@ -99,7 +99,7 @@ public class SendMessageHandler extends IMHandler { if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { if (!ignoreMsg) { - saveAndPublish(fromUser, clientID, message, timestamp); + saveAndPublish(fromUser, clientID, message); } ackPayload = ackPayload.capacity(20); ackPayload.writeLong(messageId); diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index 1f7a0008..3bceebb0 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -150,7 +150,7 @@ public class MemoryMessagesStore implements IMessagesStore { } @Override - public WFCMessage.Message storeMessage(String fromUser, String fromClientId, WFCMessage.Message message, long timestamp) { + public WFCMessage.Message storeMessage(String fromUser, String fromClientId, WFCMessage.Message message) { HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); IMap mIMap = hzInstance.getMap(MESSAGES_MAP); diff --git a/broker/src/main/java/io/moquette/spi/IMessagesStore.java b/broker/src/main/java/io/moquette/spi/IMessagesStore.java index 982c1f8a..4bb74fce 100755 --- a/broker/src/main/java/io/moquette/spi/IMessagesStore.java +++ b/broker/src/main/java/io/moquette/spi/IMessagesStore.java @@ -97,7 +97,7 @@ public interface IMessagesStore { } DatabaseStore getDatabaseStore(); - WFCMessage.Message storeMessage(String fromUser, String fromClientId, WFCMessage.Message message, long timestamp); + WFCMessage.Message storeMessage(String fromUser, String fromClientId, WFCMessage.Message message); int getNotifyReceivers(String fromUser, WFCMessage.Message message, Set notifyReceivers); WFCMessage.PullMessageResult fetchMessage(String user, String exceptClientId, long fromMessageId, int pullType); long insertUserMessages(String sender, int conversationType, String target, int line, int messageContentType, String userId, long messageId); diff --git a/distribution/src/main/resources/git.properties b/distribution/src/main/resources/git.properties deleted file mode 100644 index 2b98c670..00000000 --- a/distribution/src/main/resources/git.properties +++ /dev/null @@ -1,15 +0,0 @@ -#Generated by Git-Commit-Id-Plugin -#Wed Apr 03 15:25:29 CST 2019 -git.commit.id.abbrev=cc82c5b -git.commit.user.email=heavyrain.lee@gmail.com -git.commit.message.full=update version to 0.1.1\n -git.commit.id=cc82c5b420061994bc0621e807bb6c961370aef2 -git.commit.message.short=update version to 0.1.1 -git.commit.user.name=heavyrain2012 -git.build.user.name=heavyrain2012 -git.commit.id.describe=0.1.1-dirty -git.build.user.email=heavyrain.lee@gmail.com -git.branch=wildfirechat -git.commit.time=20190403134707 -git.build.time=20190403152529 -git.remote.origin.url=https\://github.com/wildfirechat/server.git