From 24b0b79158fc499f2e2f6b67e169b3b4dff97569 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 23 Mar 2024 16:58:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev

---
 src/main/java/com/dji/sample/component/mqtt/config/MqttOutboundConfiguration.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/dji/sample/component/mqtt/config/MqttOutboundConfiguration.java b/src/main/java/com/dji/sample/component/mqtt/config/MqttOutboundConfiguration.java
index 69b919b..a376093 100644
--- a/src/main/java/com/dji/sample/component/mqtt/config/MqttOutboundConfiguration.java
+++ b/src/main/java/com/dji/sample/component/mqtt/config/MqttOutboundConfiguration.java
@@ -33,7 +33,7 @@
     @ServiceActivator(inputChannel = ChannelName.OUTBOUND)
     public MessageHandler mqttOutbound() {
         MqttPahoMessageHandler messageHandler = new MqttPahoMessageHandler(
-                mqttConfiguration.getClientId() + "_producer_" + System.currentTimeMillis(),
+                MqttConfiguration.getBasicClientOptions().getClientId() + "_producer_" + System.currentTimeMillis(),
                 mqttClientFactory);
         DefaultPahoMessageConverter converter = new DefaultPahoMessageConverter();
         // use byte types uniformly

--
Gitblit v1.9.3