feat，添加mqtt订阅

server-common/src/main/java/com/makeit/module/iot/mqtt/DeviceInfo.java → server-web/src/main/java/com/makeit/mqtt/DeviceInfo.java

-package com.makeit.module.iot.mqtt;
+package com.makeit.mqtt;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

server-common/src/main/java/com/makeit/module/iot/mqtt/HeaderInfo.java → server-web/src/main/java/com/makeit/mqtt/HeaderInfo.java

-package com.makeit.module.iot.mqtt;
+package com.makeit.mqtt;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

server-common/src/main/java/com/makeit/module/iot/mqtt/MqttConfig.java → server-web/src/main/java/com/makeit/mqtt/MqttConfig.java

-package com.makeit.module.iot.mqtt;
+package com.makeit.mqtt;
 
 
 import com.makeit.module.iot.service.IotTokenService;
 import com.makeit.module.iot.service.IotTokenService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -49,7 +49,7 @@ public class MqttConfig {
         clientId = StringUtils.isNotEmpty(iotToken) ? iotToken : clientId;
         clientId = StringUtils.isNotEmpty(iotToken) ? iotToken : clientId;
         mqttPushClient.connect(hostUrl, clientId, username, password, timeout, keepalive);
         mqttPushClient.connect(hostUrl, clientId, username, password, timeout, keepalive);
         // 订阅主题
         // 订阅主题
-        mqttPushClient.subscribe("/device/*/*/**", 0);
+        mqttPushClient.subscribe(defaultTopic, 0);
         return mqttPushClient;
         return mqttPushClient;
     }
     }
 
 

server-common/src/main/java/com/makeit/module/iot/mqtt/MqttPushClient.java → server-web/src/main/java/com/makeit/mqtt/MqttPushClient.java

-package com.makeit.module.iot.mqtt;
+package com.makeit.mqtt;
 
 
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
@@ -85,7 +85,7 @@ public class MqttPushClient {
     }
     }
 
 
     public void subscribe(String defaultTopic, int qos) {
     public void subscribe(String defaultTopic, int qos) {
-        logger.info("开始订阅主题" + defaultTopic);
+        logger.info("开始订阅主题:" + defaultTopic);
         try {
         try {
             MqttPushClient.getMqttClient().subscribe(defaultTopic, qos);
             MqttPushClient.getMqttClient().subscribe(defaultTopic, qos);
         } catch (MqttException e) {
         } catch (MqttException e) {

server-common/src/main/java/com/makeit/module/iot/mqtt/PushCallback.java → server-web/src/main/java/com/makeit/mqtt/PushCallback.java

-package com.makeit.module.iot.mqtt;
+package com.makeit.mqtt;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;

server-web/src/main/resources/application-dev.yml

@@ -116,7 +116,7 @@ mqtt:
   password: 8e3795ef7b5e95869fa8c323b865b3a9
   password: 8e3795ef7b5e95869fa8c323b865b3a9
   hostUrl: tcp://124.71.33.17:11883
   hostUrl: tcp://124.71.33.17:11883
   clientId: ab3a2fd694c8c838aba2686df3a80e7b
   clientId: ab3a2fd694c8c838aba2686df3a80e7b
-  defaultTopic:
+  defaultTopic: /device/*/*/**
   timeout: 10
   timeout: 10
   keepalive: 60
   keepalive: 60
 
 

server-web/src/main/resources/application-test.yml

@@ -113,7 +113,7 @@ mqtt:
   password: 8e3795ef7b5e95869fa8c323b865b3a9
   password: 8e3795ef7b5e95869fa8c323b865b3a9
   hostUrl: tcp://124.71.33.17:11883
   hostUrl: tcp://124.71.33.17:11883
   clientId: ab3a2fd694c8c838aba2686df3a80e7b
   clientId: ab3a2fd694c8c838aba2686df3a80e7b
-  defaultTopic:
+  defaultTopic: /device/*/*/**
   timeout: 10
   timeout: 10
   keepalive: 60
   keepalive: 60
 
 

server-web/src/test/java/com/makeit/iotapi/IotTest.java

@@ -59,7 +59,7 @@ public class IotTest {
 
 
     @Test
     @Test
     void getLastDeviceLog() {
     void getLastDeviceLog() {
-        iotProductDeviceService.getLastDeviceLog("1694547143952007168");
+        iotProductDeviceService.getLastDeviceLog("1701127702523473920");
     }
     }
 
 
     @Test
     @Test