ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-16 20:27:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

update modules/kbase: mod 14 del 1 files

Browse Source
This commit is contained in:
jack ning
2025-05-17 10:43:28 +08:00
parent 8acf3dd56a
commit 28c584d4a3
22 changed files with 146 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqEventListener.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-09-07 15:42:23
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-17 09:14:03
* @LastEditTime: 2025-05-17 10:35: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.
@@ -26,6 +26,7 @@ import com.bytedesk.core.utils.BdFileUtils;
import com.bytedesk.kbase.faq.event.FaqCreateEvent;
import com.bytedesk.kbase.faq.event.FaqDeleteEvent;
import com.bytedesk.kbase.faq.event.FaqUpdateDocEvent;
import com.bytedesk.kbase.faq.mq.FaqMessageService;
import com.bytedesk.kbase.kbase.KbaseTypeEnum;
import lombok.AllArgsConstructor;
@@ -36,10 +37,6 @@ import lombok.extern.slf4j.Slf4j;
@AllArgsConstructor
public class FaqEventListener {
// private final FaqElasticService faqService;
// private final FaqVectorService faqVectorService;
private final FaqRestService faqRestService;
private final UploadRestService uploadRestService;

2
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqProtobuf.java
View File

@@ -18,6 +18,8 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.fastjson2.JSON;
import com.bytedesk.kbase.faq.elastic.FaqElastic;
import com.bytedesk.kbase.faq.vector.FaqVector;
import com.bytedesk.kbase.llm_chunk.ChunkElastic;
import com.bytedesk.kbase.llm_chunk.ChunkVector;
import com.bytedesk.kbase.llm_text.TextElastic;

5
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestController.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-03-22 22:59:07
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-14 16:17:45
* @LastEditTime: 2025-05-17 10:38:46
* @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.
@@ -25,6 +25,9 @@ import org.springframework.web.bind.annotation.RestController;
import com.bytedesk.core.annotation.ActionAnnotation;
import com.bytedesk.core.base.BaseRestController;
import com.bytedesk.core.utils.JsonResult;
import com.bytedesk.kbase.faq.elastic.FaqElasticService;
import com.bytedesk.kbase.faq.vector.FaqVectorService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;

2
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestControllerVisitor.java
View File

@@ -16,6 +16,8 @@ package com.bytedesk.kbase.faq;
import org.springframework.web.bind.annotation.RestController;
import com.bytedesk.core.utils.JsonResult;
import com.bytedesk.kbase.faq.elastic.FaqElasticSearchResult;
import com.bytedesk.kbase.faq.elastic.FaqElasticService;
import lombok.AllArgsConstructor;

6
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqElastic.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/elastic/FaqElastic.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-04-22 17:02:50
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-14 10:16:14
* @LastEditTime: 2025-05-17 10:37: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.
@@ -11,7 +11,7 @@
*
* Copyright (c) 2025 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.kbase.faq;
package com.bytedesk.kbase.faq.elastic;
import java.time.LocalDateTime;
import java.util.List;
@@ -22,6 +22,8 @@ import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import com.bytedesk.kbase.faq.FaqEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqElasticSearchResult.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/elastic/FaqElasticSearchResult.java
View File

@@ -11,7 +11,7 @@
*
* Copyright (c) 2025 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.kbase.faq;
package com.bytedesk.kbase.faq.elastic;
import java.io.Serializable;

6
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqElasticService.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/elastic/FaqElasticService.java
View File

@@ -11,7 +11,7 @@
*
* Copyright (c) 2025 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.kbase.faq;
package com.bytedesk.kbase.faq.elastic;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -27,6 +27,10 @@ import org.springframework.data.elasticsearch.core.query.Query;
import org.springframework.data.elasticsearch.core.query.DeleteQuery;
import org.springframework.stereotype.Service;
import com.bytedesk.kbase.faq.FaqEntity;
import com.bytedesk.kbase.faq.FaqRequest;
import com.bytedesk.kbase.faq.FaqRestService;
import co.elastic.clients.elasticsearch._types.query_dsl.BoolQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.DateRangeQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.MultiMatchQuery;

8
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqIndexConsumer.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/mq/FaqIndexConsumer.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-05-17 10:10:00
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-17 09:39:41
* @LastEditTime: 2025-05-17 10:38:26
* @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.kbase.faq;
package com.bytedesk.kbase.faq.mq;
import java.util.Optional;
import java.util.Random;
@@ -20,6 +20,10 @@ import org.springframework.jms.annotation.JmsListener;
import org.springframework.stereotype.Component;
import com.bytedesk.core.jms.JmsArtemisConstants;
import com.bytedesk.kbase.faq.FaqEntity;
import com.bytedesk.kbase.faq.FaqRestService;
import com.bytedesk.kbase.faq.elastic.FaqElasticService;
import com.bytedesk.kbase.faq.vector.FaqVectorService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqIndexMessage.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/mq/FaqIndexMessage.java
View File

@@ -11,7 +11,7 @@
* 联系：270580156@qq.com
* Copyright (c) 2024 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.kbase.faq;
package com.bytedesk.kbase.faq.mq;
import java.io.Serializable;

4
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqMessageService.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/mq/FaqMessageService.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-05-17 10:05:00
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-17 10:30:00
* @LastEditTime: 2025-05-17 10:36:20
* @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.kbase.faq;
package com.bytedesk.kbase.faq.mq;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jms.core.JmsTemplate;

7
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqVector.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/vector/FaqVector.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-05-14 14:13:52
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-05-14 14:25:31
* @LastEditTime: 2025-05-17 10:37:57
* @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 @@
*
* Copyright (c) 2025 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.kbase.faq;
package com.bytedesk.kbase.faq.vector;
import java.time.LocalDateTime;
import java.util.List;
@@ -20,6 +20,9 @@ import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import com.bytedesk.kbase.faq.FaqEntity;
import org.springframework.data.elasticsearch.annotations.DateFormat;
import lombok.AllArgsConstructor;

2
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqVectorSearchResult.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/vector/FaqVectorSearchResult.java
View File

@@ -10,7 +10,7 @@
* contact: 270580156@qq.com
* Copyright (c) 2025 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.kbase.faq;
package com.bytedesk.kbase.faq.vector;
import java.io.Serializable;

5
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqVectorService.java → modules/kbase/src/main/java/com/bytedesk/kbase/faq/vector/FaqVectorService.java
View File

@@ -11,7 +11,7 @@
* 联系：270580156@qq.com
* Copyright (c) 2025 by bytedesk.com, All Rights Reserved.
*/
package com.bytedesk.kbase.faq;
package com.bytedesk.kbase.faq.vector;
import java.util.ArrayList;
import java.util.List;
@@ -28,6 +28,9 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.bytedesk.kbase.config.KbaseConst;
import com.bytedesk.kbase.faq.FaqEntity;
import com.bytedesk.kbase.faq.FaqRequest;
import com.bytedesk.kbase.faq.FaqRestService;
import com.bytedesk.kbase.llm_chunk.ChunkStatusEnum;
import lombok.RequiredArgsConstructor;

2
modules/kbase/src/test/java/com/bytedesk/kbase/faq/FaqBulkIndexTester.java
View File

@@ -21,6 +21,8 @@ import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.bytedesk.kbase.faq.mq.FaqMessageService;
import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;

2
modules/kbase/src/test/java/com/bytedesk/kbase/faq/FaqIndexTestController.java
View File

@@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.bytedesk.kbase.faq.mq.FaqMessageService;
import lombok.extern.slf4j.Slf4j;
/**

6
modules/kbase/src/test/java/com/bytedesk/kbase/faq/FaqMessageQueueTests.java
View File

@@ -19,6 +19,12 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import com.bytedesk.kbase.faq.elastic.FaqElasticService;
import com.bytedesk.kbase.faq.mq.FaqIndexConsumer;
import com.bytedesk.kbase.faq.mq.FaqIndexMessage;
import com.bytedesk.kbase.faq.mq.FaqMessageService;
import com.bytedesk.kbase.faq.vector.FaqVectorService;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import lombok.extern.slf4j.Slf4j;