diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJDBCPostProcessor.java b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJDBCPostProcessor.java index c556c0f66d..3faf0c85ac 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJDBCPostProcessor.java +++ b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJDBCPostProcessor.java @@ -73,10 +73,15 @@ public class MsJDBCPostProcessor extends MsTestElement { LoggerUtil.error(this.getName() + ",未找到数据源", JSONUtil.toJSONString(config)); } } + if (this.dataSource == null) { + return; + } + JDBCPostProcessor jdbcPostProcessor = jdbcPostProcessor(config); final HashTree samplerHashTree = tree.add(jdbcPostProcessor); tree.add(ElementUtil.jdbcDataSource(jdbcPostProcessor.getDataSource(), this.dataSource)); + ElementUtil.jdbcArguments(this.getName(), this.getVariables(), tree); if (CollectionUtils.isNotEmpty(hashTree)) { hashTree.forEach(el -> { diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJDBCPreProcessor.java b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJDBCPreProcessor.java index 0ca20d3dff..e38cc430a2 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJDBCPreProcessor.java +++ b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJDBCPreProcessor.java @@ -7,7 +7,6 @@ import io.metersphere.api.dto.scenario.DatabaseConfig; import io.metersphere.api.dto.scenario.KeyValue; import io.metersphere.commons.constants.ElementConstants; import io.metersphere.commons.constants.RequestTypeConstants; -import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.BeanUtils; import io.metersphere.commons.utils.JSONUtil; import io.metersphere.commons.vo.JDBCProcessorVO; @@ -74,6 +73,10 @@ public class MsJDBCPreProcessor extends MsTestElement { } } + if (this.dataSource == null) { + return; + } + JDBCPreProcessor jdbcPreProcessor = jdbcPreProcessor(config); final HashTree samplerHashTree = tree.add(jdbcPreProcessor); // 数据源