From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java | 5 -----
1 files changed, 0 insertions(+), 5 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 6287b60..27a35e5 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,13 +42,8 @@
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());
}
--
Gitblit v1.9.3