From 57fbd1988ac29b92a6a370998d6dd15d0b72005a Mon Sep 17 00:00:00 2001 From: kankanzhou <121850056+kankanzhou@users.noreply.github.com> Date: Thu, 24 Sep 2026 19:22:32 -0700 Subject: [PATCH 1/6] Step 3: Upgrade Java runtime configuration - Compile: SUCCESS, Tests: all passed Updated Java targets, Docker runtime, CI, and documentation to Java 25. Security: Replaced Alpine runtime image with Ubuntu Noble variant; Docker diagnostic still reports one base-image vulnerability. --- .github/workflows/backend.yml | 4 ++-- README.md | 2 +- data-agent-backend/pom.xml | 6 +++--- docker/backend/Dockerfile | 4 ++-- docs/architecture.md | 2 +- docs/contributing.md | 2 +- docs/getting-started.md | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 5bb0626b..f405fec9 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 25 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '25' distribution: 'temurin' cache: maven - name: Build with Maven diff --git a/README.md b/README.md index 89c347c8..e582699a 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Data Agent 反其道而行——**不引入任何向量检索**。语义层把 > 完整、带截图的步骤见 [docs/getting-started.md](docs/getting-started.md)。 -**前置依赖**:JDK 17+、Maven 3.9+、Node 18+、pnpm 8+、MySQL 8+、Python 3+(需安装 pandas、numpy、scipy)。 +**前置依赖**:JDK 25+、Maven 3.9+、Node 18+、pnpm 8+、MySQL 8+、Python 3+(需安装 pandas、numpy、scipy)。 ```bash # 1. 建元数据库并初始化表结构 diff --git a/data-agent-backend/pom.xml b/data-agent-backend/pom.xml index f0c58569..7c3f9f9e 100644 --- a/data-agent-backend/pom.xml +++ b/data-agent-backend/pom.xml @@ -65,9 +65,9 @@ - 17 - 17 - 17 + 25 + 25 + 25 UTF-8 1.0.11 3.4.0 diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index e842739d..c008be9a 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build (使用 maven 镜像,自带 Maven) -FROM maven:3.9-eclipse-temurin-17 AS builder +FROM maven:3.9-eclipse-temurin-25 AS builder WORKDIR /app @@ -24,7 +24,7 @@ COPY data-agent-backend/src ./src RUN mvn clean package -DskipTests -B # Stage 2: Runtime -FROM eclipse-temurin:17-jre-alpine +FROM eclipse-temurin:25-jre-noble WORKDIR /app diff --git a/docs/architecture.md b/docs/architecture.md index 3e2ffe85..b7b68423 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -7,7 +7,7 @@ | 组件 | 技术 | 职责 | | --- | --- | --- | | 前端 | Vue 3 + TypeScript + Vite + Element Plus | 聊天界面、数据源管理、语义管理、资产管理、系统管理 | -| 后端 | Spring Boot 4(Java 17+) | Agent 推理、工具执行、语义层、数据源、会话、MCP 管理 | +| 后端 | Spring Boot 4(Java 25+) | Agent 推理、工具执行、语义层、数据源、会话、MCP 管理 | | Skill 系统 | 多源加载(文件系统 / Git / Nacos / classpath) | 加载"已验证查询模式"作为可复用流程 | | 元数据库 | MySQL | 存语义层、数据源、会话、MCP 配置、报表、用户、角色与权限等 | | 查询数据源 | 任意 JDBC 兼容关系型数据库 | 用户真正要查的业务库,由 Agent 动态连接;默认内置 MySQL 驱动,其他数据库需按需加入驱动 | diff --git a/docs/contributing.md b/docs/contributing.md index a0bd64f5..3f3a167f 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -6,7 +6,7 @@ ### 后端 -- JDK 17+(推荐 21),Maven 3.9+ +- JDK 25+,Maven 3.9+ - 导入 `data-agent-backend`(标准 Maven 项目,Spring Boot) - 配置元数据库与 LLM(见 [configuration.md](configuration.md)),本地起 `mvn spring-boot:run` - 代码规范总纲见仓库根目录 `AGENTS.md`(**必读**) diff --git a/docs/getting-started.md b/docs/getting-started.md index ef4470d9..b632c96f 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -74,7 +74,7 @@ docker-compose up -d --build | 依赖 | 版本要求 | 说明 | | --- | --- | --- | -| JDK | 17 或更高(推荐 21) | 后端基于 Spring Boot 4 | +| JDK | 25 或更高 | 后端基于 Spring Boot 4 | | Maven | 3.9+ | 构建与运行后端 | | Node.js | 18+ | 前端运行环境 | | pnpm | 8+ | 前端包管理 | From 56d133493b5317ff6489d74e47e196be04b83b17 Mon Sep 17 00:00:00 2001 From: kankanzhou <121850056+kankanzhou@users.noreply.github.com> Date: Sat, 14 Nov 2026 16:07:25 -0700 Subject: [PATCH 2/6] feat: add connection testing for saved datasources --- .../datasource/DynamicDataSourceManager.java | 9 ++++ .../controller/DatasourceController.java | 9 ++++ .../malonetalk/model/vo/DatasourceTestVo.java | 20 +++++++ .../service/DatasourceInspectionService.java | 52 +++++++++++++++++++ data-agent-frontend/src/api/datasource.ts | 11 ++++ .../src/views/data-source/DataSource.vue | 35 ++++++++++++- 6 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/model/vo/DatasourceTestVo.java create mode 100644 data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceInspectionService.java diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/DynamicDataSourceManager.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/DynamicDataSourceManager.java index 88e42af2..8b025ba0 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/DynamicDataSourceManager.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/DynamicDataSourceManager.java @@ -24,6 +24,8 @@ import io.github.malonetalk.model.po.DatasourcePo; import io.opentelemetry.instrumentation.jdbc.datasource.JdbcTelemetry; import jakarta.annotation.PreDestroy; +import java.sql.Connection; +import java.sql.SQLException; import java.util.concurrent.ConcurrentHashMap; import javax.sql.DataSource; import lombok.RequiredArgsConstructor; @@ -52,6 +54,13 @@ public DataSource getOrCreateDataSource(DatasourcePo datasource) { return jdbcTelemetry.wrap(pool); } + public boolean testConnection(DatasourcePo datasource) throws SQLException { + try (HikariDataSource pool = createDataSource(datasource); + Connection connection = pool.getConnection()) { + return connection.isValid(5); + } + } + private HikariDataSource createDataSource(DatasourcePo datasource) { DataSourceType type = DataSourceType.fromCode(datasource.getType()) diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/controller/DatasourceController.java b/data-agent-backend/src/main/java/io/github/malonetalk/controller/DatasourceController.java index 2c5bbb30..21e19247 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/controller/DatasourceController.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/controller/DatasourceController.java @@ -31,9 +31,11 @@ import io.github.malonetalk.model.vo.DatasourceColumnsVo; import io.github.malonetalk.model.vo.DatasourceObjectVo; import io.github.malonetalk.model.vo.DatasourceOptionVo; +import io.github.malonetalk.model.vo.DatasourceTestVo; import io.github.malonetalk.model.vo.DatasourceVo; import io.github.malonetalk.model.vo.ListVo; import io.github.malonetalk.service.DataPermissionService; +import io.github.malonetalk.service.DatasourceInspectionService; import io.github.malonetalk.service.DatasourceService; import jakarta.validation.Valid; import java.util.List; @@ -55,6 +57,7 @@ public class DatasourceController { private final DatasourceService dataSourceService; + private final DatasourceInspectionService datasourceInspectionService; private final DataPermissionService dataPermissions; private final UserContextHolder holder; private final DatasourceConverter datasourceConverter; @@ -201,4 +204,10 @@ public ListVo options() { ds.getStatus())) .toList()); } + + @PostMapping("/{id}/test") + @RequirePermission(PermissionEnum.DATA_DATASOURCE_UPDATE) + public DatasourceTestVo testConnection(@PathVariable Integer id) { + return datasourceInspectionService.testConnection(id); + } } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/DatasourceTestVo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/DatasourceTestVo.java new file mode 100644 index 00000000..67c231bb --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/DatasourceTestVo.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.vo; + +public record DatasourceTestVo(boolean success, String message) implements BaseVo {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceInspectionService.java b/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceInspectionService.java new file mode 100644 index 00000000..a781f47e --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceInspectionService.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.service; + +import io.github.malonetalk.agent.datasource.DynamicDataSourceManager; +import io.github.malonetalk.exception.BusinessException; +import io.github.malonetalk.model.po.DatasourcePo; +import io.github.malonetalk.model.vo.DatasourceTestVo; +import java.sql.SQLException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class DatasourceInspectionService { + + private final DatasourceService datasourceService; + private final DynamicDataSourceManager dynamicDataSourceManager; + + public DatasourceTestVo testConnection(Integer id) { + DatasourcePo datasource = datasourceService.requireById(id); + + try { + boolean success = dynamicDataSourceManager.testConnection(datasource); + + return new DatasourceTestVo(success, success ? "连接成功" : "连接验证失败,请检查数据库是否可用"); + } catch (BusinessException e) { + throw e; + } catch (SQLException | RuntimeException e) { + log.warn("Datasource connection test failed, datasourceId={}", id, e); + + return new DatasourceTestVo(false, "连接失败,请检查地址、端口、数据库名、账号密码及网络"); + } + } +} diff --git a/data-agent-frontend/src/api/datasource.ts b/data-agent-frontend/src/api/datasource.ts index d91594dc..6bb0707d 100644 --- a/data-agent-frontend/src/api/datasource.ts +++ b/data-agent-frontend/src/api/datasource.ts @@ -101,3 +101,14 @@ export function getDatasourceOptions() { .get>('/datasource/options') .then(res => res.data.data); } + +export interface DatasourceTestResponse { + success: boolean; + message: string; +} + +export function testDatasource(id: number) { + return request + .post>(`/datasource/${id}/test`) + .then(res => res.data.data); +} diff --git a/data-agent-frontend/src/views/data-source/DataSource.vue b/data-agent-frontend/src/views/data-source/DataSource.vue index 348651e3..0ee1f0a5 100644 --- a/data-agent-frontend/src/views/data-source/DataSource.vue +++ b/data-agent-frontend/src/views/data-source/DataSource.vue @@ -28,6 +28,7 @@ activateDatasource, deactivateDatasource, getDatasourceList, + testDatasource, type DatasourceResponse, } from '@/api/datasource'; import { useFieldErrors } from '@/composables/useFieldErrors'; @@ -148,6 +149,28 @@ } }; + const testingIds = reactive(new Set()); + + const handleTestConnection = async (row: DatasourceResponse) => { + if (testingIds.has(row.id)) return; + + testingIds.add(row.id); + + try { + const result = await testDatasource(row.id); + + if (result.success) { + ElMessage.success(result.message); + } else { + ElMessage.error(result.message); + } + } catch { + // 请求异常由现有 request 拦截器统一提示。 + } finally { + testingIds.delete(row.id); + } + }; + const handleActivate = async (row: DatasourceResponse) => { try { await activateDatasource(row.id); @@ -250,8 +273,18 @@ - + - + + + +