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

update modules/core: mod 37 files

Browse Source
This commit is contained in:
jack ning
2025-07-08 10:35:05 +08:00
parent 788c0d54c0
commit 6fce950f58
30 changed files with 98 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ai/src/main/java/com/bytedesk/ai/model/LlmModelRestService.java
View File

@@ -58,7 +58,7 @@ public class LlmModelRestService extends BaseRestService<LlmModelEntity, LlmMode
public Page<LlmModelResponse> queryByUser(LlmModelRequest request) {
UserEntity user = authService.getCurrentUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
return queryByOrg(request);

6
modules/ai/src/main/java/com/bytedesk/ai/robot/RobotExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-03-24 21:40:50
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-21 11:49:42
* @LastEditTime: 2025-07-08 10:09:51
* @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.
@@ -38,12 +38,12 @@ public class RobotExcel {
private String prompt;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(index = 3, value = "创建时间")
@ExcelProperty(index = 3, value = "创建时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(20)
private ZonedDateTime createdAt;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(index = 4, value = "修改时间")
@ExcelProperty(index = 4, value = "修改时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(20)
private ZonedDateTime updatedAt;
}

8
modules/core/src/main/java/com/bytedesk/core/black/BlackExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-08-01 06:18:10
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-26 14:57:00
* @LastEditTime: 2025-07-08 10: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.
@@ -59,17 +59,17 @@ public class BlackExcel extends BaseExcel {
private String userNickname;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "开始时间")
@ExcelProperty(value = "开始时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime startTime;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "结束时间")
@ExcelProperty(value = "结束时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime endTime;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "拉黑时间")
@ExcelProperty(value = "拉黑时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime createdAt;
}

2
modules/core/src/main/java/com/bytedesk/core/black/BlackRestService.java
View File

@@ -63,7 +63,7 @@ public class BlackRestService extends BaseRestServiceWithExcel<BlackEntity, Blac
public Page<BlackResponse> queryByUser(BlackRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

2
modules/core/src/main/java/com/bytedesk/core/ip/black/IpBlacklistRestService.java
View File

@@ -69,7 +69,7 @@ public class IpBlacklistRestService extends BaseRestServiceWithExcel<IpBlacklist
public Page<IpBlacklistResponse> queryByUser(IpBlacklistRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

4
modules/core/src/main/java/com/bytedesk/core/message/MessageExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-22 22:12:03
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-21 12:56:41
* @LastEditTime: 2025-07-08 10:09: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.
@@ -39,7 +39,7 @@ public class MessageExcel {
private String sender;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "创建时间")
@ExcelProperty(value = "创建时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(20)
private ZonedDateTime createdAt;

2
modules/core/src/main/java/com/bytedesk/core/message/MessageRestService.java
View File

@@ -67,7 +67,7 @@ public class MessageRestService extends BaseRestServiceWithExcel<MessageEntity,
public Page<MessageResponse> queryByUser(MessageRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

6
modules/core/src/main/java/com/bytedesk/core/rbac/organization_apply/OrganizationApplyExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-08-01 06:18:10
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-21 12:56:29
* @LastEditTime: 2025-07-08 10:10: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.
@@ -40,12 +40,12 @@ public class OrganizationApplyExcel {
private String color;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "创建时间")
@ExcelProperty(value = "创建时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(20)
private ZonedDateTime createdAt;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "修改时间")
@ExcelProperty(value = "修改时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(20)
private ZonedDateTime updatedAt;

6
modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-08 11:22:07
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-07-08 09:57:59
* @LastEditTime: 2025-07-08 10:33:21
* @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,7 +15,7 @@ package com.bytedesk.core.rbac.token;
import java.time.ZonedDateTime;
import com.bytedesk.core.base.BaseEntityNoOrg;
import com.bytedesk.core.base.BaseEntity;
import com.bytedesk.core.enums.ClientEnum;
import jakarta.persistence.Column;
@@ -46,7 +46,7 @@ import com.bytedesk.core.utils.BdDateUtils;
@AllArgsConstructor
@NoArgsConstructor
@Table(name = "bytedesk_core_token")
public class TokenEntity extends BaseEntityNoOrg {
public class TokenEntity extends BaseEntity {
private static final long serialVersionUID = 1L;

4
modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestController.java
View File

@@ -53,8 +53,10 @@ public class TokenRestController extends BaseRestController<TokenRequest> {
@Override
public ResponseEntity<?> queryByUid(TokenRequest request) {
TokenResponse response = tokenRestService.queryByUid(request);
//
return ResponseEntity.ok(JsonResult.success());
return ResponseEntity.ok(JsonResult.success(response));
}
@Override

25
modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-05-22 15:42:28
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-07-08 09:08:19
* @LastEditTime: 2025-07-08 10:21: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.
@@ -41,6 +41,9 @@ public class TokenRestService extends BaseRestService<TokenEntity, TokenRequest,
private final UidUtils uidUtils;
// 循环依赖
// private final AuthService authService;
@Override
public Page<TokenResponse> queryByOrg(TokenRequest request) {
Pageable pageable = request.getPageable();
@@ -51,8 +54,24 @@ public class TokenRestService extends BaseRestService<TokenEntity, TokenRequest,
@Override
public Page<TokenResponse> queryByUser(TokenRequest request) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'queryByUser'");
// UserEntity user = authService.getCurrentUser();
// if (user == null) {
// throw new NotLoginException("login required");
// }
// request.setUserUid(user.getUid());
//
return queryByOrg(request);
}
@Override
public TokenResponse queryByUid(TokenRequest request) {
Optional<TokenEntity> optional = tokenRepository.findByUid(request.getUid());
if (optional.isPresent()) {
TokenEntity entity = optional.get();
return convertToResponse(entity);
} else {
throw new RuntimeException("Token not found for uid: " + request.getUid());
}
}
@Cacheable(cacheNames = "token", key = "#uid", unless = "#result == null")

17
modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenSpecification.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-05-22 15:52:39
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-22 15:54:03
* @LastEditTime: 2025-07-08 10:35:07
* @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.
@@ -17,6 +17,7 @@ import java.util.ArrayList;
import java.util.List;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.util.StringUtils;
import com.bytedesk.core.base.BaseSpecification;
@@ -27,7 +28,19 @@ public class TokenSpecification extends BaseSpecification {
public static Specification<TokenEntity> search(TokenRequest request) {
return (root, query, criteriaBuilder) -> {
List<Predicate> predicates = new ArrayList<>();
predicates.add(criteriaBuilder.equal(root.get("deleted"), false));
predicates.addAll(getBasicPredicates(root, criteriaBuilder, request.getOrgUid()));
// name
if (StringUtils.hasText(request.getName())) {
predicates.add(criteriaBuilder.like(root.get("name"), "%" + request.getName() + "%"));
}
// description
if (StringUtils.hasText(request.getDescription())) {
predicates.add(criteriaBuilder.like(root.get("description"), "%" + request.getDescription() + "%"));
}
// type
if (StringUtils.hasText(request.getType())) {
predicates.add(criteriaBuilder.equal(root.get("type"), request.getType()));
}
// Add more predicates based on request fields
return criteriaBuilder.and(predicates.toArray(new Predicate[0]));

4
modules/core/src/main/java/com/bytedesk/core/thread/ThreadExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-22 22:12:03
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-01 09:11:39
* @LastEditTime: 2025-07-08 10:09:17
* @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.
@@ -58,7 +58,7 @@ public class ThreadExcel extends BaseExcel {
private String client;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "创建时间")
@ExcelProperty(value = "创建时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(28)
private ZonedDateTime createdAt;

4
modules/core/src/main/java/com/bytedesk/core/thread/ThreadRestService.java
View File

@@ -146,7 +146,7 @@ public class ThreadRestService
public Page<ThreadResponse> queryThreadsByUserTopics(ThreadRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
Optional<TopicEntity> topicOptional = topicRestService.findByUserUid(user.getUid());
if (!topicOptional.isPresent()) {
@@ -634,7 +634,7 @@ public class ThreadRestService
public ThreadResponse closeByTopic(ThreadRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());

2
modules/core/src/main/java/com/bytedesk/core/workflow/WorkflowRestService.java
View File

@@ -57,7 +57,7 @@ public class WorkflowRestService extends BaseRestService<WorkflowEntity, Workflo
public Page<WorkflowResponse> queryByUser(WorkflowRequest request) {
UserEntity user = authService.getCurrentUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

4
modules/kbase/src/main/java/com/bytedesk/kbase/auto_reply/fixed/AutoReplyFixedRestService.java
View File

@@ -68,7 +68,7 @@ public class AutoReplyFixedRestService extends BaseRestServiceWithExcel<AutoRepl
public Page<AutoReplyFixedResponse> queryByUser(AutoReplyFixedRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//
@@ -86,7 +86,7 @@ public class AutoReplyFixedRestService extends BaseRestServiceWithExcel<AutoRepl
// 获取当前用户
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

4
modules/kbase/src/main/java/com/bytedesk/kbase/auto_reply/keyword/AutoReplyKeywordRestService.java
View File

@@ -72,7 +72,7 @@ public class AutoReplyKeywordRestService extends BaseRestServiceWithExcel<AutoRe
public Page<AutoReplyKeywordResponse> queryByUser(AutoReplyKeywordRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//
@@ -115,7 +115,7 @@ public class AutoReplyKeywordRestService extends BaseRestServiceWithExcel<AutoRe
// 获取当前用户
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

6
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-22 22:12:03
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-14 12:17:25
* @LastEditTime: 2025-07-08 10:08:54
* @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,12 +69,12 @@ public class FaqExcel {
private String enabled;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效开始日期")
@ExcelProperty(value = "有效开始日期", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime startDate;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效结束日期")
@ExcelProperty(value = "有效结束日期", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime endDate;

6
modules/kbase/src/main/java/com/bytedesk/kbase/file/FileExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-22 22:12:03
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-14 12:43:43
* @LastEditTime: 2025-07-08 10:10: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.
@@ -57,12 +57,12 @@ public class FileExcel {
private String enabled;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效开始日期")
@ExcelProperty(value = "有效开始日期", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime startDate;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效结束日期")
@ExcelProperty(value = "有效结束日期", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime endDate;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-22 22:12:03
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-14 12:17:11
* @LastEditTime: 2025-07-08 10:10:40
* @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.
@@ -52,12 +52,12 @@ public class ChunkExcel {
private String enabled;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效开始日期")
@ExcelProperty(value = "有效开始日期", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime startDate;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效结束日期")
@ExcelProperty(value = "有效结束日期", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime endDate;

2
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRestService.java
View File

@@ -76,7 +76,7 @@ public class ChunkRestService extends BaseRestServiceWithExcel<ChunkEntity, Chun
public Page<ChunkResponse> queryByUser(ChunkRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-22 22:12:03
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-14 12:17:01
* @LastEditTime: 2025-07-08 10:10:51
* @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.
@@ -56,12 +56,12 @@ public class TextExcel {
private String enabled;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效开始日期")
@ExcelProperty(value = "有效开始日期", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime startDate;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效结束日期")
@ExcelProperty(value = "有效结束日期", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(25)
private ZonedDateTime endDate;

4
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextRestService.java
View File

@@ -77,7 +77,7 @@ public class TextRestService extends BaseRestServiceWithExcel<TextEntity, TextRe
public Page<TextResponse> queryByUser(TextRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
return queryByOrg(request);
@@ -103,7 +103,7 @@ public class TextRestService extends BaseRestServiceWithExcel<TextEntity, TextRe
// 获取当前登录用户
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

2
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyRestService.java
View File

@@ -75,7 +75,7 @@ public class QuickReplyRestService extends BaseRestServiceWithExcel<QuickReplyEn
public Page<QuickReplyResponse> queryByUser(QuickReplyRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

2
modules/kbase/src/main/java/com/bytedesk/kbase/taboo_message/TabooMessageRestService.java
View File

@@ -62,7 +62,7 @@ public class TabooMessageRestService extends BaseRestServiceWithExcel<TabooMessa
public Page<TabooMessageResponse> queryByUser(TabooMessageRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

2
modules/service/src/main/java/com/bytedesk/service/form/FormRestService.java
View File

@@ -54,7 +54,7 @@ public class FormRestService extends BaseRestService<FormEntity, FormRequest, Fo
public Page<FormResponse> queryByUser(FormRequest request) {
UserEntity user = authService.getCurrentUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
request.setUserUid(user.getUid());
//

4
modules/service/src/main/java/com/bytedesk/service/queue/QueueRestService.java
View File

@@ -81,7 +81,7 @@ public class QueueRestService extends BaseRestServiceWithExcel<QueueEntity, Queu
public Page<QueueResponse> queryByUser(QueueRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
// set user uid
request.setUserUid(user.getUid());
@@ -91,7 +91,7 @@ public class QueueRestService extends BaseRestServiceWithExcel<QueueEntity, Queu
public Page<ThreadResponse> queryQueuing(ThreadRequest request) {
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
// 设置查询条件：状态为排队中
request.setStatus(ThreadProcessStatusEnum.QUEUING.name());

17
modules/service/src/main/java/com/bytedesk/service/queue_member/QueueMemberExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580206@qq.com
* @Date: 2024-08-01 06:18:20
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-06 15:23:59
* @LastEditTime: 2025-07-08 10:14:25
* @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.
@@ -50,7 +50,7 @@ public class QueueMemberExcel extends BaseExcel {
@ColumnWidth(20)
private Integer waitLength;
@ExcelProperty(value = "入队时间")
@ExcelProperty(value = "入队时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ColumnWidth(25)
private ZonedDateTime visitorEnqueueAt;
@@ -63,7 +63,7 @@ public class QueueMemberExcel extends BaseExcel {
@ColumnWidth(20)
private String robotAcceptType;
@ExcelProperty(value = "机器人接入时间")
@ExcelProperty(value = "机器人接入时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ColumnWidth(25)
private ZonedDateTime robotAcceptedAt;
@@ -72,7 +72,7 @@ public class QueueMemberExcel extends BaseExcel {
@ColumnWidth(20)
private String robotToAgent;
@ExcelProperty(value = "转人工时间")
@ExcelProperty(value = "转人工时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ColumnWidth(25)
private ZonedDateTime robotToAgentAt;
@@ -89,7 +89,7 @@ public class QueueMemberExcel extends BaseExcel {
@ColumnWidth(20)
private String agentAcceptType;
@ExcelProperty(value = "接入时间")
@ExcelProperty(value = "接入时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ColumnWidth(25)
private ZonedDateTime agentAcceptedAt;
@@ -102,7 +102,7 @@ public class QueueMemberExcel extends BaseExcel {
@ColumnWidth(20)
private String rated;
@ExcelProperty(value = "评分时间")
@ExcelProperty(value = "评分时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ColumnWidth(25)
private ZonedDateTime rateAt;
@@ -127,11 +127,6 @@ public class QueueMemberExcel extends BaseExcel {
@ColumnWidth(20)
private String messageLeave;
// @ExcelProperty(value = "留言时间")
// @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
// @ColumnWidth(25)
// private ZonedDateTime messageLeaveAt;
@ExcelProperty(value = "客户端")
@ColumnWidth(20)
private String client;

2
modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessRestService.java
View File

@@ -75,7 +75,7 @@ public class TicketProcessRestService
// 获取当前登录用户
UserEntity user = authService.getUser();
if (user == null) {
throw new NotLoginException("please login first");
throw new NotLoginException("login required");
}
String userUid = user.getUid();
request.setUserUid(userUid);

6
plugins/freeswitch/src/main/java/com/bytedesk/freeswitch/gateway/FreeSwitchGatewayExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-06-09 10:00:00
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-06-09 10:00:00
* @LastEditTime: 2025-07-08 10:12:51
* @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.
@@ -81,12 +81,12 @@ public class FreeSwitchGatewayExcel {
@ColumnWidth(40)
private String remarks;
@ExcelProperty("创建时间")
@ExcelProperty(value = "创建时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(20)
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private ZonedDateTime createdAt;
@ExcelProperty("更新时间")
@ExcelProperty(value = "更新时间", converter = com.bytedesk.core.converter.ZonedDateTimeConverter.class)
@ColumnWidth(20)
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private ZonedDateTime updatedAt;