From ab5e91c07b9816220eb5cfa3f8c0ab5263907b9b Mon Sep 17 00:00:00 2001
From: rainv123 <2148537152@qq.com>
Date: Mon, 10 Nov 2025 18:41:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/KnowledgeBaseServiceImpl.java        | 57 +++++++++++++------
 .../main/resources/i18n/messages.properties   |  2 +-
 .../resources/i18n/messages_en_US.properties  |  2 +-
 .../resources/i18n/messages_zh_CN.properties  |  2 +-
 .../resources/i18n/messages_zh_TW.properties  |  2 +-
 .../src/views/KnowledgeFileUpload.vue         |  8 ++-
 6 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
index b2b75f48..7d37fe4a 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
@@ -281,7 +281,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
                 apiDeleteSuccess = true;
             } catch (Exception e) {
                 log.error("删除RAGFlow数据集失败: {}", e.getMessage());
-                throw new RenException(ErrorCode.RAG_API_ERROR, "删除RAGFlow数据集失败: " + e.getMessage());
+                throw e;
             }
         } else {
             log.warn("datasetId或ragModelId为空，跳过RAGFlow删除");
@@ -427,8 +427,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
         log.debug("RAGFlow API响应内容: {}", response.getBody());
 
         if (!response.getStatusCode().is2xxSuccessful()) {
-            log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
-            throw new RenException(ErrorCode.RAG_API_ERROR, response.getStatusCode().toString());
+            String errorMessage = response.getStatusCode() + ", 响应内容: " + response.getBody();
+            log.error(errorMessage);
+            throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
         }
 
         // 解析响应体，提取datasetId
@@ -459,16 +460,22 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
                     }
                 } else {
                     // 如果响应码不为0，说明API调用失败
-                    log.error("RAGFlow API调用失败，响应码: {}, 响应内容: {}", code, message);
-                    throw new RenException(ErrorCode.RAG_API_ERROR,
-                            "RAGFlow API调用失败，响应码: " + code + ", 消息: " + message);
+                    String errorMessage = "RAGFlow API调用失败，响应码: " + code + ", 消息: "
+                            + (message != null ? message : "未知错误");
+                    log.error(errorMessage);
+                    throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
                 }
 
                 log.info("从RAGFlow API响应中解析出datasetId: {}", datasetId);
                 log.debug("完整响应内容: {}", responseBody);
             } catch (Exception e) {
                 log.error("解析RAGFlow API响应失败: {}", e.getMessage(), e);
-                throw new RenException(ErrorCode.RAG_API_ERROR, "解析响应失败: " + e.getMessage());
+                // 如果解析失败，但响应体不为空，尝试直接使用响应体作为错误信息
+                String errorMessage = responseBody;
+                if (e.getMessage() != null) {
+                    errorMessage += "，解析错误: " + e.getMessage();
+                }
+                throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
             }
         }
 
@@ -520,8 +527,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
         log.debug("RAGFlow API响应内容: {}", response.getBody());
 
         if (!response.getStatusCode().is2xxSuccessful()) {
-            log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
-            throw new RenException(ErrorCode.RAG_API_ERROR);
+            String errorMessage = response.getStatusCode() + ", 响应内容: " + response.getBody();
+            log.error(errorMessage);
+            throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
         }
 
         // 解析响应体，验证操作是否真正成功
@@ -533,12 +541,19 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
                 String message = (String) responseMap.get("message");
 
                 if (code != null && code != 0) {
-                    log.error("RAGFlow API调用失败，响应码: {}, 消息: {}", code, message);
-                    throw new RenException(ErrorCode.RAG_API_ERROR, "RAGFlow API调用失败: " + message);
+                    String errorMessage = "RAGFlow API调用失败，响应码: " + code + ", 消息: "
+                            + (message != null ? message : "未知错误");
+                    log.error(errorMessage);
+                    throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
                 }
             } catch (Exception e) {
                 log.error("解析RAGFlow API响应失败: {}", e.getMessage(), e);
-                throw new RenException(ErrorCode.RAG_API_ERROR, "解析响应失败: " + e.getMessage());
+                // 如果解析失败，但响应体不为空，尝试直接使用响应体作为错误信息
+                String errorMessage = responseBody;
+                if (e.getMessage() != null) {
+                    errorMessage += "，解析错误: " + e.getMessage();
+                }
+                throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
             }
         }
 
@@ -581,8 +596,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
         log.debug("RAGFlow API响应内容: {}", response.getBody());
 
         if (!response.getStatusCode().is2xxSuccessful()) {
-            log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
-            throw new RenException(ErrorCode.RAG_API_ERROR);
+            String errorMessage = response.getStatusCode() + ", 响应内容: " + response.getBody();
+            log.error(errorMessage);
+            throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
         }
 
         // 解析响应体，验证操作是否真正成功
@@ -594,12 +610,19 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
                 String message = (String) responseMap.get("message");
 
                 if (code != null && code != 0) {
-                    log.error("RAGFlow API调用失败，响应码: {}, 消息: {}", code, message);
-                    throw new RenException(ErrorCode.RAG_API_ERROR, "RAGFlow API调用失败: " + message);
+                    String errorMessage = "RAGFlow API调用失败，响应码: " + code + ", 消息: "
+                            + (message != null ? message : "未知错误");
+                    log.error(errorMessage);
+                    throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
                 }
             } catch (Exception e) {
                 log.error("解析RAGFlow API响应失败: {}", e.getMessage(), e);
-                throw new RenException(ErrorCode.RAG_API_ERROR, "解析响应失败: " + e.getMessage());
+                // 如果解析失败，但响应体不为空，尝试直接使用响应体作为错误信息
+                String errorMessage = responseBody;
+                if (e.getMessage() != null) {
+                    errorMessage += "，解析错误: " + e.getMessage();
+                }
+                throw new RenException(ErrorCode.RAG_API_ERROR, errorMessage);
             }
         }
 
diff --git a/main/manager-api/src/main/resources/i18n/messages.properties b/main/manager-api/src/main/resources/i18n/messages.properties
index d2c02815..f927e7f7 100644
--- a/main/manager-api/src/main/resources/i18n/messages.properties
+++ b/main/manager-api/src/main/resources/i18n/messages.properties
@@ -173,7 +173,7 @@
 10164=RAG\u914D\u7F6E\u672A\u627E\u5230
 10165=RAG\u914D\u7F6E\u7C7B\u578B\u9519\u8BEF
 10166=\u9ED8\u8BA4RAG\u914D\u7F6E\u672A\u627E\u5230
-10167=RAG\u63A5\u53E3\u9519\u8BEF\uFF0C{0}
+10167=RAG\u914d\u7f6e\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570\uFF0C{0}
 10168=\u4E0A\u4F20\u6587\u4EF6\u5931\u8D25
 10169=\u60A8\u6CA1\u6709\u6743\u9650\u64CD\u4F5C\u8BE5\u8BB0\u5F55
 10170=\u77E5\u8BC6\u5E93\u540D\u79F0\u91CD\u590D
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/i18n/messages_en_US.properties b/main/manager-api/src/main/resources/i18n/messages_en_US.properties
index 7610fd8a..2d318dbc 100644
--- a/main/manager-api/src/main/resources/i18n/messages_en_US.properties
+++ b/main/manager-api/src/main/resources/i18n/messages_en_US.properties
@@ -173,7 +173,7 @@
 10164=RAG configuration not found
 10165=RAG configuration type error
 10166=Default RAG configuration not found
-10167=RAG API interface error: {0}
+10167=RAG configuration missing necessary parameters: {0}
 10168=Upload file failed
 10169=No permission to operate this knowledge base
 10170=Knowledge base name already exists
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/i18n/messages_zh_CN.properties b/main/manager-api/src/main/resources/i18n/messages_zh_CN.properties
index e72f34b7..1a9a2a63 100644
--- a/main/manager-api/src/main/resources/i18n/messages_zh_CN.properties
+++ b/main/manager-api/src/main/resources/i18n/messages_zh_CN.properties
@@ -173,7 +173,7 @@
 10164=RAG\u914D\u7F6E\u672A\u627E\u5230
 10165=RAG\u914D\u7F6E\u7C7B\u578B\u9519\u8BEF
 10166=\u9ED8\u8BA4RAG\u914D\u7F6E\u672A\u627E\u5230
-10167=RAG\u63A5\u53E3\u9519\u8BEF\uFF0C{0}
+10167=RAG\u914d\u7f6e\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570\uFF0C{0}
 10168=\u4E0A\u4F20\u6587\u4EF6\u5931\u8D25
 10169=\u60A8\u6CA1\u6709\u6743\u9650\u64CD\u4F5C\u8BE5\u8BB0\u5F55
 10170=\u77E5\u8BC6\u5E93\u540D\u79F0\u91CD\u590D
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/i18n/messages_zh_TW.properties b/main/manager-api/src/main/resources/i18n/messages_zh_TW.properties
index b5d118e3..5b9465ec 100644
--- a/main/manager-api/src/main/resources/i18n/messages_zh_TW.properties
+++ b/main/manager-api/src/main/resources/i18n/messages_zh_TW.properties
@@ -173,7 +173,7 @@
 10164=RAG\u914D\u7F6E\u672A\u627E\u5230
 10165=RAG\u914D\u7F6E\u985E\u578B\u932F\u8AA4
 10166=\u9810\u8A2DRAG\u914D\u7F6E\u672A\u627E\u5230
-10167=RAG\u63A5\u53E3\u932F\u8AA4\uFF0C{0}
+10167=RAG\u914d\u7f6e\u6f0f\u5c11\u5fc5\u8981\u53c2\u6570\uFF0C{0}
 10168=\u4E0A\u50B3\u6587\u4EF6\u5931\u6557
 10169=\u60A8\u6C92\u6709\u6B0A\u9650\u64CD\u4F5C\u8A72\u8A18\u9304
 10170=\u77E5\u8B58\u5EAB\u540D\u7A31\u91CD\u8907
diff --git a/main/manager-web/src/views/KnowledgeFileUpload.vue b/main/manager-web/src/views/KnowledgeFileUpload.vue
index f9db26e9..134f7fd9 100644
--- a/main/manager-web/src/views/KnowledgeFileUpload.vue
+++ b/main/manager-web/src/views/KnowledgeFileUpload.vue
@@ -401,7 +401,13 @@ export default {
         },
         (err) => {
           this.loading = false;
-          this.$message.error(this.$t('knowledgeFileUpload.getListFailed'));
+          console.log('Error callback received:', err);
+          if (err && err.data) {
+            console.log('后端返回错误消息:', err.data.msg || err.msg);
+            this.$message.error(err.data.msg || err.msg || this.$t('knowledgeFileUpload.getListFailed'));
+          } else {
+            this.$message.error(this.$t('knowledgeFileUpload.getListFailed'));
+          }
           console.error('获取文档列表失败:', err);
           this.fileList = [];
           this.total = 0;