From 4e9cf86302cf98e0fd095a7fcde44e261b58684e Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Wed, 11 May 2022 09:28:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E5=92=8C=E9=A2=91?= =?UTF-8?q?=E9=81=93=E5=9B=9E=E8=B0=83=E6=B6=88=E6=81=AF=E5=B8=A6=E4=B8=8A?= =?UTF-8?q?messageid=E5=92=8C=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/moquette/spi/impl/MessagesPublisher.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java index 433e1697..d04c31c7 100755 --- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java @@ -24,7 +24,6 @@ import com.google.gson.Gson; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.util.StringUtil; import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus; -import cn.wildfirechat.pojos.SendMessageData; import com.xiaoleilu.loServer.model.FriendData; import io.moquette.persistence.*; import io.moquette.persistence.MemorySessionStore.Session; @@ -179,7 +178,7 @@ public class MessagesPublisher { final WFCMessage.Message finalMsg = message; Server.getServer().getCallbackScheduler().execute(() -> { try { - HttpUtils.httpJsonPost(robot.getCallback(), new Gson().toJson(SendMessageData.fromProtoMessage(finalMsg), SendMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback); + HttpUtils.httpJsonPost(robot.getCallback(), new Gson().toJson(OutputMessageData.fromProtoMessage(finalMsg), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback); } catch (Exception e) { e.printStackTrace(); Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception); @@ -598,7 +597,7 @@ public class MessagesPublisher { if (channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback())) { Server.getServer().getCallbackScheduler().execute(() -> { try { - HttpUtils.httpJsonPost(channelInfo.getCallback() + "/message", new Gson().toJson(SendMessageData.fromProtoMessage(message), SendMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Channel_Message_Callback); + HttpUtils.httpJsonPost(channelInfo.getCallback() + "/message", new Gson().toJson(OutputMessageData.fromProtoMessage(message), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Channel_Message_Callback); } catch (Exception e) { e.printStackTrace(); Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);