ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-15 11:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync from bytedesk-private: update

Browse Source
This commit is contained in:
jack ning
2024-12-17 23:57:18 +08:00
parent ce3c7c5c13
commit 32cecb3a1f
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/core/src/main/java/com/bytedesk/core/message/MessageSocketService.java
View File

@@ -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;

5
modules/core/src/main/java/com/bytedesk/core/socket/mqtt/protocol/Publish.java
View File

@@ -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();