From 00a9ec7eee1899d1b13d109c4145c0e0d89eec5e Mon Sep 17 00:00:00 2001 From: jack ning Date: Mon, 26 May 2025 09:26:11 +0800 Subject: [PATCH] update modules/core: add 1 mod 3 del 3 files --- .../com/bytedesk/core/enums/ClientEnum.java | 4 +--- .../com/bytedesk/core/ocr/package-info.java | 4 ---- .../main/java/com/bytedesk/core/ocr/readme.md | 19 ------------------ .../bytedesk/core/rbac/auth/AuthService.java | 7 ++++++- .../starter/swagger/SwaggerApiConfig.java | 20 +++++++++++++++---- 5 files changed, 23 insertions(+), 31 deletions(-) delete mode 100644 modules/core/src/main/java/com/bytedesk/core/ocr/package-info.java delete mode 100644 modules/core/src/main/java/com/bytedesk/core/ocr/readme.md diff --git a/modules/core/src/main/java/com/bytedesk/core/enums/ClientEnum.java b/modules/core/src/main/java/com/bytedesk/core/enums/ClientEnum.java index 0eca256651..523eb9baf9 100644 --- a/modules/core/src/main/java/com/bytedesk/core/enums/ClientEnum.java +++ b/modules/core/src/main/java/com/bytedesk/core/enums/ClientEnum.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-25 13:07:20 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-30 22:35:21 + * @LastEditTime: 2025-05-26 09:03:22 * @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,8 +15,6 @@ package com.bytedesk.core.enums; public enum ClientEnum { SYSTEM, - // AUTO_REPLY, // auto reply - // ROBOT, // robot reply // WEB, WEB_PC, // pc端 diff --git a/modules/core/src/main/java/com/bytedesk/core/ocr/package-info.java b/modules/core/src/main/java/com/bytedesk/core/ocr/package-info.java deleted file mode 100644 index 58eec3cebd..0000000000 --- a/modules/core/src/main/java/com/bytedesk/core/ocr/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@NonNullApi -package com.bytedesk.core.ocr; - -import org.springframework.lang.NonNullApi; diff --git a/modules/core/src/main/java/com/bytedesk/core/ocr/readme.md b/modules/core/src/main/java/com/bytedesk/core/ocr/readme.md deleted file mode 100644 index 1b8f391902..0000000000 --- a/modules/core/src/main/java/com/bytedesk/core/ocr/readme.md +++ /dev/null @@ -1,19 +0,0 @@ - -# OCR-图片文字识别 - -提取图片中的文字，并进行向量化存储，用于知识库检索 - -- [PaddleOCR](https://github.com/PaddlePaddle/PaddleOCR) -- [PaddleOCR](https://paddlepaddle.github.io/PaddleOCR/latest/#_2) diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthService.java b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthService.java index 97e2bf9fff..a12e05f5d5 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthService.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthService.java @@ -137,12 +137,17 @@ public class AuthService { .description("User login authentication token") .accessToken(accessToken) .type(TokenTypeEnum.LOGIN.name()) - .expiresAt(LocalDateTime.now().plusHours(24)) // 默认24小时过期 .revoked(false) .client(client) .device(device) .userUid(userDetails.getUid()) .build(); + // 只有当client中含有web字样时，expiresAt有效期24小时，否则为365天 + if (client.toLowerCase().contains("web")) { + tokenRequest.setExpiresAt(LocalDateTime.now().plusHours(24)); // 默认24小时过期 + } else { + tokenRequest.setExpiresAt(LocalDateTime.now().plusDays(365)); // 其他客户端默认365天过期 + } tokenRestService.create(tokenRequest); diff --git a/starter/src/main/java/com/bytedesk/starter/swagger/SwaggerApiConfig.java b/starter/src/main/java/com/bytedesk/starter/swagger/SwaggerApiConfig.java index c097360a1c..54a620ca20 100644 --- a/starter/src/main/java/com/bytedesk/starter/swagger/SwaggerApiConfig.java +++ b/starter/src/main/java/com/bytedesk/starter/swagger/SwaggerApiConfig.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-05-24 11:10:00 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-05-24 15:38:41 + * @LastEditTime: 2025-05-26 09:10:42 * @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. @@ -309,7 +309,7 @@ public class SwaggerApiConfig { return GroupedOpenApi.builder() .group("message-feedback-apis") .displayName("消息反馈接口") - .pathsToMatch("/api/v1/message_feedback/**") + .pathsToMatch("/api/v1/message/feedback/**") .build(); } @@ -333,7 +333,7 @@ public class SwaggerApiConfig { return GroupedOpenApi.builder() .group("message-parsed-apis") .displayName("消息解析接口") - .pathsToMatch("/api/v1/message_parsed/**") + .pathsToMatch("/api/v1/message/parsed/**") .build(); } @@ -357,7 +357,7 @@ public class SwaggerApiConfig { return GroupedOpenApi.builder() .group("message-unanswered-apis") .displayName("未回复消息接口") - .pathsToMatch("/api/v1/message_unanswered/**") + .pathsToMatch("/api/v1/message/unanswered/**") .build(); } @@ -492,4 +492,16 @@ public class SwaggerApiConfig { .pathsToMatch("/api/v1/ticket/**") .build(); } + + /** + * 浏览记录接口 + */ + @Bean + public GroupedOpenApi browseApis() { + return GroupedOpenApi.builder() + .group("browse-apis") + .displayName("浏览记录接口") + .pathsToMatch("/api/v1/browse/**") + .build(); + } }