diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java b/api-test/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java index 322ec69dfa..28fe3fc5d5 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java +++ b/api-test/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java @@ -67,6 +67,6 @@ public class KeyValue { } public boolean isFile() { - return (CollectionUtils.isNotEmpty(files)) && StringUtils.equalsIgnoreCase(type, "file"); + return (CollectionUtils.isNotEmpty(files)) && (StringUtils.isEmpty(type) || StringUtils.equalsIgnoreCase(type, "file")); } } diff --git a/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java index 00faba5752..dce69daefa 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java +++ b/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java @@ -188,8 +188,7 @@ public class JMeterService { public void run(JmeterRunRequestDTO request) { - //UI 测试只走本地 ms,资源池交给 selenium-grid 本身实现 - if (request.getPool().isPool() && StringUtils.isNotBlank(request.getRunMode()) && !request.getRunMode().startsWith("UI")) { + if (request.getPool().isPool() && StringUtils.isNotBlank(request.getRunMode())) { this.runNode(request); } else { //解析hashTree,是否含有文件库文件 diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml index a283c1f71a..51af62ddfb 100644 --- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml +++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml @@ -445,7 +445,7 @@ and (t3.status IS NULL or t3.status = '' or t3.status = 'Prepare' or t3.status = 'Underway' or t3.status = - 'stop') + 'STOPPED') and t3.status = 'success' diff --git a/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue b/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue index 634a176bf6..ba21a67063 100644 --- a/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue +++ b/api-test/frontend/src/business/automation/scenario/component/ApiScenarioComponent.vue @@ -121,7 +121,7 @@ export default { }, watch: { message() { - if (this.message === 'stop') { + if (this.message === 'STOPPED') { this.scenario.run = false; } this.reload(); diff --git a/api-test/frontend/src/business/commons/QuoteFileList.vue b/api-test/frontend/src/business/commons/QuoteFileList.vue index 713f8178e1..3ede7c975c 100644 --- a/api-test/frontend/src/business/commons/QuoteFileList.vue +++ b/api-test/frontend/src/business/commons/QuoteFileList.vue @@ -17,24 +17,26 @@