From a20cba0adfdd89fd1297fc8bdb93ecafc0aa59d3 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Mon, 26 Jan 2026 15:17:42 +0800
Subject: [PATCH] =?UTF-8?q?--author:scott--date:20261026--for:=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=EF=BC=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=85=B7=E4=BD=93=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

---
 .../airag/llm/controller/AiragModelController.java       | 2 +-
 .../jeecg/modules/airag/llm/handler/AIChatHandler.java   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragModelController.java b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragModelController.java
index 393733a2b..ee805607e 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragModelController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragModelController.java
@@ -185,7 +185,7 @@ public class AiragModelController extends JeecgController<AiragModel, IAiragMode
             //update-end---author:wangshuai---date:2026-01-07---for:【QQYUN-12145】【AI】AI 绘画创作---
         }catch (Exception e){
             log.error("测试模型连接失败", e);
-            return Result.error("测试模型连接失败，请检查模型配置是否正确！");
+            return Result.error(e.getMessage());
         }
         // 测试成功激活数据
         airagModel.setActivateFlag(1);
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java
index 569b8d55b..4b0b94fbe 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java
+++ b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java
@@ -3,6 +3,8 @@ package org.jeecg.modules.airag.llm.handler;
 import com.alibaba.fastjson.JSONObject;
 import dev.langchain4j.agent.tool.ToolSpecification;
 import dev.langchain4j.data.message.*;
+import dev.langchain4j.exception.InvalidRequestException;
+import dev.langchain4j.exception.ToolExecutionException;
 import dev.langchain4j.mcp.McpToolProvider;
 import dev.langchain4j.rag.query.router.QueryRouter;
 import dev.langchain4j.service.TokenStream;
@@ -116,6 +118,9 @@ public class AIChatHandler implements IAIChatHandler {
         String resp;
         try {
             resp = llmHandler.completions(messages, params);
+        } catch (ToolExecutionException | InvalidRequestException e) {
+            log.error(e.getMessage(), e);
+            return "";
         } catch (Exception e) {
             // langchain4j 异常友好提示
             String errMsg = "调用大模型接口失败，详情请查看后台日志。";
@@ -133,7 +138,7 @@ public class AIChatHandler implements IAIChatHandler {
                 for (Map.Entry<String, String> entry : MODEL_ERROR_MAP.entrySet()) {
                     String key = entry.getKey();
                     String value = entry.getValue();
-                    if (errMsg.contains(key)) {
+                    if (exceptionMsg.contains(key)) {
                         errMsg = value;
                         break;
                     }
@@ -454,7 +459,7 @@ public class AIChatHandler implements IAIChatHandler {
                 for (Map.Entry<String, String> entry : MODEL_ERROR_MAP.entrySet()) {
                     String key = entry.getKey();
                     String value = entry.getValue();
-                    if (errMsg.contains(key)) {
+                    if (e.getMessage().contains(key)) {
                         errMsg = value;
                         break;
                     }