Merge branch 'dev' of https://gitee.com/596392912/mica-mqtt into dev

mica-mqtt-broker/src/main/java/org/dromara/mica/mqtt/broker/cluster/RedisMqttMessageDispatcher.java

@@ -17,6 +17,7 @@
 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;
@@ -42,7 +43,7 @@ public RedisMqttMessageDispatcher(RStreamTemplate streamTemplate,
 	}
 
 	@Override
-	public boolean send(Message message) {
+	public boolean send(MqttPublishMessage publishMessage, Message message) {
 		// 手动序列化和反序列化，避免 redis 序列化不一致问题
 		String topic = message.getTopic();
 		String key = topic == null ? message.getClientId() : topic;

mica-mqtt-server/src/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(Message message) {
+	public boolean send(MqttPublishMessage publishMessage, Message message) {
 		Objects.requireNonNull(mqttServer, "MqttServer require not Null.");
 		// 1. 先发送到本服务
 		MessageType messageType = message.getMessageType();

mica-mqtt-server/src/main/java/org/dromara/mica/mqtt/core/server/dispatcher/IMqttMessageDispatcher.java

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

pom.xml

@@ -20,7 +20,7 @@
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <maven-flatten.version>1.7.0</maven-flatten.version>
         <!-- mica-net version -->
-        <mica-net.version>1.0.13</mica-net.version>
+        <mica-net.version>1.1.1</mica-net.version>
         <mica.version>2.7.18.9</mica.version>
         <spring.boot.version>2.7.18</spring.boot.version>
         <gson.version>2.12.1</gson.version>