From 745d5b90be7d8cdb8873b18d18b286fdc4b6913b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 05 十二月 2023 10:13:57 +0800
Subject: [PATCH] 配置文件全部更改为配置类 优化包路径

---
 src/main/java/com/ard/utils/mqtt/MqttProducer.java |   29 +++++++++--------------------
 1 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ard/utils/mqtt/MqttProducer.java b/src/main/java/com/ard/utils/mqtt/MqttProducer.java
index 901dc64..9cf8bb1 100644
--- a/src/main/java/com/ard/utils/mqtt/MqttProducer.java
+++ b/src/main/java/com/ard/utils/mqtt/MqttProducer.java
@@ -9,6 +9,7 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 
 /**
@@ -22,27 +23,15 @@
 @Slf4j(topic = "mqtt")
 @Order(1)
 public class MqttProducer implements ApplicationRunner {
-    @Value("${spring.mqtt.enabled}")
-    private Boolean MQTT_ENABLED;
-    @Value("${spring.mqtt.host}")
-    private String MQTT_HOST;
-    @Value("${spring.mqtt.clientId}")
-    private String MQTT_CLIENT_ID;
-    @Value("${spring.mqtt.username}")
-    private String MQTT_USER_NAME;
-    @Value("${spring.mqtt.password}")
-    private String MQTT_PASSWORD;
-    @Value("${spring.mqtt.timeout}")
-    private int MQTT_TIMEOUT;
-    @Value("${spring.mqtt.keepalive}")
-    private int MQTT_KEEP_ALIVE;
+    @Resource
+    MqttConfiguration mqttConfig;
 
     private static MqttClient client;
 
     @Override
     public void run(ApplicationArguments args) {
         log.debug("鍒濆鍖栧苟鍚姩mqtt......");
-        if (MQTT_ENABLED) {
+        if (mqttConfig.getEnabled()) {
             this.connect();
         }
     }
@@ -70,7 +59,7 @@
     public void getClient() {
         try {
             if (null == client) {
-                client = new MqttClient(MQTT_HOST, MQTT_CLIENT_ID, new MemoryPersistence());
+                client = new MqttClient(mqttConfig.getHost(), mqttConfig.getClientId(), new MemoryPersistence());
             }
             log.debug("--鍒涘缓mqtt瀹㈡埛绔�");
         } catch (Exception e) {
@@ -84,12 +73,12 @@
     public MqttConnectOptions getOptions() {
         MqttConnectOptions options = new MqttConnectOptions();
         //璁剧疆鐢ㄦ埛鍚嶅瘑鐮�
-        options.setUserName(MQTT_USER_NAME);
-        options.setPassword(MQTT_PASSWORD.toCharArray());
+        options.setUserName(mqttConfig.getUsername());
+        options.setPassword(mqttConfig.getPassword().toCharArray());
         // 璁剧疆瓒呮椂鏃堕棿
-        options.setConnectionTimeout(MQTT_TIMEOUT);
+        options.setConnectionTimeout(mqttConfig.getTimeout());
         // 璁剧疆浼氳瘽蹇冭烦鏃堕棿
-        options.setKeepAliveInterval(MQTT_KEEP_ALIVE);
+        options.setKeepAliveInterval(mqttConfig.getKeepalive());
         // 鏄惁娓呴櫎session
         options.setCleanSession(false);
         log.debug("--鐢熸垚mqtt閰嶇疆瀵硅薄");

--
Gitblit v1.9.3