ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2025-12-30 02:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-11-24 14:34:34 +08:00
parent 6ff40584d5
commit 2a8ecb22e4
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ai/src/main/java/com/bytedesk/ai/robot_message/RobotMessageUtils.java
View File

@@ -27,7 +27,7 @@ public class RobotMessageUtils {
public static MessageProtobuf createRobotMessage(ThreadProtobuf thread, RobotProtobuf robot,
MessageProtobuf messageProtobuf) {
MessageExtra extra = MessageUtils.getMessageExtra(messageProtobuf.getExtra());
MessageExtra extra = MessageExtra.fromJson(messageProtobuf.getExtra());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
return MessageProtobuf.builder()

5
modules/core/src/main/java/com/bytedesk/core/message/MessageExtra.java
View File

@@ -50,4 +50,9 @@ public class MessageExtra extends BaseExtra {
MessageExtra result = BaseExtra.fromJson(json, MessageExtra.class);
return result != null ? result : MessageExtra.builder().build();
}
public static MessageExtra fromOrgUid(String orgUid) {
return MessageExtra.builder().orgUid(orgUid).build();
}
}

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

@@ -34,9 +34,6 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class MessageUtils {
public static MessageExtra getMessageExtra(String orgUid) {
return MessageExtra.builder().orgUid(orgUid).build();
}
public static void attachSequenceNumber(MessageExtra extra, String threadUid) {
if (extra == null || !StringUtils.hasText(threadUid)) {
@@ -56,7 +53,7 @@ public class MessageUtils {
public static MessageProtobuf createLoginNoticeMessage(String messageUid, ThreadProtobuf threadProtobuf, String orgUid, String content) {
//
UserProtobuf system = UserUtils.getSystemUser();
MessageExtra messageExtra = MessageUtils.getMessageExtra(orgUid);
MessageExtra messageExtra = MessageExtra.fromOrgUid(orgUid);
MessageUtils.attachSequenceNumber(messageExtra, threadProtobuf.getUid());
//
MessageProtobuf message = MessageProtobuf.builder()
@@ -76,7 +73,7 @@ public class MessageUtils {
public static MessageProtobuf createNoticeMessage(String messageUid, ThreadProtobuf threadProtobuf, String orgUid, String content) {
//
UserProtobuf system = UserUtils.getSystemUser();
MessageExtra messageExtra = MessageUtils.getMessageExtra(orgUid);
MessageExtra messageExtra = MessageExtra.fromOrgUid(orgUid);
MessageUtils.attachSequenceNumber(messageExtra, threadProtobuf.getUid());
//
MessageProtobuf message = MessageProtobuf.builder()
@@ -97,7 +94,7 @@ public class MessageUtils {
//
UserProtobuf sender = UserUtils.getSystemUser();
ThreadProtobuf threadProtobuf = thread.toProtobuf();
MessageExtra extra = MessageUtils.getMessageExtra(thread.getOrgUid());
MessageExtra extra = MessageExtra.fromOrgUid(thread.getOrgUid());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
//
MessageProtobuf message = MessageProtobuf.builder()

14
modules/service/src/main/java/com/bytedesk/service/utils/ThreadMessageUtil.java
View File

@@ -42,7 +42,7 @@ public class ThreadMessageUtil {
* 结构化 WelcomeContent 的机器人欢迎消息
*/
public static MessageEntity getThreadRobotWelcomeMessage(WelcomeContent content, ThreadEntity thread) {
MessageExtra extra = MessageUtils.getMessageExtra(thread.getOrgUid());
MessageExtra extra = MessageExtra.fromOrgUid(thread.getOrgUid());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
String json = content != null ? content.toJson() : null;
@@ -66,7 +66,7 @@ public class ThreadMessageUtil {
* 结构化 WelcomeContent 的人工欢迎消息
*/
public static MessageProtobuf getThreadWelcomeMessage(WelcomeContent content, ThreadEntity thread) {
MessageExtra extra = MessageUtils.getMessageExtra(thread.getOrgUid());
MessageExtra extra = MessageExtra.fromOrgUid(thread.getOrgUid());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
String json = content != null ? content.toJson() : null;
@@ -92,7 +92,7 @@ public class ThreadMessageUtil {
*/
public static MessageProtobuf getThreadQueueMessage(QueueContent content, ThreadEntity thread) {
UserProtobuf system = UserProtobuf.getSystemUser();
MessageExtra extra = MessageUtils.getMessageExtra(thread.getOrgUid());
MessageExtra extra = MessageExtra.fromOrgUid(thread.getOrgUid());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
String json = content != null ? content.toJson() : null;
//
@@ -117,7 +117,7 @@ public class ThreadMessageUtil {
*/
public static MessageProtobuf getAgentQueueNoticeMessage(QueueNotificationPayload payload, ThreadEntity thread) {
UserProtobuf system = UserProtobuf.getSystemUser();
MessageExtra extra = MessageUtils.getMessageExtra(thread.getOrgUid());
MessageExtra extra = MessageExtra.fromOrgUid(thread.getOrgUid());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
String json = payload != null ? JSON.toJSONString(payload) : null;
@@ -140,7 +140,7 @@ public class ThreadMessageUtil {
}
public static MessageProtobuf getThreadContinueMessage(UserProtobuf user, ThreadEntity thread) {
MessageExtra extra = MessageUtils.getMessageExtra(thread.getOrgUid());
MessageExtra extra = MessageExtra.fromOrgUid(thread.getOrgUid());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
MessageEntity message = MessageEntity.builder()
@@ -162,7 +162,7 @@ public class ThreadMessageUtil {
public static MessageEntity getAgentThreadOfflineMessage(String content, ThreadEntity thread) {
UserProtobuf system = UserProtobuf.getSystemUser();
MessageExtra extra = MessageUtils.getMessageExtra(thread.getOrgUid());
MessageExtra extra = MessageExtra.fromOrgUid(thread.getOrgUid());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
MessageEntity message = MessageEntity.builder()
@@ -184,7 +184,7 @@ public class ThreadMessageUtil {
public static MessageEntity getThreadOfflineMessage(String content, ThreadEntity thread) {
UserProtobuf system = UserProtobuf.getSystemUser();
MessageExtra extra = MessageUtils.getMessageExtra(thread.getOrgUid());
MessageExtra extra = MessageExtra.fromOrgUid(thread.getOrgUid());
MessageUtils.attachSequenceNumber(extra, thread.getUid());
MessageEntity message = MessageEntity.builder()