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/MqttConfiguration.java | 75 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/mqtt/config/MqttConfiguration.java b/src/main/java/com/dji/sample/component/mqtt/config/MqttConfiguration.java
index 750ba58..69c6398 100644
--- a/src/main/java/com/dji/sample/component/mqtt/config/MqttConfiguration.java
+++ b/src/main/java/com/dji/sample/component/mqtt/config/MqttConfiguration.java
@@ -1,5 +1,10 @@
package com.dji.sample.component.mqtt.config;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.dji.sample.common.util.JwtUtil;
+import com.dji.sample.component.mqtt.model.MqttClientOptions;
+import com.dji.sample.component.mqtt.model.MqttProtocolEnum;
+import com.dji.sample.component.mqtt.model.MqttUseEnum;
import lombok.Data;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -7,6 +12,9 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.util.StringUtils;
+
+import java.util.Map;
/**
*
@@ -16,39 +24,60 @@
*/
@Configuration
@Data
-@ConfigurationProperties(prefix = "mqtt")
+@ConfigurationProperties
public class MqttConfiguration {
- private String protocol;
+ private static Map<MqttUseEnum, MqttClientOptions> mqtt;
- private String host;
-
- private Integer port;
-
- private String username;
-
- private String password;
-
- private String clientId;
+ public void setMqtt(Map<MqttUseEnum, MqttClientOptions> mqtt) {
+ MqttConfiguration.mqtt = mqtt;
+ }
/**
- * The topic to subscribe to immediately when client connects.
+ * Get the configuration options of the basic link of the mqtt client.
+ * @return
*/
- private String inboundTopic;
+ static MqttClientOptions getBasicClientOptions() {
+ if (!mqtt.containsKey(MqttUseEnum.BASIC)) {
+ throw new Error("Please configure the basic mqtt connection parameters first, otherwise application cannot be started.");
+ }
+ return mqtt.get(MqttUseEnum.BASIC);
+ }
+
+ /**
+ * Get the mqtt address of the basic link.
+ * @return
+ */
+ public static String getBasicMqttAddress() {
+ return getMqttAddress(getBasicClientOptions());
+ }
+
+ /**
+ * Splice the mqtt address according to the parameters of different clients.
+ * @param options
+ * @return
+ */
+ private static String getMqttAddress(MqttClientOptions options) {
+ StringBuilder addr = new StringBuilder()
+ .append(options.getProtocol().getProtocolAddr())
+ .append(options.getHost().trim())
+ .append(":")
+ .append(options.getPort());
+ if ((options.getProtocol() == MqttProtocolEnum.WS || options.getProtocol() == MqttProtocolEnum.WSS)
+ && StringUtils.hasText(options.getPath())) {
+ addr.append(options.getPath());
+ }
+ return addr.toString();
+ }
@Bean
public MqttConnectOptions mqttConnectOptions() {
+ MqttClientOptions customizeOptions = getBasicClientOptions();
MqttConnectOptions mqttConnectOptions = new MqttConnectOptions();
- mqttConnectOptions.setServerURIs(new String[]{
- new StringBuilder()
- .append(protocol.trim())
- .append("://")
- .append(host.trim())
- .append(":")
- .append(port)
- .toString()});
- mqttConnectOptions.setUserName(username);
- mqttConnectOptions.setPassword(password.toCharArray());
+ mqttConnectOptions.setServerURIs(new String[]{ getBasicMqttAddress() });
+ mqttConnectOptions.setUserName(customizeOptions.getUsername());
+ mqttConnectOptions.setPassword(StringUtils.hasText(customizeOptions.getPassword()) ?
+ customizeOptions.getPassword().toCharArray() : new char[0]);
mqttConnectOptions.setAutomaticReconnect(true);
mqttConnectOptions.setKeepAliveInterval(10);
return mqttConnectOptions;
--
Gitblit v1.9.3