From 08b3886238832a2710daee536c31731028b2d327 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Sat, 2 Aug 2025 10:38:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=BA=E5=99=A8=E4=BA=BA?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E9=85=8D=E7=BD=AE=E5=B8=A6=E4=B8=8A=E5=8F=91?= =?UTF-8?q?=E9=80=81=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/moquette/spi/impl/MessagesPublisher.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 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 00898879..d04806cc 100755 --- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java @@ -178,19 +178,10 @@ public class MessagesPublisher { if (message == null) { message = m_messagesStore.getMessage(messageId); } - OutputClient outputClient = null; - if(m_messagesStore.isRobotCallbackWithClientInfo() && !StringUtil.isNullOrEmpty(exceptClientId)) { - Session session = m_sessionsStore.getSession(exceptClientId); - if(session != null && session.getUsername().equals(sender)) { - outputClient = new OutputClient(session.getPlatform(), exceptClientId); - } - } - - final WFCMessage.Message finalMsg = message; - OutputClient finalOutputClient = outputClient; + OutputMessageData outputMessageData = getOutputMessageWithExtraInfo(message, exceptClientId, m_messagesStore.isRobotCallbackWithClientInfo() , m_messagesStore.isRobotCallbackWithSenderInfo(), m_messagesStore.isRobotCallbackWithTargetInfo()); Server.getServer().getCallbackScheduler().execute(() -> { try { - HttpUtils.httpJsonPost(robot.getCallback(), GsonUtil.gson.toJson(OutputMessageData.fromProtoMessage(finalMsg, finalOutputClient), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback); + HttpUtils.httpJsonPost(robot.getCallback(), GsonUtil.gson.toJson(outputMessageData, OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback); } catch (Exception e) { e.printStackTrace(); Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);