From f9774b7eef3b247a6c4c93f67d3bbac2e07b9c12 Mon Sep 17 00:00:00 2001 From: guocan Date: Mon, 23 Jun 2025 17:44:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test-ui/src/views/test/performance/performance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-ui/src/views/test/performance/performance.vue b/test-ui/src/views/test/performance/performance.vue index 577dcb4..3e83905 100644 --- a/test-ui/src/views/test/performance/performance.vue +++ b/test-ui/src/views/test/performance/performance.vue @@ -71,7 +71,7 @@ export default { }, // 编辑 hadleClickEdit(val) { - this.$tab.openPage(`修改测试_${val.id}`, `/performance/edit`, { id: val.id }); + this.$tab.openPage(`修改测试_${val.id}`, `/performance/edit/${val.id}`, { id: val.id }); }, // 删除 hadleClickDelete(val) { From c170f9e5ec2e82d0f9b58bd8ad7d036939074f40 Mon Sep 17 00:00:00 2001 From: liangdaliang Date: Tue, 24 Jun 2025 10:49:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3Jmeter=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/test/service/impl/TestCaseServiceImpl.java | 3 ++- .../test/service/impl/TestCaseStepServiceImpl.java | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java index c631955..b561a59 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java @@ -340,7 +340,8 @@ public class TestCaseServiceImpl implements ITestCaseService useTime = Long.valueOf(resultMap.get("costMiliseconds")); } testCaseResult.setUseTime(useTime); - if ("fail".equals(assignmentResultMap.get("assertionResult"))) { + String responseCode = resultMap.get("responseCode"); + if ("fail".equals(assignmentResultMap.get("assertionResult")) || responseCode == null || resultMap.get("responseCode").startsWith("Non HTTP response code")) { testCaseResult.setStatus("失败"); testCaseResultMapper.insertTestCaseResult(testCaseResult); return false; diff --git a/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java index 657af7a..e3e8e6e 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -223,7 +224,16 @@ public class TestCaseStepServiceImpl implements ITestCaseStepService { jmeterRequest.setRequestHeader(testCaseStep.getRequestHeader()); jmeterRequest.setJmeterHomePath(jmeterHomePath); log.info("getRequestHeader:{}", jmeterRequest.getRequestHeader()); - Map resultMap = JMeterUtil.getJmeterResult(jmeterRequest); + Map resultMap = new HashMap<>(); + try { + resultMap = JMeterUtil.getJmeterResult(jmeterRequest); + } catch (Exception e) { + log.error("JMeterUtil异常：", e); + resultMap.put("requestHeader", jmeterRequest.getRequestHeader()); + resultMap.put("requestBody", jmeterRequest.getRequestBody()); + resultMap.put("responseHeader", ""); + resultMap.put("responseBody", ""); + } return resultMap; }