```

refactor(mqtt): 移除application.properties中的硬编码配置移除mqtt相关配置项，改为从nacos配置中心获取 BREAKING CHANGE: mqtt连接配置已从application.properties中移除，需要通过nacos配置中心进行配置 ```

```
refactor(mqtt): 移除application.properties中的硬编码配置移除mqtt相关配置项，改为从nacos配置中心获取 BREAKING CHANGE: mqtt连接配置已从application.properties中移除，需要通过nacos配置中心进行配置 ```
zhangmeiyang
1 parent 67a28bb1
Showing 5 changed files with 8 additions and 18 deletions
mqtt-boot/src/main/resources/application.properties
mqtt-core/pom.xml
mqtt-core/src/main/java/com/diligrp/mqtt/core/event/RecFailEvent.java
mqtt-integration/pom.xml
mqtt-integration/src/main/java/com/diligrp/mqtt/integration/handler/MqttMessageReceiver.java
@@ -9,13 +9,3 @@ spring.cloud.nacos.config.server-addr=nacos.diligrp.com:8848
 spring.cloud.nacos.config.namespace=2267e673-b41f-458d-9643-2a03e4fd92fb
 spring.config.import[0]=nacos:${spring.application.name}.properties
 spring.config.import[1]=nacos:${spring.application.name}-${spring.profiles.active}.properties
-
-
-mqtt.url=tcp://10.30.110.178:11883
-mqtt.clientId=mqtt-agent
-mqtt.username=test_group
-mqtt.password=1qaz2wsx
-mqtt.timeOut=10
-mqtt.cleanSession=true
-mqtt.automaticReconnect=true
-mqtt.qos=1
@@ -19,6 +19,10 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-integration</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
@@ -3,6 +3,7 @@ package com.diligrp.mqtt.core.event;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
+import org.springframework.messaging.Message;
 /**
  * @Author: zhangmeiyang
@@ -12,9 +13,9 @@ import org.springframework.context.ApplicationEvent;
 @Getter
 @Setter
 public class RecFailEvent extends ApplicationEvent {
-    private String message;
+    private Message<?> message;
-    public RecFailEvent(Object source, String message) {
+    public RecFailEvent(Object source, Message<?> message) {
         super(source);
         this.message = message;
     }
@@ -21,10 +21,6 @@
             <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-integration</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-mqtt</artifactId>
         </dependency>
@@ -3,7 +3,6 @@ package com.diligrp.mqtt.integration.handler;
 import com.diligrp.mqtt.core.event.RecFailEvent;
 import com.diligrp.mqtt.core.event.RecSuccessEvent;
 import com.diligrp.mqtt.core.model.ReceiveModel;
-import com.diligrp.mqtt.core.util.JsonUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
@@ -64,7 +63,7 @@ public class MqttMessageReceiver {
             applicationEventPublisher.publishEvent(new RecSuccessEvent(this, receiveModel));
         } catch (Exception e) {
             log.error("处理MQTT消息失败", e);
-            applicationEventPublisher.publishEvent(new RecFailEvent(this, JsonUtils.toJsonString(message)));
+            applicationEventPublisher.publishEvent(new RecFailEvent(this, message));
         }
     }