From 4cde66e7de0223abcb7207f0497ead4155ff4433 Mon Sep 17 00:00:00 2001 From: rainv123 <2148537152@qq.com> Date: Wed, 5 Nov 2025 15:05:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=9F=A5=E8=AF=86=E5=BA=93=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KnowledgeBaseController.java | 15 +++++----- .../controller/KnowledgeFilesController.java | 3 +- .../src/apis/module/knowledgeBase.js | 28 +++++++++---------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java index d323bc6b..5c5d9011 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java @@ -23,17 +23,16 @@ import xiaozhi.common.page.PageData; import xiaozhi.common.utils.Result; import xiaozhi.modules.knowledge.dto.KnowledgeBaseDTO; import xiaozhi.modules.knowledge.service.KnowledgeBaseService; -import java.util.Map; @AllArgsConstructor @RestController -@RequestMapping("/api/v1") +@RequestMapping("/datasets") @Tag(name = "知识库管理") public class KnowledgeBaseController { private final KnowledgeBaseService knowledgeBaseService; - @GetMapping("/datasets") + @GetMapping @Operation(summary = "分页查询知识库列表") @RequiresPermissions("sys:role:normal") public Result> getPageList( @@ -46,7 +45,7 @@ public class KnowledgeBaseController { return new Result>().ok(pageData); } - @GetMapping("/datasets/{dataset_id}") + @GetMapping("/{dataset_id}") @Operation(summary = "根据知识库ID获取知识库详情") @RequiresPermissions("sys:role:normal") public Result getByDatasetId(@PathVariable("dataset_id") String datasetId) { @@ -54,7 +53,7 @@ public class KnowledgeBaseController { return new Result().ok(knowledgeBaseDTO); } - @PostMapping("/datasets") + @PostMapping @Operation(summary = "创建知识库") @RequiresPermissions("sys:role:normal") public Result save(@RequestBody @Validated KnowledgeBaseDTO knowledgeBaseDTO) { @@ -62,7 +61,7 @@ public class KnowledgeBaseController { return new Result().ok(resp); } - @PutMapping("/datasets/{dataset_id}") + @PutMapping("/{dataset_id}") @Operation(summary = "更新知识库") @RequiresPermissions("sys:role:normal") public Result update(@PathVariable("dataset_id") String datasetId, @@ -72,7 +71,7 @@ public class KnowledgeBaseController { return new Result().ok(resp); } - @DeleteMapping("/datasets/{dataset_id}") + @DeleteMapping("/{dataset_id}") @Operation(summary = "删除单个知识库") @Parameter(name = "dataset_id", description = "知识库ID", required = true) @RequiresPermissions("sys:role:normal") @@ -81,7 +80,7 @@ public class KnowledgeBaseController { return new Result<>(); } - @DeleteMapping("/datasets/batch") + @DeleteMapping("/batch") @Operation(summary = "批量删除知识库") @Parameter(name = "ids", description = "知识库ID列表，用逗号分隔", required = true) @RequiresPermissions("sys:role:normal") diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java index a56f6bbe..059e5ffe 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Map; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -22,7 +21,7 @@ import xiaozhi.modules.knowledge.service.KnowledgeFilesService; @AllArgsConstructor @RestController -@RequestMapping("/api/v1/datasets/{dataset_id}") +@RequestMapping("/datasets/{dataset_id}") @Tag(name = "知识库文档管理") public class KnowledgeFilesController { diff --git a/main/manager-web/src/apis/module/knowledgeBase.js b/main/manager-web/src/apis/module/knowledgeBase.js index 5fcb63b4..8f2d7c0f 100644 --- a/main/manager-web/src/apis/module/knowledgeBase.js +++ b/main/manager-web/src/apis/module/knowledgeBase.js @@ -74,7 +74,7 @@ export default { }).toString(); makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets?${queryParams}`, + url: `${getServiceUrl()}/datasets?${queryParams}`, method: 'GET', callback: callback, errorCallback: errorCallback, @@ -91,10 +91,10 @@ export default { */ createKnowledgeBase(data, callback, errorCallback) { console.log('createKnowledgeBase called with data:', data); - console.log('API URL:', `${getServiceUrl()}/api/v1/datasets`); + console.log('API URL:', `${getServiceUrl()}/datasets`); makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets`, + url: `${getServiceUrl()}/datasets`, method: 'POST', data: data, headers: { 'Content-Type': 'application/json' }, @@ -126,10 +126,10 @@ export default { */ updateKnowledgeBase(datasetId, data, callback, errorCallback) { console.log('updateKnowledgeBase called with datasetId:', datasetId, 'data:', data); - console.log('API URL:', `${getServiceUrl()}/api/v1/datasets/${datasetId}`); + console.log('API URL:', `${getServiceUrl()}/datasets/${datasetId}`); makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/${datasetId}`, + url: `${getServiceUrl()}/datasets/${datasetId}`, method: 'PUT', data: data, headers: { 'Content-Type': 'application/json' }, @@ -148,10 +148,10 @@ export default { */ deleteKnowledgeBase(datasetId, callback, errorCallback) { console.log('deleteKnowledgeBase called with datasetId:', datasetId); - console.log('API URL:', `${getServiceUrl()}/api/v1/datasets/${datasetId}`); + console.log('API URL:', `${getServiceUrl()}/datasets/${datasetId}`); makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/${datasetId}`, + url: `${getServiceUrl()}/datasets/${datasetId}`, method: 'DELETE', callback: callback, errorCallback: errorCallback, @@ -171,7 +171,7 @@ export default { const idsStr = Array.isArray(ids) ? ids.join(',') : ids; makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/batch?ids=${idsStr}`, + url: `${getServiceUrl()}/datasets/batch?ids=${idsStr}`, method: 'DELETE', callback: callback, errorCallback: errorCallback, @@ -195,7 +195,7 @@ export default { }).toString(); makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents?${queryParams}`, + url: `${getServiceUrl()}/datasets/${datasetId}/documents?${queryParams}`, method: 'GET', callback: callback, errorCallback: errorCallback, @@ -213,7 +213,7 @@ export default { */ uploadDocument(datasetId, formData, callback, errorCallback) { makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents`, + url: `${getServiceUrl()}/datasets/${datasetId}/documents`, method: 'POST', data: formData, headers: { 'Content-Type': 'multipart/form-data' }, @@ -237,7 +237,7 @@ export default { }; makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/chunks`, + url: `${getServiceUrl()}/datasets/${datasetId}/chunks`, method: 'POST', data: requestBody, headers: { 'Content-Type': 'application/json' }, @@ -257,7 +257,7 @@ export default { */ deleteDocument(datasetId, documentId, callback, errorCallback) { makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}`, + url: `${getServiceUrl()}/datasets/${datasetId}/documents/${documentId}`, method: 'DELETE', callback: callback, errorCallback: errorCallback, @@ -286,7 +286,7 @@ export default { } makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks?${queryParams}`, + url: `${getServiceUrl()}/datasets/${datasetId}/documents/${documentId}/chunks?${queryParams}`, method: 'GET', callback: callback, errorCallback: errorCallback, @@ -304,7 +304,7 @@ export default { */ retrievalTest(datasetId, data, callback, errorCallback) { makeApiRequest({ - url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/retrieval-test`, + url: `${getServiceUrl()}/datasets/${datasetId}/retrieval-test`, method: 'POST', data: data, headers: { 'Content-Type': 'application/json' },