From 8ce3bb68bdc2250cc4a8a3d29085443fac64615a Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/main' into v1.2.0
---
src/main/java/com/dji/sample/component/mqtt/config/MqttMessageChannel.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/mqtt/config/MqttMessageChannel.java b/src/main/java/com/dji/sample/component/mqtt/config/MqttMessageChannel.java
index 2f06938..4b278a0 100644
--- a/src/main/java/com/dji/sample/component/mqtt/config/MqttMessageChannel.java
+++ b/src/main/java/com/dji/sample/component/mqtt/config/MqttMessageChannel.java
@@ -74,7 +74,7 @@
@Bean(name = ChannelName.INBOUND_OSD)
public MessageChannel osdChannel() {
- return new DirectChannel();
+ return new ExecutorChannel(threadPool);
}
@Bean(name = ChannelName.DEFAULT)
@@ -87,4 +87,69 @@
return new DirectChannel();
}
+ @Bean(name = ChannelName.INBOUND_STATE_FIRMWARE_VERSION)
+ public MessageChannel stateFirmwareVersionChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_REQUESTS)
+ public MessageChannel requestsChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_REQUESTS_STORAGE_CONFIG_GET)
+ public MessageChannel requestsConfigGetChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_EVENTS)
+ public MessageChannel eventsChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_EVENTS_FLIGHT_TASK_PROGRESS)
+ public MessageChannel eventsFlightTaskProgressChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_EVENTS_FILE_UPLOAD_CALLBACK)
+ public MessageChannel eventsFileUploadCallbackChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_REQUESTS_AIRPORT_BIND_STATUS)
+ public MessageChannel requestsAirportBindStatusChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_REQUESTS_AIRPORT_ORGANIZATION_GET)
+ public MessageChannel requestsAirportOrganizationGetChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_REQUESTS_AIRPORT_ORGANIZATION_BIND)
+ public MessageChannel requestsAirportOrganizationBindChannel() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_EVENTS_HMS)
+ public MessageChannel eventsHms() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_EVENTS_CONTROL_PROGRESS)
+ public MessageChannel eventsControlProgress() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_EVENTS_OTA_PROGRESS)
+ public MessageChannel eventsOtaProgress() {
+ return new DirectChannel();
+ }
+
+ @Bean(name = ChannelName.INBOUND_EVENTS_FILE_UPLOAD_PROGRESS)
+ public MessageChannel eventsFileUploadProgress() {
+ return new DirectChannel();
+ }
+
}
--
Gitblit v1.9.3