From 81cacf08b40f18b5f37f322a565297de75932555 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 18:13:30 +0800
Subject: [PATCH] aa

---
 server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
index be90149..6287b60 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
@@ -42,12 +42,17 @@
         mess.setRetained(true);
         mess.setPayload(message.getBytes());
         try {
+<<<<<<< HEAD
             MqttClientInit.getInstance(config).publish(topic, mess);
             return  1;
+=======
+            MqttClientInit.getInstance(config,callBack).publish(topic, mess);
+            return  0;
+>>>>>>> 07088f4225d6c8d21e94cc4981d4c28960f114d8
         } catch (Exception e) {
             //LOGGER.error(e.getLocalizedMessage());
         }
-        return 0;
+        return 1;
     }
     public static void main(String[] args) {
         MqttToolService client1 = new MqttToolService();

--
Gitblit v1.9.3