✨ mica-mqtt-server 用户绑定使用 tio 内置

dromara · May 20, 2024 · 4624f41 · 4624f41
1 parent 3b3bc80
commit 4624f41
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttConst.java b/mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttConst.java
@@ -27,10 +27,6 @@ public interface MqttConst {
 	 * 是 http 协议
 	 */
 	String IS_HTTP = "is_http";
-	/**
-	 * 用户名 key
-	 */
-	String USER_NAME_KEY = "username";
 	/**
 	 * session 有效期，小于等于 0，关闭时清理，大于 0 采用缓存处理
 	 */

diff --git a/mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java b/mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java
@@ -104,9 +104,7 @@ public void onBeforeClose(ChannelContext context, Throwable throwable, String re
 		// 6. 会话清理
 		cleanSession(clientId);
 		// 7. 下线事件
-		String username = context.get(MqttConst.USER_NAME_KEY);
-		context.remove(MqttConst.USER_NAME_KEY);
-		notify(context, clientId, username, remark);
+		notify(context, clientId, remark);
 	}
 
 	private void sendWillMessage(String clientId) {
@@ -133,7 +131,8 @@ private void cleanSession(String clientId) {
 		}
 	}
 
-	private void notify(ChannelContext context, String clientId, String username, String remark) {
+	private void notify(ChannelContext context, String clientId, String remark) {
+		String username = context.getUserId();
 		executor.execute(() -> {
 			try {
 				connectStatusListener.offline(context, clientId, username, remark);

diff --git a/...er/src/main/java/net/dreamlu/iot/mqtt/core/server/support/DefaultMqttServerProcessor.java b/...er/src/main/java/net/dreamlu/iot/mqtt/core/server/support/DefaultMqttServerProcessor.java
@@ -19,7 +19,6 @@
 import net.dreamlu.iot.mqtt.codec.*;
 import net.dreamlu.iot.mqtt.core.common.MqttPendingPublish;
 import net.dreamlu.iot.mqtt.core.common.MqttPendingQos2Publish;
-import net.dreamlu.iot.mqtt.core.server.MqttConst;
 import net.dreamlu.iot.mqtt.core.server.MqttServerCreator;
 import net.dreamlu.iot.mqtt.core.server.MqttServerProcessor;
 import net.dreamlu.iot.mqtt.core.server.auth.IMqttServerAuthHandler;
@@ -130,7 +129,7 @@ public void processConnect(ChannelContext context, MqttConnectMessage mqttMessag
 		// 5. 绑定 uniqueId、保存 username
 		Tio.bindBsId(context, uniqueId);
 		if (StrUtil.isNotBlank(userName)) {
-			context.set(MqttConst.USER_NAME_KEY, userName);
+			Tio.bindUser(context, userName);
 		}
 		// 6. 心跳超时时间，当然这个值如果小于全局配置（默认：120s），定时检查的时间间隔还是以全局为准，只是在判断时用此值
 		float keepAliveBackoff = serverCreator.getKeepaliveBackoff();

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <!-- mica-mqtt version -->
-        <revision>2.2.14-SNAPSHOT</revision>
+        <revision>2.3.0-SNAPSHOT</revision>
         <!-- java version -->
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>