From be18d0b9abedfe2d7e9afa7e7c91e22ca544d4ba Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 18 Aug 2020 11:39:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=B8=8D=E5=BC=BA=E5=88=B6=E7=94=B5=E8=84=91?= =?UTF-8?q?=E4=B8=8A=E6=9C=89=20/opt/jmeter/=20=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/api/jmeter/JMeterService.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java index 868b6b60d5..9545f212ba 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java @@ -14,6 +14,7 @@ import org.apache.jorphan.collections.HashTree; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.io.File; import java.io.InputStream; import java.lang.reflect.Field; @@ -24,14 +25,15 @@ public class JMeterService { private JmeterProperties jmeterProperties; public void run(String testId, String debugReportId, InputStream is) { - String JMETER_HOME = jmeterProperties.getHome(); + String JMETER_HOME = getJmeterHome(); + String JMETER_PROPERTIES = JMETER_HOME + "/bin/jmeter.properties"; JMeterUtils.loadJMeterProperties(JMETER_PROPERTIES); JMeterUtils.setJMeterHome(JMETER_HOME); try { Object scriptWrapper = SaveService.loadElement(is); HashTree testPlan = getHashTree(scriptWrapper); - addBackendListener(testId, debugReportId, testPlan); + addBackendListener(testId, debugReportId, testPlan); LocalRunner runner = new LocalRunner(testPlan); runner.run(); @@ -41,6 +43,20 @@ public class JMeterService { } } + private String getJmeterHome() { + String home = getClass().getResource("/").getPath() + "/jmeter"; + try { + File file = new File(home); + if (file.exists()) { + return home; + } else { + return jmeterProperties.getHome(); + } + } catch (Exception e) { + return jmeterProperties.getHome(); + } + } + private HashTree getHashTree(Object scriptWrapper) throws Exception { Field field = scriptWrapper.getClass().getDeclaredField("testPlan"); field.setAccessible(true); From c95afcc29e446ee485efecc166aad1f3fe325c69 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 18 Aug 2020 12:26:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=B8=8D=E5=BC=BA=E5=88=B6=E7=94=B5=E8=84=91?= =?UTF-8?q?=E4=B8=8A=E6=9C=89=20/opt/jmeter/=20=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/metersphere/api/jmeter/JMeterService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java index 9545f212ba..48ba7fe65e 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java @@ -44,7 +44,7 @@ public class JMeterService { } private String getJmeterHome() { - String home = getClass().getResource("/").getPath() + "/jmeter"; + String home = getClass().getResource("/").getPath() + "jmeter"; try { File file = new File(home); if (file.exists()) { From c8c53a903039d846967d4bbf8d9636105ce6b30e Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 18 Aug 2020 13:22:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=B1=A0=E6=97=B6=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=85=B3=E8=81=94=E7=9A=84=E6=80=A7=E8=83=BD=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/service/TestResourcePoolService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java index 3158f4806e..d7919de2f7 100644 --- a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java +++ b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java @@ -5,7 +5,6 @@ import io.metersphere.base.domain.*; import io.metersphere.base.mapper.LoadTestMapper; import io.metersphere.base.mapper.TestResourceMapper; import io.metersphere.base.mapper.TestResourcePoolMapper; -import io.metersphere.commons.constants.PerformanceTestStatus; import io.metersphere.commons.constants.ResourceStatusEnum; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.LogUtil; @@ -25,7 +24,6 @@ import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; @@ -70,11 +68,9 @@ public class TestResourcePoolService { } public void checkTestStatus(String testResourcePoolId) { - List list = Arrays.asList(PerformanceTestStatus.Running, PerformanceTestStatus.Starting, PerformanceTestStatus.Error); LoadTestExample example = new LoadTestExample(); example.createCriteria() - .andTestResourcePoolIdEqualTo(testResourcePoolId) - .andStatusIn(list); + .andTestResourcePoolIdEqualTo(testResourcePoolId); if (loadTestMapper.countByExample(example) > 0) { MSException.throwException(Translator.get("test_resource_pool_is_use")); }