From 73cf6fb06bc85f6f0b286bb9a2481cee25218ae4 Mon Sep 17 00:00:00 2001 From: AgAngle <1323481023@qq.com> Date: Wed, 17 Apr 2024 11:38:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=E6=8C=89=E5=90=8D=E7=A7=B0=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E6=95=B0=E6=8D=AE=E6=BA=90=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parser/jmeter/processor/SqlProcessorConverter.java | 8 ++++---- .../assertion/body/DocumentAssertionConverter.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/SqlProcessorConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/SqlProcessorConverter.java index 0850f57c18..110705ceac 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/SqlProcessorConverter.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/SqlProcessorConverter.java @@ -110,18 +110,18 @@ public abstract class SqlProcessorConverter extends MsProcessorConverter dataSources = envConfig.getConfig().getDataSources(); // 先按ID匹配 - dataSources = dataSources.stream() + List dataSourceResults = dataSources.stream() .filter(item -> StringUtils.equals(item.getId(), sqlProcessor.getDataSourceId())) .toList(); // 再按名称匹配 - if (CollectionUtils.isEmpty(dataSources)) { - dataSources = dataSources.stream() + if (CollectionUtils.isEmpty(dataSourceResults)) { + dataSourceResults = dataSources.stream() .filter(item -> StringUtils.equals(item.getDataSource(), sqlProcessor.getDataSourceName())) .toList(); } - return CollectionUtils.isEmpty(dataSources) ? null : dataSources.get(0); + return CollectionUtils.isEmpty(dataSourceResults) ? null : dataSourceResults.get(0); } protected AbstractJDBCProcessor getJdbcProcessor(SQLProcessor sqlProcessor, AbstractJDBCProcessor jdbcProcessor, DataSource dataSource) { diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/body/DocumentAssertionConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/body/DocumentAssertionConverter.java index 384ebc1153..678804b71d 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/body/DocumentAssertionConverter.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/body/DocumentAssertionConverter.java @@ -31,7 +31,6 @@ public class DocumentAssertionConverter extends ResponseBodyTypeAssertionConvert if (msAssertion == null) { return; } - // todo 定义好 jsonschema 再补充 if (needParse(msAssertion, config)) { String documentType = msAssertion.getDocumentType(); if (StringUtils.equals(documentType, MsDocumentAssertion.DocumentType.XML.name())) {