From b3adda2c45bf106877d08e2b6378ed1dcdf5093e Mon Sep 17 00:00:00 2001 From: jack ning Date: Tue, 24 Dec 2024 10:40:48 +0800 Subject: [PATCH] Sync from bytedesk-private: update --- .../com/bytedesk/core/base/BaseRequest.java | 6 ++--- .../core/clipboard/ClipboardRequest.java | 4 ++-- .../java/com/bytedesk/core/ip/IpRequest.java | 21 ++++++++++++---- .../bytedesk/core/message/MessageRequest.java | 4 ++-- .../service/leave_msg/LeaveMsgRequest.java | 2 +- .../service/visitor/VisitorRequestRate.java | 6 ++--- .../VisitorAnonymousControllerTest.java | 24 ++++++++++--------- 7 files changed, 41 insertions(+), 26 deletions(-) diff --git a/modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java b/modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java index c8f0112934..691221a8ec 100644 --- a/modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java +++ b/modules/core/src/main/java/com/bytedesk/core/base/BaseRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:21:24 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-12-24 10:28:01 + * @LastEditTime: 2024-12-24 10:34:56 * @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. @@ -18,11 +18,11 @@ import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; +// import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) +// @Accessors(chain = true) public abstract class BaseRequest implements Serializable { public String uid; diff --git a/modules/core/src/main/java/com/bytedesk/core/clipboard/ClipboardRequest.java b/modules/core/src/main/java/com/bytedesk/core/clipboard/ClipboardRequest.java index fc0554354c..96d7999cf2 100644 --- a/modules/core/src/main/java/com/bytedesk/core/clipboard/ClipboardRequest.java +++ b/modules/core/src/main/java/com/bytedesk/core/clipboard/ClipboardRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-08-05 22:19:27 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-10-17 09:11:44 + * @LastEditTime: 2024-12-24 10:34:00 * @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. @@ -27,7 +27,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class ClipboardRequest extends BaseRequest { - private String content; + // private String content; private String userUid; } diff --git a/modules/core/src/main/java/com/bytedesk/core/ip/IpRequest.java b/modules/core/src/main/java/com/bytedesk/core/ip/IpRequest.java index 81f8431b7c..6f2d931a54 100644 --- a/modules/core/src/main/java/com/bytedesk/core/ip/IpRequest.java +++ b/modules/core/src/main/java/com/bytedesk/core/ip/IpRequest.java @@ -1,8 +1,21 @@ +/* + * @Author: jackning 270580156@qq.com + * @Date: 2024-06-27 11:11:37 + * @LastEditors: jackning 270580156@qq.com + * @LastEditTime: 2024-12-24 10:34:16 + * @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. + * 仅支持企业内部员工自用，严禁私自用于销售、二次销售或者部署SaaS方式销售 + * 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. + */ package com.bytedesk.core.ip; import com.bytedesk.core.base.BaseRequest; -import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -23,13 +36,13 @@ public class IpRequest extends BaseRequest { private String ipRangeEnd; - private String type; + // private String type; private String reason; // time duration private String untilDate; - @NotBlank - private String orgUid; + // @NotBlank + // private String orgUid; } diff --git a/modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java b/modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java index 51097f262e..5c08d149b4 100644 --- a/modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java +++ b/modules/core/src/main/java/com/bytedesk/core/message/MessageRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-02-21 10:00:32 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-07-04 14:56:27 + * @LastEditTime: 2024-12-24 10:34:35 * @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. @@ -28,5 +28,5 @@ public class MessageRequest extends BaseRequest { private String userUid; - private String orgUid; + // private String orgUid; } diff --git a/modules/service/src/main/java/com/bytedesk/service/leave_msg/LeaveMsgRequest.java b/modules/service/src/main/java/com/bytedesk/service/leave_msg/LeaveMsgRequest.java index 2f5c6d0ea3..b4d4baa7f6 100644 --- a/modules/service/src/main/java/com/bytedesk/service/leave_msg/LeaveMsgRequest.java +++ b/modules/service/src/main/java/com/bytedesk/service/leave_msg/LeaveMsgRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-03-22 23:05:05 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-12-19 11:56:00 + * @LastEditTime: 2024-12-24 10:35:50 * @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. diff --git a/modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRequestRate.java b/modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRequestRate.java index d5e372dfc2..88f0d51829 100644 --- a/modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRequestRate.java +++ b/modules/service/src/main/java/com/bytedesk/service/visitor/VisitorRequestRate.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-07-15 15:23:59 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-12-24 09:49:32 + * @LastEditTime: 2024-12-24 10:33:16 * @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. @@ -30,11 +30,11 @@ import com.bytedesk.core.base.BaseRequest; public class VisitorRequestRate extends BaseRequest { private String visitorUid; - private String type; + // private String type; // 评价会话 private Integer score; - private String content; + // private String content; private String threadTopic; // 评价消息 diff --git a/modules/service/src/test/java/com/bytedesk/service/visitor/VisitorAnonymousControllerTest.java b/modules/service/src/test/java/com/bytedesk/service/visitor/VisitorAnonymousControllerTest.java index 5255984de5..73a57ee88d 100644 --- a/modules/service/src/test/java/com/bytedesk/service/visitor/VisitorAnonymousControllerTest.java +++ b/modules/service/src/test/java/com/bytedesk/service/visitor/VisitorAnonymousControllerTest.java @@ -142,12 +142,13 @@ public class VisitorAnonymousControllerTest { CompletableFuture future = CompletableFuture.runAsync(() -> { try { // 1. 初始化访客 - VisitorRequest initRequest = new VisitorRequest(); - initRequest.setOrgUid(ORG_UID); + VisitorRequest initRequest = VisitorRequest.builder() + .sid(AGENT_UID) + .build(); initRequest.setType(TYPE); - initRequest.setSid(AGENT_UID); + initRequest.setOrgUid(ORG_UID); - String initResult = mockMvc.perform(post("/visitor/anonymous/init") + String initResult = mockMvc.perform(post("/visitor/api/v1/init") .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(initRequest))) .andExpect(status().isOk()) @@ -156,20 +157,21 @@ public class VisitorAnonymousControllerTest { .getContentAsString(); // 解析返回的访客信息 - JsonResult initResponse = objectMapper.readValue(initResult, JsonResult.class); + JsonResult initResponse = objectMapper.readValue(initResult, JsonResult.class); VisitorResponse visitor = objectMapper.convertValue(initResponse.getData(), VisitorResponse.class); // 2. 并发请求会话 for (int j = 0; j < concurrentRequests; j++) { - VisitorRequest threadRequest = new VisitorRequest(); - threadRequest.setOrgUid(ORG_UID); + VisitorRequest threadRequest = VisitorRequest.builder() + .sid(AGENT_UID) + .nickname(visitor.getNickname()) + .avatar(visitor.getAvatar()) + .build(); threadRequest.setType(TYPE); - threadRequest.setSid(AGENT_UID); + threadRequest.setOrgUid(ORG_UID); threadRequest.setUid(visitor.getUid()); - threadRequest.setNickname(visitor.getNickname()); - threadRequest.setAvatar(visitor.getAvatar()); - mockMvc.perform(post("/visitor/anonymous/requestThread") + mockMvc.perform(post("/visitor/api/v1/request") .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(threadRequest))) .andExpect(status().isOk());