✨ 代码优化。

mica-mqtt-codec/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.dreamlu</groupId>
         <artifactId>mica-mqtt</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>2021.00</version>
     </parent>
     <artifactId>mica-mqtt-codec</artifactId>
 

mica-mqtt-codec/src/main/java/net/dreamlu/iot/mqtt/codec/MqttMessageBuilders.java

@@ -506,8 +506,7 @@ public final class MqttMessageBuilders {
 	}
 
 	public static final class PubAckBuilder {
-
-		private short packetId;
+		private int packetId;
 		private byte reasonCode;
 		private MqttProperties properties;
 
@@ -519,7 +518,7 @@ public final class MqttMessageBuilders {
 			return this;
 		}
 
-		public PubAckBuilder packetId(short packetId) {
+		public PubAckBuilder packetId(int packetId) {
 			this.packetId = packetId;
 			return this;
 		}
@@ -539,15 +538,14 @@ public final class MqttMessageBuilders {
 	}
 
 	public static final class SubAckBuilder {
-
-		private short packetId;
+		private int packetId;
 		private MqttProperties properties;
 		private final List<MqttQoS> grantedQosList = new ArrayList<>();
 
 		SubAckBuilder() {
 		}
 
-		public SubAckBuilder packetId(short packetId) {
+		public SubAckBuilder packetId(int packetId) {
 			this.packetId = packetId;
 			return this;
 		}
@@ -586,15 +584,14 @@ public final class MqttMessageBuilders {
 	}
 
 	public static final class UnsubAckBuilder {
-
-		private short packetId;
+		private int packetId;
 		private MqttProperties properties;
 		private final List<Short> reasonCodes = new ArrayList<>();
 
 		UnsubAckBuilder() {
 		}
 
-		public UnsubAckBuilder packetId(short packetId) {
+		public UnsubAckBuilder packetId(int packetId) {
 			this.packetId = packetId;
 			return this;
 		}

mica-mqtt-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.dreamlu</groupId>
         <artifactId>mica-mqtt</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>2021.00</version>
     </parent>
     <artifactId>mica-mqtt-core</artifactId>
 

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClient.java

@@ -62,9 +62,7 @@ public final class MqttClient {
 			.addSubscription(MqttQoS.AT_MOST_ONCE, topicFilter)
 			.messageId(MqttClientMessageId.getId())
 			.build();
-		Tio.send(context, message);
-		// 绑定 subManage listener
-		return this;
+		return subscribe(message, listener);
 	}
 
 	/**
@@ -80,9 +78,7 @@ public final class MqttClient {
 			.addSubscription(MqttQoS.AT_LEAST_ONCE, topicFilter)
 			.messageId(MqttClientMessageId.getId())
 			.build();
-		Tio.send(context, message);
-		// 绑定 subManage listener
-		return this;
+		return subscribe(message, listener);
 	}
 
 	/**
@@ -99,6 +95,18 @@ public final class MqttClient {
 			.messageId(MqttClientMessageId.getId())
 			.build();
 		Tio.send(context, message);
+		return subscribe(message, listener);
+	}
+
+	/**
+	 * 订阅
+	 *
+	 * @param message  MqttSubscribeMessage
+	 * @param listener MqttMessageListener
+	 * @return MqttClient
+	 */
+	public MqttClient subscribe(MqttSubscribeMessage message, MqttMessageListener listener) {
+		Tio.send(context, message);
 		// 绑定 subManage listener
 		return this;
 	}

mica-mqtt-example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.dreamlu</groupId>
         <artifactId>mica-mqtt</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>2021.00</version>
     </parent>
     <artifactId>mica-mqtt-example</artifactId>
 

mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/aliyun/MqttClientTest.java

@@ -34,11 +34,12 @@ public class MqttClientTest {
 			.clientId(clientId)
 			.connect();
 
-		client.subQos0("/sys/g27jB42P9hm/3dbc1cb4/thing/event/property/post_reply", (topic, payload) -> {
+		client.subQos0("/sys/" + productKey + "/" + deviceName + "/thing/event/property/post_reply", (topic, payload) -> {
 
 		});
 
 		String content = "{\"id\":\"1\",\"version\":\"1.0\",\"params\":{\"LightSwitch\":1}}";
-		client.publish("/sys/g27jB42P9hm/" + deviceName + "/thing/event/property/post", ByteBuffer.wrap(content.getBytes()));
+		client.publish("/sys/" + productKey + "/" + deviceName + "/thing/event/property/post", ByteBuffer.wrap(content.getBytes()));
 	}
+
 }

pom.xml

@@ -4,37 +4,17 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.dreamlu</groupId>
     <artifactId>mica-mqtt</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2021.00</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
     <description>Mica mqtt tools.</description>
     <url>https://www.dreamlu.net/</url>
 
-    <licenses>
-        <license>
-            <name>Apache License 2.0</name>
-            <url>http://www.apache.org/licenses</url>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>ChunmengLu</name>
-            <email>qq596392912@gmail.com</email>
-        </developer>
-    </developers>
-
-    <scm>
-        <connection>scm:git:git@git.oschina.net/596392912/mica-mqtt</connection>
-        <developerConnection>scm:git:git@git.oschina.net/596392912/mica-mqtt.git</developerConnection>
-        <url>git@git.oschina.net/596392912/mica-mqtt.git</url>
-    </scm>
-
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mica-iot.version>0.0.1-SNAPSHOT</mica-iot.version>
+        <mica-iot.version>2021.00</mica-iot.version>
         <tio.version>3.7.1.v20210106-RELEASE</tio.version>
         <slf4j.version>1.7.25</slf4j.version>
     </properties>
@@ -65,6 +45,28 @@
         </dependencies>
     </dependencyManagement>
 
+    <developers>
+        <developer>
+            <name>ChunmengLu</name>
+            <email>qq596392912@gmail.com</email>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:git@git.oschina.net/596392912/mica-mqtt</connection>
+        <developerConnection>scm:git:git@git.oschina.net/596392912/mica-mqtt.git</developerConnection>
+        <url>git@git.oschina.net/596392912/mica-mqtt.git</url>
+    </scm>
+
+    <repositories>
+        <!--阿里云主仓库，代理了 maven central 和 jcenter 仓库-->
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>
@@ -80,14 +82,12 @@
         </plugins>
     </build>
 
-    <repositories>
-        <!--阿里云主仓库，代理了 maven central 和 jcenter 仓库-->
-        <repository>
-            <id>aliyun</id>
-            <name>aliyun</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-        </repository>
-    </repositories>
+    <licenses>
+        <license>
+            <name>Apache License 2.0</name>
+            <url>http://www.apache.org/licenses</url>
+        </license>
+    </licenses>
 
     <profiles>
         <profile>