From ca0a832d45d5ee63ac01d8bbe221cede8700b215 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 22 Sep 2023 14:56:49 +0800
Subject: [PATCH] 支持多设备

---
 src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java b/src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java
index 3964aaf..40dada5 100644
--- a/src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java
+++ b/src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java
@@ -1,6 +1,7 @@
 package com.dji.sample.component.mqtt.config;
 
 import com.dji.sample.component.mqtt.model.ChannelName;
+import com.dji.sample.component.mqtt.model.MqttClientOptions;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -29,9 +30,6 @@
 public class MqttInboundConfiguration {
 
     @Autowired
-    private MqttConfiguration mqttConfiguration;
-
-    @Autowired
     private MqttPahoClientFactory mqttClientFactory;
 
     @Resource(name = ChannelName.INBOUND)
@@ -43,9 +41,10 @@
      */
     @Bean(name = "adapter")
     public MessageProducerSupport mqttInbound() {
+        MqttClientOptions options = MqttConfiguration.getBasicClientOptions();
         MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter(
-                mqttConfiguration.getClientId() + "_consumer_" + System.currentTimeMillis(),
-                mqttClientFactory, mqttConfiguration.getInboundTopic().split(","));
+                options.getClientId() + "_consumer_" + System.currentTimeMillis(),
+                mqttClientFactory, options.getInboundTopic().split(","));
         DefaultPahoMessageConverter converter = new DefaultPahoMessageConverter();
         // use byte types uniformly
         converter.setPayloadAsBytes(true);

--
Gitblit v1.9.3