diff --git a/modules/core/src/main/java/com/bytedesk/core/utils/BdDateUtils.java b/modules/core/src/main/java/com/bytedesk/core/utils/BdDateUtils.java index 284084aa83..d147292ef0 100644 --- a/modules/core/src/main/java/com/bytedesk/core/utils/BdDateUtils.java +++ b/modules/core/src/main/java/com/bytedesk/core/utils/BdDateUtils.java @@ -208,12 +208,12 @@ public class BdDateUtils { return DateTimeFormatter.ofPattern("yyyy-MM-dd"); } - public static LocalDateTime parseLocalDateTime(String time) { - return LocalDateTime.parse(time, BdDateUtils.getDateTimeFormatter()); + public static LocalDateTime parseLocalDateTime(String dateTime) { + return LocalDateTime.parse(dateTime, BdDateUtils.getDateTimeFormatter()); } - public static LocalDateTime parseLocalDateTime(String time, DateTimeFormatter formatter) { - return LocalDateTime.parse(time, formatter); + public static LocalDateTime parseLocalDateTime(String dateTime, DateTimeFormatter formatter) { + return LocalDateTime.parse(dateTime, formatter); } public static String getCurrentLocalDateTime() { diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java index 7bebaefb88..eff679f55d 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-03-22 22:59:48 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-03-17 20:07:46 + * @LastEditTime: 2025-04-08 12:19:10 * @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. @@ -13,7 +13,7 @@ */ package com.bytedesk.kbase.faq; -import java.time.LocalDateTime; +// import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -88,12 +88,10 @@ public class FaqRequest extends BaseRequest { @Builder.Default private List tagList = new ArrayList<>(); - @Builder.Default - private LocalDateTime startDate = LocalDateTime.now(); + private String startDate; // 当前 + 100 年 - @Builder.Default - private LocalDateTime endDate = LocalDateTime.now().plusYears(100); + private String endDate; // private String categoryUid; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java index fb05d3697b..28fe321427 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-03-22 22:59:18 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-03-29 14:23:44 + * @LastEditTime: 2025-04-08 12:18:52 * @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,6 +39,7 @@ import com.bytedesk.core.message.MessageTypeEnum; import com.bytedesk.core.rbac.auth.AuthService; import com.bytedesk.core.rbac.user.UserEntity; import com.bytedesk.core.uid.UidUtils; +import com.bytedesk.core.utils.BdDateUtils; import com.bytedesk.core.utils.Utils; import com.bytedesk.kbase.faq.FaqJsonLoader.Faq; import com.bytedesk.kbase.faq.FaqJsonLoader.FaqConfiguration; @@ -129,6 +130,13 @@ public class FaqRestService extends BaseRestService relatedFaqs = new ArrayList<>(); @@ -180,8 +188,15 @@ public class FaqRestService extends BaseRestService