From 47dde325a90c57e43cc8e5eea52147f7d851911d Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 28 Feb 2025 13:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/hxjt/dataupload/mqtt/MqttCallback.java | 2 ++
 src/main/java/com/hxjt/dataupload/mqtt/MqttClient.java   | 7 +++++--
 src/main/java/com/hxjt/dataupload/mqtt/MqttConfig.java   | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hxjt/dataupload/mqtt/MqttCallback.java b/src/main/java/com/hxjt/dataupload/mqtt/MqttCallback.java
index a1e4ec8..1b657b3 100644
--- a/src/main/java/com/hxjt/dataupload/mqtt/MqttCallback.java
+++ b/src/main/java/com/hxjt/dataupload/mqtt/MqttCallback.java
@@ -6,6 +6,7 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -13,6 +14,7 @@ public class MqttCallback implements org.eclipse.paho.client.mqttv3.MqttCallback
     private static final Logger logger = LoggerFactory.getLogger(com.hxjt.dataupload.mqtt.MqttClient.class);
 
     @Autowired
+    @Lazy
     private MqttConfig mqttConfig;
 
     private static org.eclipse.paho.client.mqttv3.MqttClient client;
diff --git a/src/main/java/com/hxjt/dataupload/mqtt/MqttClient.java b/src/main/java/com/hxjt/dataupload/mqtt/MqttClient.java
index 69420ae..bbdd249 100644
--- a/src/main/java/com/hxjt/dataupload/mqtt/MqttClient.java
+++ b/src/main/java/com/hxjt/dataupload/mqtt/MqttClient.java
@@ -11,9 +11,12 @@ import org.springframework.stereotype.Component;
 @Component
 public class MqttClient {
     private static final Logger logger = LoggerFactory.getLogger(com.hxjt.dataupload.mqtt.MqttClient.class);
-
-    @Autowired
+    
     private MqttCallback pushCallback;
+    @Autowired
+    public void setPushCallback(MqttCallback pushCallback) {
+        this.pushCallback = pushCallback;
+    }
 
     private static org.eclipse.paho.client.mqttv3.MqttClient client;
 
diff --git a/src/main/java/com/hxjt/dataupload/mqtt/MqttConfig.java b/src/main/java/com/hxjt/dataupload/mqtt/MqttConfig.java
index 5af081d..fee6e56 100644
--- a/src/main/java/com/hxjt/dataupload/mqtt/MqttConfig.java
+++ b/src/main/java/com/hxjt/dataupload/mqtt/MqttConfig.java
@@ -4,14 +4,17 @@ package com.hxjt.dataupload.mqtt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 @Component
 @ConfigurationProperties("spring.mqtt")
-
+@DependsOn("mqttCallback")
 public class MqttConfig {
     @Autowired
+    @Lazy
     private com.hxjt.dataupload.mqtt.MqttClient mqttClient;
 
     private String username;