From 6892a2e43eb184efe91049f18e583097bbd2b3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com>
Date: Mon, 15 Mar 2021 19:22:53 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mica-mqtt-codec/pom.xml | 2 +-
.../iot/mqtt/codec/MqttMessageBuilders.java | 15 ++---
mica-mqtt-core/pom.xml | 2 +-
.../iot/mqtt/core/client/MqttClient.java | 20 +++++--
mica-mqtt-example/pom.xml | 2 +-
.../iot/mqtt/aliyun/MqttClientTest.java | 5 +-
pom.xml | 60 +++++++++----------
7 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/mica-mqtt-codec/pom.xml b/mica-mqtt-codec/pom.xml
index 2d9233a..8f0a03e 100644
--- a/mica-mqtt-codec/pom.xml
+++ b/mica-mqtt-codec/pom.xml
@@ -6,7 +6,7 @@
net.dreamlu
mica-mqtt
- 0.0.1-SNAPSHOT
+ 2021.00
mica-mqtt-codec
diff --git a/mica-mqtt-codec/src/main/java/net/dreamlu/iot/mqtt/codec/MqttMessageBuilders.java b/mica-mqtt-codec/src/main/java/net/dreamlu/iot/mqtt/codec/MqttMessageBuilders.java
index b85e5c9..3517d6d 100644
--- a/mica-mqtt-codec/src/main/java/net/dreamlu/iot/mqtt/codec/MqttMessageBuilders.java
+++ b/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 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 reasonCodes = new ArrayList<>();
UnsubAckBuilder() {
}
- public UnsubAckBuilder packetId(short packetId) {
+ public UnsubAckBuilder packetId(int packetId) {
this.packetId = packetId;
return this;
}
diff --git a/mica-mqtt-core/pom.xml b/mica-mqtt-core/pom.xml
index 731ad40..a57eadc 100644
--- a/mica-mqtt-core/pom.xml
+++ b/mica-mqtt-core/pom.xml
@@ -6,7 +6,7 @@
net.dreamlu
mica-mqtt
- 0.0.1-SNAPSHOT
+ 2021.00
mica-mqtt-core
diff --git a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClient.java b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClient.java
index 4d9bcce..b1ff53d 100644
--- a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClient.java
+++ b/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;
}
diff --git a/mica-mqtt-example/pom.xml b/mica-mqtt-example/pom.xml
index 5935edf..f5c696c 100644
--- a/mica-mqtt-example/pom.xml
+++ b/mica-mqtt-example/pom.xml
@@ -6,7 +6,7 @@
net.dreamlu
mica-mqtt
- 0.0.1-SNAPSHOT
+ 2021.00
mica-mqtt-example
diff --git a/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/aliyun/MqttClientTest.java b/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/aliyun/MqttClientTest.java
index d889e4c..c85bd32 100644
--- a/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/aliyun/MqttClientTest.java
+++ b/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()));
}
+
}
diff --git a/pom.xml b/pom.xml
index 170a605..c0d8f25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,37 +4,17 @@
4.0.0
net.dreamlu
mica-mqtt
- 0.0.1-SNAPSHOT
+ 2021.00
pom
${project.artifactId}
Mica mqtt tools.
https://www.dreamlu.net/
-
-
- Apache License 2.0
- http://www.apache.org/licenses
-
-
-
-
-
- ChunmengLu
- qq596392912@gmail.com
-
-
-
-
- scm:git:git@git.oschina.net/596392912/mica-mqtt
- scm:git:git@git.oschina.net/596392912/mica-mqtt.git
- git@git.oschina.net/596392912/mica-mqtt.git
-
-
1.8
UTF-8
- 0.0.1-SNAPSHOT
+ 2021.00
3.7.1.v20210106-RELEASE
1.7.25
@@ -65,6 +45,28 @@
+
+
+ ChunmengLu
+ qq596392912@gmail.com
+
+
+
+
+ scm:git:git@git.oschina.net/596392912/mica-mqtt
+ scm:git:git@git.oschina.net/596392912/mica-mqtt.git
+ git@git.oschina.net/596392912/mica-mqtt.git
+
+
+
+
+
+ aliyun
+ aliyun
+ https://maven.aliyun.com/repository/public
+
+
+
@@ -80,14 +82,12 @@
-
-
-
- aliyun
- aliyun
- https://maven.aliyun.com/repository/public
-
-
+
+
+ Apache License 2.0
+ http://www.apache.org/licenses
+
+
--
GitLab