From a7aaeabc7873a0eafb4a7ecad7f65b018b7a9bc9 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 24 Feb 2023 19:31:23 +0800
Subject: [PATCH] What's new? 1. Add license for dock. 2. Modify the logic corresponding to the firmware file and device type. 3. Add multiple mqtt clients options. 4. Modify the structure of the interface for obtaining the device list. 5. Fixed some issues.
---
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