diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/DataSourceType.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/DataSourceType.java index 4e50247..eb437ae 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/DataSourceType.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/DataSourceType.java @@ -18,47 +18,72 @@ package io.github.malonetalk.agent.datasource; import java.util.Arrays; +import java.util.Map; import java.util.Optional; +import java.util.StringJoiner; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor public enum DataSourceType { - MYSQL("mysql", "com.mysql.cj.jdbc.Driver", "jdbc:mysql://", "com.mysql:mysql-connector-j"), + MYSQL( + "mysql", + "com.mysql.cj.jdbc.Driver", + "jdbc:mysql://", + "com.mysql:mysql-connector-j", + Map.of("connectTimeout", "5000", "socketTimeout", "5000")), POSTGRESQL( "postgresql", "org.postgresql.Driver", "jdbc:postgresql://", - "org.postgresql:postgresql"), + "org.postgresql:postgresql", + Map.of("connectTimeout", "5", "socketTimeout", "5", "loginTimeout", "10")), ORACLE( "oracle", "oracle.jdbc.OracleDriver", "jdbc:oracle:thin:@", - "com.oracle.database.jdbc:ojdbc11"), + "com.oracle.database.jdbc:ojdbc11", + Map.of("oracle.net.CONNECT_TIMEOUT", "5000", "oracle.jdbc.ReadTimeout", "5000")), CLICKHOUSE( "clickhouse", "com.clickhouse.jdbc.ClickHouseDriver", "jdbc:clickhouse://", - "com.clickhouse:clickhouse-jdbc"), + "com.clickhouse:clickhouse-jdbc", + Map.of("connection_timeout", "5000", "socket_timeout", "5000")), SQLSERVER( "sqlserver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "jdbc:sqlserver://", - "com.microsoft.sqlserver:mssql-jdbc"), - DAMENG("dameng", "dm.jdbc.driver.DmDriver", "jdbc:dm://", "com.dameng:DmJdbcDriver18"), + "com.microsoft.sqlserver:mssql-jdbc", + Map.of("loginTimeout", "5", "socketTimeout", "5000")), + DAMENG( + "dameng", + "dm.jdbc.driver.DmDriver", + "jdbc:dm://", + "com.dameng:DmJdbcDriver18", + Map.of("connectTimeout", "5000", "socketTimeout", "5000")), OCEANBASE( "oceanbase", "com.oceanbase.jdbc.Driver", "jdbc:oceanbase://", - "com.oceanbase:oceanbase-client"), - SQLITE("sqlite", "org.sqlite.JDBC", "jdbc:sqlite:", "org.xerial:sqlite-jdbc"); + "com.oceanbase:oceanbase-client", + Map.of("connectTimeout", "5000", "socketTimeout", "5000")), + SQLITE( + "sqlite", + "org.sqlite.JDBC", + "jdbc:sqlite:", + "org.xerial:sqlite-jdbc", + Map.of("busy_timeout", "5000")); private final String code; private final String driverClassName; private final String urlPrefix; private final String mavenCoordinates; + /** Driver-specific units: PostgreSQL/login timeouts use seconds, others milliseconds. */ + private final Map inspectionTimeouts; + public static Optional fromCode(String code) { if (code == null) { return Optional.empty(); @@ -68,6 +93,22 @@ public static Optional fromCode(String code) { .findFirst(); } + String inspectionJdbcUrl(String jdbcUrl) { + if (this != POSTGRESQL) return jdbcUrl; + // PostgreSQL 的 URL 参数优先于 Properties;只改临时测试 URL,保留其他参数原文。 + String[] parts = jdbcUrl.split("\\?", 2); + Map timeouts = getInspectionTimeouts(); + StringJoiner query = new StringJoiner("&"); + if (parts.length == 2) { + for (String parameter : parts[1].split("&")) { + String key = parameter.split("=", 2)[0]; + if (!parameter.isEmpty() && !timeouts.containsKey(key)) query.add(parameter); + } + } + timeouts.forEach((key, value) -> query.add(key + "=" + value)); + return parts[0] + "?" + query; + } + public String buildJdbcUrl(String host, int port, String databaseName) { return switch (this) { case MYSQL, POSTGRESQL, CLICKHOUSE, DAMENG, OCEANBASE -> 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 88e42af..5fda99e 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; @@ -48,11 +50,18 @@ public class DynamicDataSourceManager { public DataSource getOrCreateDataSource(DatasourcePo datasource) { HikariDataSource pool = dataSourcePool.computeIfAbsent( - datasource.getId(), id -> createDataSource(datasource)); + datasource.getId(), id -> createDataSource(datasource, false)); return jdbcTelemetry.wrap(pool); } - private HikariDataSource createDataSource(DatasourcePo datasource) { + public boolean testConnection(DatasourcePo datasource) throws SQLException { + try (HikariDataSource pool = createDataSource(datasource, true); + Connection connection = pool.getConnection()) { + return connection.isValid(5); + } + } + + private HikariDataSource createDataSource(DatasourcePo datasource, boolean inspection) { DataSourceType type = DataSourceType.fromCode(datasource.getType()) .orElseThrow( @@ -67,7 +76,7 @@ private HikariDataSource createDataSource(DatasourcePo datasource) { // 注意:HikariConfig.setDriverClassName() 会同步加载驱动类,缺驱动时在此即抛异常, // 因此 config 构建与池创建必须同在一个 try 内,才能被转译为可操作的缺驱动提示。 try { - HikariConfig config = getHikariConfig(datasource, jdbcUrl, type); + HikariConfig config = getHikariConfig(datasource, jdbcUrl, type, inspection); log.info( "Creating datasource pool for [{}] type={} url={}", @@ -112,7 +121,7 @@ private RuntimeException translateInitializationFailure( } private static HikariConfig getHikariConfig( - DatasourcePo datasource, String jdbcUrl, DataSourceType type) { + DatasourcePo datasource, String jdbcUrl, DataSourceType type, boolean inspection) { HikariConfig config = new HikariConfig(); config.setJdbcUrl(jdbcUrl); config.setUsername(datasource.getUsername()); @@ -125,6 +134,13 @@ private static HikariConfig getHikariConfig( config.setConnectionTimeout(CONNECTION_TIMEOUT); config.setMaxLifetime(MAX_LIFETIME); + if (inspection) { + // Pool acquisition/isValid timeouts do not bound the driver's initial handshake. + config.setJdbcUrl(type.inspectionJdbcUrl(jdbcUrl)); + type.getInspectionTimeouts().forEach(config::addDataSourceProperty); + config.setMaximumPoolSize(1); + } + config.setPoolName("ds-" + datasource.getId() + "-" + type.getCode()); return config; } 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 2c5bbb3..7c4454c 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,12 @@ 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.model.vo.PhysicalTableInfoVo; 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 +58,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 +205,22 @@ public ListVo options() { ds.getStatus())) .toList()); } + + @PostMapping("/test") + @RequirePermission(PermissionEnum.DATA_DATASOURCE_CREATE) + public DatasourceTestVo testConfiguration(@Valid @RequestBody DatasourceDto request) { + return datasourceInspectionService.testConfiguration(request); + } + + @PostMapping("/{id}/test") + @RequirePermission(PermissionEnum.DATA_DATASOURCE_UPDATE) + public DatasourceTestVo testConnection(@PathVariable Integer id) { + return datasourceInspectionService.testConnection(id); + } + + @GetMapping("/{id}/physical-tables") + @RequirePermission(PermissionEnum.DATA_DATASOURCE_UPDATE) + public ListVo listPhysicalTables(@PathVariable Integer id) { + return new ListVo<>(datasourceInspectionService.listPhysicalTables(id)); + } } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/enums/DatasourceTestStatus.java b/data-agent-backend/src/main/java/io/github/malonetalk/enums/DatasourceTestStatus.java new file mode 100644 index 0000000..0bc5a6c --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/enums/DatasourceTestStatus.java @@ -0,0 +1,23 @@ +/* + * 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.enums; + +public enum DatasourceTestStatus { + SUCCESS, + FAILED +} 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 0000000..67c231b --- /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/model/vo/PhysicalTableInfoVo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/PhysicalTableInfoVo.java new file mode 100644 index 0000000..29370d5 --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/PhysicalTableInfoVo.java @@ -0,0 +1,21 @@ +/* + * 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 PhysicalTableInfoVo(String tableName, String objectType, String remarks) + 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 0000000..a31644c --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceInspectionService.java @@ -0,0 +1,91 @@ +/* + * 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.agent.datasource.SchemaReader; +import io.github.malonetalk.enums.DatasourceTestStatus; +import io.github.malonetalk.exception.BusinessException; +import io.github.malonetalk.model.converter.DatasourceConverter; +import io.github.malonetalk.model.dto.DatasourceDto; +import io.github.malonetalk.model.po.DatasourcePo; +import io.github.malonetalk.model.vo.DatasourceTestVo; +import io.github.malonetalk.model.vo.PhysicalTableInfoVo; +import java.sql.SQLException; +import java.util.Comparator; +import java.util.List; +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; + private final SchemaReader schemaReader; + private final DatasourceConverter converter; + + public DatasourceTestVo testConnection(Integer id) { + DatasourcePo datasource = datasourceService.requireById(id); + DatasourceTestVo result; + try { + result = testConnection(datasource); + } catch (BusinessException e) { + datasourceService.updateTestStatus(id, DatasourceTestStatus.FAILED); + throw e; + } + datasourceService.updateTestStatus( + id, result.success() ? DatasourceTestStatus.SUCCESS : DatasourceTestStatus.FAILED); + return result; + } + + public DatasourceTestVo testConfiguration(DatasourceDto request) { + return testConnection(converter.toPo(request)); + } + + private DatasourceTestVo testConnection(DatasourcePo datasource) { + 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={}", datasource.getId(), e); + + return new DatasourceTestVo(false, "连接失败,请检查地址、端口、数据库名、账号密码及网络"); + } + } + + public List listPhysicalTables(Integer id) { + DatasourcePo datasource = datasourceService.requireById(id); + + return schemaReader.getTables(datasource).stream() + .map( + table -> + new PhysicalTableInfoVo( + table.tableName(), table.objectType(), table.remarks())) + .sorted( + Comparator.comparing( + PhysicalTableInfoVo::tableName, String.CASE_INSENSITIVE_ORDER)) + .toList(); + } +} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceService.java b/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceService.java index a0d3a9e..fc52a0d 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceService.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceService.java @@ -17,6 +17,7 @@ */ package io.github.malonetalk.service; +import io.github.malonetalk.enums.DatasourceTestStatus; import io.github.malonetalk.enums.Status; import io.github.malonetalk.exception.BusinessException; import io.github.malonetalk.exception.ErrorCode; @@ -53,5 +54,7 @@ default DatasourcePo requireById(Integer id) { List findByType(String type); + void updateTestStatus(Integer id, DatasourceTestStatus status); + void updateStatus(Integer id, Status status); } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceServiceImpl.java b/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceServiceImpl.java index 76f6b6e..c99a51e 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceServiceImpl.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/DatasourceServiceImpl.java @@ -21,6 +21,7 @@ import io.github.malonetalk.agent.datasource.DataSourceType; import io.github.malonetalk.agent.datasource.DynamicDataSourceManager; import io.github.malonetalk.enums.DatasourceSourceType; +import io.github.malonetalk.enums.DatasourceTestStatus; import io.github.malonetalk.enums.Status; import io.github.malonetalk.exception.BusinessException; import io.github.malonetalk.exception.ErrorCode; @@ -28,6 +29,7 @@ import io.github.malonetalk.model.converter.DatasourceConverter; import io.github.malonetalk.model.dto.DatasourceDto; import io.github.malonetalk.model.po.DatasourcePo; +import java.sql.SQLException; import java.util.Collection; import java.util.List; import java.util.Optional; @@ -62,6 +64,16 @@ public void save(DatasourceDto request) { datasource.setType(type.getCode()); datasource.setSourceType(DatasourceSourceType.DATABASE.name()); datasource.setStatus(Status.INACTIVE.getCode()); + try { + if (!dynamicDataSourceManager.testConnection(datasource)) { + throw BusinessException.of(ErrorCode.BAD_REQUEST, "连接验证失败,请检查数据库是否可用"); + } + } catch (BusinessException e) { + throw e; + } catch (SQLException | RuntimeException e) { + throw BusinessException.of(ErrorCode.BAD_REQUEST, "连接失败,请检查地址、端口、数据库名、账号密码及网络", e); + } + datasource.setTestStatus(DatasourceTestStatus.SUCCESS.name()); requireOperationSuccess( dataSourceMapper.insert(datasource), "Failed to save the datasource."); } @@ -77,8 +89,14 @@ public void update(Integer id, DatasourceDto request) { Optional.ofNullable(request.password()) .filter(password -> !password.isEmpty()) .ifPresent(datasource::setPassword); + datasource.setTestStatus(null); requireOperationSuccess( - dataSourceMapper.updateById(datasource), "Failed to update the datasource."); + dataSourceMapper.update( + datasource, + Wrappers.lambdaUpdate() + .eq(DatasourcePo::getId, id) + .set(DatasourcePo::getTestStatus, null)), + "Failed to update the datasource."); dynamicDataSourceManager.removeDataSource(id); } @@ -117,6 +135,15 @@ public List findByType(String type) { .orderByDesc(DatasourcePo::getCreateTime)); } + @Override + public void updateTestStatus(Integer id, DatasourceTestStatus status) { + DatasourcePo update = new DatasourcePo(); + update.setId(id); + update.setTestStatus(status.name()); + requireOperationSuccess( + dataSourceMapper.updateById(update), "Failed to update datasource test status."); + } + @Override public void updateStatus(Integer id, Status status) { requireById(id); diff --git a/data-agent-backend/src/test/java/io/github/malonetalk/agent/datasource/DataSourceTypeTest.java b/data-agent-backend/src/test/java/io/github/malonetalk/agent/datasource/DataSourceTypeTest.java new file mode 100644 index 0000000..57f1d75 --- /dev/null +++ b/data-agent-backend/src/test/java/io/github/malonetalk/agent/datasource/DataSourceTypeTest.java @@ -0,0 +1,41 @@ +/* + * 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.agent.datasource; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; + +class DataSourceTypeTest { + @Test + void postgresInspectionReplacesConflictingTimeouts() { + String url = + DataSourceType.POSTGRESQL.inspectionJdbcUrl( + "jdbc:postgresql://localhost/db?connectTimeout=0&socketTimeout=600&socketTimeout=0&loginTimeout=0"); + // No merge function: duplicate timeout keys must fail this assertion too. + Map query = + Arrays.stream(url.split("\\?", 2)[1].split("&")) + .map(parameter -> parameter.split("=", 2)) + .collect(Collectors.toMap(pair -> pair[0], pair -> pair[1])); + assertEquals( + Map.of("connectTimeout", "5", "socketTimeout", "5", "loginTimeout", "10"), query); + } +} diff --git a/data-agent-backend/src/test/java/io/github/malonetalk/agent/datasource/DynamicDataSourceManagerTest.java b/data-agent-backend/src/test/java/io/github/malonetalk/agent/datasource/DynamicDataSourceManagerTest.java index 44df20c..24a978e 100644 --- a/data-agent-backend/src/test/java/io/github/malonetalk/agent/datasource/DynamicDataSourceManagerTest.java +++ b/data-agent-backend/src/test/java/io/github/malonetalk/agent/datasource/DynamicDataSourceManagerTest.java @@ -26,7 +26,11 @@ import io.github.malonetalk.model.po.DatasourcePo; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.jdbc.datasource.JdbcTelemetry; +import java.net.ServerSocket; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; /** 池初始化失败的转译逻辑:缺驱动必须给出可操作的 pom.xml 指引,而不是裸 INTERNAL_ERROR。 */ class DynamicDataSourceManagerTest { @@ -51,4 +55,34 @@ void missingDriverYieldsActionableBusinessException() { assertTrue(ex.getMessage().contains("org.postgresql:postgresql")); assertTrue(ex.getMessage().contains("pom.xml")); } + + @Test + @Timeout(20) + void stalledMysqlHandshakeTimesOutAndClosesSocket() throws Exception { + try (var server = new ServerSocket(0)) { + server.setSoTimeout(15000); + var disconnected = + CompletableFuture.supplyAsync( + () -> { + try (var socket = server.accept()) { + socket.setSoTimeout(15000); + // Accept TCP but never send a MySQL greeting. + return socket.getInputStream().read(); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + var ds = new DatasourcePo(); + ds.setType("mysql"); + ds.setName("stalled-handshake"); + ds.setConnectionUrl( + "jdbc:mysql://127.0.0.1:" + + server.getLocalPort() + + "/test?connectTimeout=0&socketTimeout=0"); + long start = System.nanoTime(); + assertThrows(RuntimeException.class, () -> manager.testConnection(ds)); + assertTrue(TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start) < 12); + assertEquals(-1, disconnected.get(2, TimeUnit.SECONDS)); + } + } } diff --git a/data-agent-backend/src/test/java/io/github/malonetalk/service/DatasourceInspectionServiceTest.java b/data-agent-backend/src/test/java/io/github/malonetalk/service/DatasourceInspectionServiceTest.java new file mode 100644 index 0000000..c6756f2 --- /dev/null +++ b/data-agent-backend/src/test/java/io/github/malonetalk/service/DatasourceInspectionServiceTest.java @@ -0,0 +1,85 @@ +/* + * 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 static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + +import io.github.malonetalk.agent.datasource.DynamicDataSourceManager; +import io.github.malonetalk.agent.datasource.SchemaReader; +import io.github.malonetalk.enums.DatasourceTestStatus; +import io.github.malonetalk.exception.BusinessException; +import io.github.malonetalk.exception.ErrorCode; +import io.github.malonetalk.model.converter.DatasourceConverter; +import io.github.malonetalk.model.dto.DatasourceDto; +import io.github.malonetalk.model.po.DatasourcePo; +import java.sql.SQLException; +import org.junit.jupiter.api.Test; +import org.mapstruct.factory.Mappers; + +class DatasourceInspectionServiceTest { + private final DatasourceService datasources = mock(DatasourceService.class); + private final DynamicDataSourceManager manager = mock(DynamicDataSourceManager.class); + private final DatasourceInspectionService service = + new DatasourceInspectionService( + datasources, + manager, + mock(SchemaReader.class), + Mappers.getMapper(DatasourceConverter.class)); + private final DatasourcePo datasource = new DatasourcePo(); + + @Test + void savedTestPersistsSuccessAndFailure() throws Exception { + when(datasources.requireById(1)).thenReturn(datasource); + when(manager.testConnection(datasource)).thenReturn(true, false); + assertTrue(service.testConnection(1).success()); + verify(datasources).updateTestStatus(1, DatasourceTestStatus.SUCCESS); + assertFalse(service.testConnection(1).success()); + verify(datasources).updateTestStatus(1, DatasourceTestStatus.FAILED); + } + + @Test + void sqlFailurePersistsFailedStatus() throws Exception { + when(datasources.requireById(1)).thenReturn(datasource); + when(manager.testConnection(datasource)).thenThrow(new SQLException("unreachable")); + assertFalse(service.testConnection(1).success()); + verify(datasources).updateTestStatus(1, DatasourceTestStatus.FAILED); + } + + @Test + void missingDriverPersistsFailureAndKeepsActionableError() throws Exception { + when(datasources.requireById(1)).thenReturn(datasource); + var failure = BusinessException.of(ErrorCode.JDBC_DRIVER_NOT_FOUND, "install driver"); + when(manager.testConnection(datasource)).thenThrow(failure); + assertSame(failure, assertThrows(BusinessException.class, () -> service.testConnection(1))); + verify(datasources).updateTestStatus(1, DatasourceTestStatus.FAILED); + } + + @Test + void unsavedTestDoesNotWriteStatus() { + assertFalse( + service.testConfiguration(DatasourceDto.builder().type("mysql").build()).success()); + verifyNoInteractions(datasources); + } +} diff --git a/data-agent-backend/src/test/java/io/github/malonetalk/service/DatasourceServiceImplTest.java b/data-agent-backend/src/test/java/io/github/malonetalk/service/DatasourceServiceImplTest.java new file mode 100644 index 0000000..8751e41 --- /dev/null +++ b/data-agent-backend/src/test/java/io/github/malonetalk/service/DatasourceServiceImplTest.java @@ -0,0 +1,112 @@ +/* + * 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 static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import io.github.malonetalk.agent.datasource.DynamicDataSourceManager; +import io.github.malonetalk.enums.DatasourceTestStatus; +import io.github.malonetalk.exception.BusinessException; +import io.github.malonetalk.mapper.DatasourceMapper; +import io.github.malonetalk.model.converter.DatasourceConverter; +import io.github.malonetalk.model.dto.DatasourceDto; +import io.github.malonetalk.model.po.DatasourcePo; +import java.sql.SQLException; +import org.apache.ibatis.builder.MapperBuilderAssistant; +import org.junit.jupiter.api.Test; +import org.mapstruct.factory.Mappers; +import org.mockito.ArgumentCaptor; + +class DatasourceServiceImplTest { + private final DatasourceMapper mapper = mock(DatasourceMapper.class); + private final DynamicDataSourceManager manager = mock(DynamicDataSourceManager.class); + private final DatasourceServiceImpl service = + new DatasourceServiceImpl( + mapper, manager, Mappers.getMapper(DatasourceConverter.class)); + private final DatasourceDto request = + DatasourceDto.builder().name("test").type("mysql").host("localhost").port(3306).build(); + + @Test + void saveTestsBeforeInsertingSuccessfulStatus() throws Exception { + when(manager.testConnection(any())).thenReturn(true); + when(mapper.insert(any(DatasourcePo.class))).thenReturn(1); + service.save(request); + var order = inOrder(manager, mapper); + order.verify(manager).testConnection(any()); + var inserted = ArgumentCaptor.forClass(DatasourcePo.class); + order.verify(mapper).insert(inserted.capture()); + assertEquals("SUCCESS", inserted.getValue().getTestStatus()); + } + + @Test + void unsuccessfulValidationCannotBeSaved() throws Exception { + when(manager.testConnection(any())).thenReturn(false); + assertThrows(BusinessException.class, () -> service.save(request)); + verifyNoInteractions(mapper); + } + + @Test + void connectionExceptionCannotBeSaved() throws Exception { + when(manager.testConnection(any())).thenThrow(new SQLException("unreachable")); + assertThrows(BusinessException.class, () -> service.save(request)); + verifyNoInteractions(mapper); + } + + @Test + void editExplicitlyClearsPersistedTestStatus() { + TableInfoHelper.initTableInfo( + new MapperBuilderAssistant(new MybatisConfiguration(), ""), DatasourcePo.class); + DatasourcePo saved = new DatasourcePo(); + saved.setId(1); + saved.setTestStatus("SUCCESS"); + when(mapper.selectById(1)).thenReturn(saved); + when(mapper.update(any(DatasourcePo.class), any())).thenReturn(1); + service.update(1, request); + var wrapper = ArgumentCaptor.forClass(LambdaUpdateWrapper.class); + verify(mapper).update(eq(saved), wrapper.capture()); + assertNull(saved.getTestStatus()); + assertTrue(wrapper.getValue().getSqlSet().contains("test_status=")); + assertTrue(wrapper.getValue().getParamNameValuePairs().containsValue(null)); + verify(manager).removeDataSource(1); + } + + @Test + void testStatusUpdateDoesNotRewriteConnectionSettings() { + when(mapper.updateById(any(DatasourcePo.class))).thenReturn(1); + service.updateTestStatus(1, DatasourceTestStatus.FAILED); + var update = ArgumentCaptor.forClass(DatasourcePo.class); + verify(mapper).updateById(update.capture()); + assertEquals(1, update.getValue().getId()); + assertEquals("FAILED", update.getValue().getTestStatus()); + assertNull(update.getValue().getPassword()); + assertNull(update.getValue().getHost()); + } +} diff --git a/data-agent-frontend/src/api/datasource.ts b/data-agent-frontend/src/api/datasource.ts index d91594d..9a835bb 100644 --- a/data-agent-frontend/src/api/datasource.ts +++ b/data-agent-frontend/src/api/datasource.ts @@ -101,3 +101,32 @@ export function getDatasourceOptions() { .get>('/datasource/options') .then(res => res.data.data); } + +export interface DatasourceTestResponse { + success: boolean; + message: string; +} + +export function testDatasourceConfiguration(data: DatasourceRequest) { + return request + .post>('/datasource/test', data) + .then(res => res.data.data); +} + +export function testDatasource(id: number) { + return request + .post>(`/datasource/${id}/test`) + .then(res => res.data.data); +} + +export interface DatasourceTable { + tableName: string; + objectType: string; + remarks: string | null; +} + +export function getDatasourcePhysicalTables(id: number) { + return request + .get>(`/datasource/${id}/physical-tables`) + .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 348651e..d85bc1a 100644 --- a/data-agent-frontend/src/views/data-source/DataSource.vue +++ b/data-agent-frontend/src/views/data-source/DataSource.vue @@ -28,16 +28,25 @@ activateDatasource, deactivateDatasource, getDatasourceList, + testDatasource, type DatasourceResponse, } from '@/api/datasource'; import { useFieldErrors } from '@/composables/useFieldErrors'; import CsvImportPanel from './components/CsvImportPanel.vue'; + import DatasourceTablesDrawer from './components/DatasourceTablesDrawer.vue'; const router = useRouter(); const { list: dataSourceList, loading, error, fetchList } = useDatasource(getDatasourceList); const dialogVisible = ref(false); const csvVisible = ref(false); + const tablesVisible = ref(false); + const selectedDatasource = ref(); + + const handleViewTables = (row: DatasourceResponse) => { + selectedDatasource.value = row; + tablesVisible.value = true; + }; const submitLoading = ref(false); const isEdit = ref(false); const formRef = ref(); @@ -148,6 +157,29 @@ } }; + 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); + await fetchList(); + } + }; + const handleActivate = async (row: DatasourceResponse) => { try { await activateDatasource(row.id); @@ -169,7 +201,7 @@ }; const handleSubmit = async () => { - if (!formRef.value) return; + if (submitLoading.value || !formRef.value) return; clearFieldErrors(); const valid = await formRef.value.validate().catch(() => false); if (!valid) return; @@ -181,9 +213,9 @@ await fetchList(); ElMessage.success('编辑成功'); } else { - await createDatasource(form); + await createDatasource({ ...form }); await fetchList(); - ElMessage.success('新增成功'); + ElMessage.success('连接测试通过,数据源已保存'); } dialogVisible.value = false; } catch (error) { @@ -250,8 +282,33 @@ - + + + +