From 32cecb3a1f25b01226d81a7dcd61fd82d77f3ece Mon Sep 17 00:00:00 2001
From: jack ning <github@bytedesk.com>
Date: Tue, 17 Dec 2024 23:57:18 +0800
Subject: [PATCH] Sync from bytedesk-private: update

---
 .../com/bytedesk/core/message/MessageSocketService.java  | 9 +++------
 .../com/bytedesk/core/socket/mqtt/protocol/Publish.java  | 5 ++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/java/com/bytedesk/core/message/MessageSocketService.java b/modules/core/src/main/java/com/bytedesk/core/message/MessageSocketService.java
index a8f17a722e..eac509d49f 100644
--- a/modules/core/src/main/java/com/bytedesk/core/message/MessageSocketService.java
+++ b/modules/core/src/main/java/com/bytedesk/core/message/MessageSocketService.java
@@ -114,11 +114,9 @@ public class MessageSocketService {
     }
 
     private void doSendToSubscribers(String topic, @NonNull MessageProto.Message messageProto) {
-        // log.debug("doSendToSubscribers: user={}, content={}, topic={}, type={},
-        // clientId={}",
+        // log.debug("doSendToSubscribers: user={}, content={}, topic={}, type={}, clientId={}",
         // messageProto.getUser().getNickname(), messageProto.getContent(), topic,
-        // messageProto.getType(),
-        // messageProto.getClient());
+        // messageProto.getType(), messageProto.getClient());
         Set<TopicEntity> topicSet = topicService.findByTopic(topic);
         log.info("topicList size {}", topicSet.size());
         topicSet.forEach(topicElement -> {
@@ -130,8 +128,7 @@ public class MessageSocketService {
     }
 
     private void doSendMessage(String topic, @NonNull MessageProto.Message messageProto, String clientId) {
-        // log.debug("doSendMessage: user={}, content={}, topic={}, type={},
-        // clientId={}",
+        // log.debug("doSendMessage: user={}, content={}, topic={}, type={}, clientId={}",
         // messageProto.getUser().getNickname(), messageProto.getContent(), topic,
         // messageProto.getType(), clientId);
         MqttQoS mqttQoS = MqttQoS.AT_LEAST_ONCE;
diff --git a/modules/core/src/main/java/com/bytedesk/core/socket/mqtt/protocol/Publish.java b/modules/core/src/main/java/com/bytedesk/core/socket/mqtt/protocol/Publish.java
index 1fb9ee8777..b04ea7e648 100755
--- a/modules/core/src/main/java/com/bytedesk/core/socket/mqtt/protocol/Publish.java
+++ b/modules/core/src/main/java/com/bytedesk/core/socket/mqtt/protocol/Publish.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-01-29 16:21:46
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-11-20 11:24:39
+ * @LastEditTime: 2024-12-17 23:19:27
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
@@ -64,11 +64,10 @@ public class Publish {
         // 注意：不能去掉，否则无法解析protobuf
         publishMessage.payload().getBytes(publishMessage.payload().readerIndex(), messageBytes);
         // publish message event, developers can listener to new message
-        // mqService.sendProtoMessageToMq(messageBytes);
         try {
             MessageProto.Message messageProto = MessageProto.Message.parseFrom(messageBytes);
             String messageJson = MessageConvertUtils.toJson(messageProto);
-            // mqService.sendJsonMessageToMq(messageJson);
+            // 
             messageSendService.sendJsonMessage(messageJson);
         } catch (Exception e) {
             e.printStackTrace();