From 6b92e52555e619907283fc84f7cf23a220e9fb97 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 20 Nov 2023 16:08:52 +0800
Subject: [PATCH] 无人机 -集成rabbitMQ
---
src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java | 8 ++++----
src/main/resources/application.yml | 12 ++++++------
src/main/java/com/dji/sample/component/rabbitmq/config/MqttMsgProxyProducer.java | 9 ++++++---
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java b/src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java
index c54759b..67c6a9e 100644
--- a/src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java
+++ b/src/main/java/com/dji/sample/component/mqtt/handler/InboundMessageRouter.java
@@ -3,7 +3,7 @@
import com.dji.sample.common.util.SpringBeanUtils;
import com.dji.sample.component.mqtt.model.ChannelName;
import com.dji.sample.component.mqtt.model.DeviceTopicEnum;
-import com.dji.sample.component.rabbitmq.config.MqttMsgProxyProducer;
+//import com.dji.sample.component.rabbitmq.config.MqttMsgProxyProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.annotation.Router;
@@ -26,8 +26,8 @@
@Component
@Slf4j
public class InboundMessageRouter extends AbstractMessageRouter {
- @Autowired
- private MqttMsgProxyProducer mqttMsgProxyProducer;
+ /*@Autowired
+ private MqttMsgProxyProducer mqttMsgProxyProducer;*/
/**
* All mqtt broker messages will arrive here before distributing them to different channels.
@@ -47,7 +47,7 @@
MessageChannel bean = (MessageChannel) SpringBeanUtils.getBean(topicEnum.getBeanName());
String msg = new String(payload);
try {
- mqttMsgProxyProducer.publish(topic.replace("/","."), msg);
+// mqttMsgProxyProducer.publish(topic.replace("/","."), msg);
} catch (Exception e) {
log.error("消息发送失败：", e);
}
diff --git a/src/main/java/com/dji/sample/component/rabbitmq/config/MqttMsgProxyProducer.java b/src/main/java/com/dji/sample/component/rabbitmq/config/MqttMsgProxyProducer.java
index d73c026..2530072 100644
--- a/src/main/java/com/dji/sample/component/rabbitmq/config/MqttMsgProxyProducer.java
+++ b/src/main/java/com/dji/sample/component/rabbitmq/config/MqttMsgProxyProducer.java
@@ -1,3 +1,4 @@
+/*
package com.dji.sample.component.rabbitmq.config;
import org.springframework.amqp.core.Message;
@@ -44,13 +45,15 @@
rabbitTemplate.send(EXCHANGE_NAME,routingKey, message);
}
- /**
+ */
+/**
* 使用json序列化机制，进行消息转换
* @return -
- */
+ *//*
+
@Bean
public MessageConverter jackson2MessageConverter() {
return new Jackson2JsonMessageConverter();
}
-}
\ No newline at end of file
+}*/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bf30d20..c3b268d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -37,12 +37,12 @@
multipart:
max-file-size: 2GB
max-request-size: 2GB
- rabbitmq:
- host: 182.106.212.58
- port: 25672
- username: root
- password: root
- virtualHost: /
+# rabbitmq:
+# host: 182.106.212.58
+# port: 25672
+# username: root
+# password: root
+# virtualHost: /
# rabbitmq:
# host: localhost
# port: 5672
--
Gitblit v1.9.3