⏪ 还原代码 gitee #IBRFYZ 暂不做处理，留着 2.5.x 或者 2.6.x 处理

dromara · Mar 12, 2025 · 128091f · 128091f
1 parent 4c30d4f
commit 128091f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/...broker/src/main/java/org/dromara/mica/mqtt/broker/cluster/RedisMqttMessageDispatcher.java b/...broker/src/main/java/org/dromara/mica/mqtt/broker/cluster/RedisMqttMessageDispatcher.java
@@ -17,7 +17,6 @@
 package org.dromara.mica.mqtt.broker.cluster;
 
 import net.dreamlu.mica.redis.stream.RStreamTemplate;
-import org.dromara.mica.mqtt.codec.MqttPublishMessage;
 import org.dromara.mica.mqtt.core.server.dispatcher.IMqttMessageDispatcher;
 import org.dromara.mica.mqtt.core.server.model.Message;
 import org.dromara.mica.mqtt.core.server.serializer.IMessageSerializer;
@@ -43,7 +42,7 @@ public RedisMqttMessageDispatcher(RStreamTemplate streamTemplate,
 	}
 
 	@Override
-	public boolean send(MqttPublishMessage publishMessage, Message message) {
+	public boolean send(Message message) {
 		// 手动序列化和反序列化，避免 redis 序列化不一致问题
 		String topic = message.getTopic();
 		String key = topic == null ? message.getClientId() : topic;

diff --git a/...main/java/org/dromara/mica/mqtt/core/server/dispatcher/AbstractMqttMessageDispatcher.java b/...main/java/org/dromara/mica/mqtt/core/server/dispatcher/AbstractMqttMessageDispatcher.java
@@ -58,7 +58,7 @@ public void config(MqttServer mqttServer) {
 	public abstract void sendAll(Message message);
 
 	@Override
-	public boolean send(MqttPublishMessage publishMessage, Message message) {
+	public boolean send(Message message) {
 		Objects.requireNonNull(mqttServer, "MqttServer require not Null.");
 		// 1. 先发送到本服务
 		MessageType messageType = message.getMessageType();

diff --git a/...er/src/main/java/org/dromara/mica/mqtt/core/server/dispatcher/IMqttMessageDispatcher.java b/...er/src/main/java/org/dromara/mica/mqtt/core/server/dispatcher/IMqttMessageDispatcher.java
@@ -16,7 +16,6 @@
 
 package org.dromara.mica.mqtt.core.server.dispatcher;
 
-import org.dromara.mica.mqtt.codec.MqttPublishMessage;
 import org.dromara.mica.mqtt.core.server.model.Message;
 
 /**
@@ -29,21 +28,10 @@ public interface IMqttMessageDispatcher {
 	/**
 	 * 发送消息
 	 *
-	 * @param publishMessage MqttPublishMessage
 	 * @param message        消息
 	 * @return 是否成功
 	 */
-	boolean send(MqttPublishMessage publishMessage, Message message);
-
-	/**
-	 * 发送消息
-	 *
-	 * @param message        消息
-	 * @return 是否成功
-	 */
-	default boolean send(Message message) {
-		return send((MqttPublishMessage) null, message);
-	}
+	boolean send(Message message);
 
 	/**
 	 * 发送消息