ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-09-09 02:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-03-14 15:29:26 +08:00
parent 3f0b2ae674
commit 8087704f39
9 changed files with 77 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-01-29 16:21:24
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-03-14 13:55:40
* @LastEditTime: 2025-03-14 15:11:29
* @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.
@@ -77,13 +77,11 @@ public abstract class BaseRequest implements Serializable {
/**
* 用户唯一标识
*/
// @Setter(AccessLevel.PROTECTED) // 只允许子类设置
protected String userUid;
/**
* 组织唯一标识
*/
// @Setter(AccessLevel.PROTECTED) // 只允许子类设置
protected String orgUid;
/**

10
modules/core/src/main/java/com/bytedesk/core/message/MessagePersistService.java
View File

@@ -22,6 +22,8 @@ import org.springframework.util.StringUtils;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.bytedesk.core.notice.extra.NoticeExtraInvite;
import com.bytedesk.core.notice.extra.NoticeExtraTransfer;
import jakarta.annotation.Nonnull;
import lombok.AllArgsConstructor;
@@ -266,8 +268,8 @@ public class MessagePersistService {
// 处理转接消息
private void dealWithTransferMessage(MessageTypeEnum type, MessageProtobuf message) {
// log.info("dealWithTransferMessage");
MessageTransferContent transferContentObject = JSONObject.parseObject(message.getContent(),
MessageTransferContent.class);
NoticeExtraTransfer transferContentObject = JSONObject.parseObject(message.getContent(),
NoticeExtraTransfer.class);
//
Optional<MessageEntity> messageOpt = messageService.findByUid(transferContentObject.getUid());
if (messageOpt.isPresent()) {
@@ -283,8 +285,8 @@ public class MessagePersistService {
// 处理邀请消息
private void dealWithInviteMessage(MessageTypeEnum type, MessageProtobuf message) {
MessageInviteContent inviteContentObject = JSONObject.parseObject(message.getContent(),
MessageInviteContent.class);
NoticeExtraInvite inviteContentObject = JSONObject.parseObject(message.getContent(),
NoticeExtraInvite.class);
Optional<MessageEntity> messageOpt = messageService.findByUid(inviteContentObject.getUid());
if (messageOpt.isPresent()) {
MessageEntity messageEntity = messageOpt.get();

10
modules/core/src/main/java/com/bytedesk/core/message/MessageStatusEnum.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-25 10:33:49
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-03-14 14:50:33
* @LastEditTime: 2025-03-14 15:20:44
* @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.
@@ -36,16 +36,24 @@ public enum MessageStatusEnum {
TRANSFER_CANCEL, // 取消转接
INVITE_ACCEPT, // 接受邀请
INVITE_REJECT, // 拒绝邀请
INVITE_TIMEOUT, // 邀请超时
INVITE_CANCEL, // 取消邀请
INVITE_VISITOR_ACCEPT, // 接受访客邀请
INVITE_VISITOR_REJECT, // 拒绝访客邀请
INVITE_VISITOR_TIMEOUT, // 访客邀请超时
INVITE_VISITOR_CANCEL, // 取消访客邀请
INVITE_GROUP_ACCEPT, // 接受群邀请
INVITE_GROUP_REJECT, // 拒绝群邀请
INVITE_GROUP_TIMEOUT, // 群邀请超时
INVITE_GROUP_CANCEL, // 取消群邀请
INVITE_KBASE_ACCEPT, // 接受知识库邀请
INVITE_KBASE_REJECT, // 拒绝知识库邀请
INVITE_KBASE_TIMEOUT, // 知识库邀请超时
INVITE_KBASE_CANCEL, // 取消知识库邀请
INVITE_ORGANIZATION_ACCEPT, // 接受组织邀请
INVITE_ORGANIZATION_REJECT, // 拒绝组织邀请
INVITE_ORGANIZATION_TIMEOUT, // 组织邀请超时
INVITE_ORGANIZATION_CANCEL, // 取消组织邀请
;
// 根据字符串查找对应的枚举常量

12
modules/core/src/main/java/com/bytedesk/core/message/MessageTypeEnum.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-06-05 21:50:54
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-03-14 14:41:30
* @LastEditTime: 2025-03-14 15:22:03
* @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.
@@ -69,23 +69,33 @@ public enum MessageTypeEnum {
TRANSFER,
TRANSFER_REJECT,
TRANSFER_ACCEPT,
TRANSFER_TIMEOUT,
TRANSFER_CANCEL,
INVITE,
INVITE_REJECT,
INVITE_ACCEPT,
INVITE_TIMEOUT,
INVITE_CANCEL,
INVITE_VISITOR,
INVITE_VISITOR_REJECT,
INVITE_VISITOR_ACCEPT,
INVITE_VISITOR_TIMEOUT,
INVITE_VISITOR_CANCEL,
INVITE_GROUP,
INVITE_GROUP_REJECT,
INVITE_GROUP_ACCEPT,
INVITE_GROUP_TIMEOUT,
INVITE_GROUP_CANCEL,
INVITE_KBASE,
INVITE_KBASE_REJECT,
INVITE_KBASE_ACCEPT,
INVITE_KBASE_TIMEOUT,
INVITE_KBASE_CANCEL,
INVITE_ORGANIZATION,
INVITE_ORGANIZATION_REJECT,
INVITE_ORGANIZATION_ACCEPT,
INVITE_ORGANIZATION_TIMEOUT,
INVITE_ORGANIZATION_CANCEL,
ARTICLE,
WEBRTC_AUDIO_INVITE,
WEBRTC_VIDEO_INVITE,

6
modules/core/src/main/java/com/bytedesk/core/notice/NoticeStatusEnum.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-12-04 14:27:51
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2024-12-04 14:27:54
* @LastEditTime: 2025-03-14 15:09:59
* @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.
@@ -15,5 +15,7 @@ package com.bytedesk.core.notice;
public enum NoticeStatusEnum {
UNREAD,
READ
READ,
ACCEPTED,
REJECTED;
}

36
modules/core/src/main/java/com/bytedesk/core/notice/NoticeTypeEnum.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-12-04 14:26:31
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2024-12-04 17:27:01
* @LastEditTime: 2025-03-14 15:19:34
* @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.
@@ -14,7 +14,35 @@
package com.bytedesk.core.notice;
public enum NoticeTypeEnum {
ORGANIZATION_INVITATION,
ORGANIZATION_INVITATION_ACCEPT,
ORGANIZATION_INVITATION_REJECT;
LOGIN,
TRANSFER,
TRANSFER_REJECT,
TRANSFER_ACCEPT,
TRANSFER_TIMEOUT,
TRANSFER_CANCEL,
INVITE,
INVITE_REJECT,
INVITE_ACCEPT,
INVITE_TIMEOUT,
INVITE_CANCEL,
INVITE_VISITOR,
INVITE_VISITOR_REJECT,
INVITE_VISITOR_ACCEPT,
INVITE_VISITOR_TIMEOUT,
INVITE_VISITOR_CANCEL,
INVITE_GROUP,
INVITE_GROUP_REJECT,
INVITE_GROUP_ACCEPT,
INVITE_GROUP_TIMEOUT,
INVITE_GROUP_CANCEL,
INVITE_KBASE,
INVITE_KBASE_REJECT,
INVITE_KBASE_ACCEPT,
INVITE_KBASE_TIMEOUT,
INVITE_KBASE_CANCEL,
INVITE_ORGANIZATION,
INVITE_ORGANIZATION_REJECT,
INVITE_ORGANIZATION_ACCEPT,
INVITE_ORGANIZATION_TIMEOUT,
INVITE_ORGANIZATION_CANCEL;
}

6
modules/core/src/main/java/com/bytedesk/core/message/MessageInviteContent.java → modules/core/src/main/java/com/bytedesk/core/notice/extra/NoticeExtraInvite.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-08-05 08:06:43
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-03-14 14:39:43
* @LastEditTime: 2025-03-14 15:23:36
* @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.
@@ -11,7 +11,7 @@
* 联系：270580156@qq.com
* Copyright (c) 2024 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.core.message;
package com.bytedesk.core.notice.extra;
import com.bytedesk.core.thread.ThreadEntity;
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class MessageInviteContent {
public class NoticeExtraInvite {
// 转接备注
private String note;

23
modules/core/src/main/java/com/bytedesk/core/notice/NoticeExtra.java → modules/core/src/main/java/com/bytedesk/core/notice/extra/NoticeExtraLogin.java
View File

@@ -1,25 +1,18 @@
/*
* @Author: jackning 270580156@qq.com
* @Date: 2024-12-04 17:29:46
* @Date: 2025-03-14 15:24:26
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2024-12-04 17:29:48
* @LastEditTime: 2025-03-14 15:24:29
* @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.
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
* Business Source License 1.1: https://github.com/Bytedesk/bytedesk/blob/main/LICENSE
* contact: 270580156@qq.com
* 联系：270580156@qq.com
* Copyright (c) 2024 by bytedesk.com, All Rights Reserved.
*
* Copyright (c) 2025 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.core.notice;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class NoticeExtra {
private String url;
package com.bytedesk.core.notice.extra;
public class NoticeExtraLogin {
}

6
modules/core/src/main/java/com/bytedesk/core/message/MessageTransferContent.java → modules/core/src/main/java/com/bytedesk/core/notice/extra/NoticeExtraTransfer.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-08-05 08:06:43
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2024-08-05 08:18:42
* @LastEditTime: 2025-03-14 15:24:11
* @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.
@@ -11,7 +11,7 @@
* 联系：270580156@qq.com
* Copyright (c) 2024 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.core.message;
package com.bytedesk.core.notice.extra;
import com.bytedesk.core.thread.ThreadEntity;
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class MessageTransferContent {
public class NoticeExtraTransfer {
// 转接备注
private String note;