From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 df6f04f..65c5e67 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;
@@ -11,6 +12,7 @@
import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
+import org.springframework.integration.mqtt.support.MqttHeaders;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
@@ -28,9 +30,6 @@
public class MqttInboundConfiguration {
@Autowired
- private MqttConfiguration mqttConfiguration;
-
- @Autowired
private MqttPahoClientFactory mqttClientFactory;
@Resource(name = ChannelName.INBOUND)
@@ -42,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);
@@ -56,13 +56,16 @@
/**
* Define a default channel to handle messages that have no effect.
+ * 定义默认通道处理无效消息
* @return
*/
@Bean
@ServiceActivator(inputChannel = ChannelName.DEFAULT)
public MessageHandler defaultInboundHandler() {
return message -> {
- log.info("The default channel does not handle messages.");
+ log.info("The default channel does not handle messages." +
+ "\nTopic: " + message.getHeaders().get(MqttHeaders.RECEIVED_TOPIC) +
+ "\nPayload: " + message.getPayload());
};
}
--
Gitblit v1.9.3