diff --git a/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java b/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java index 2c17313cea..58e28bb79d 100644 --- a/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java +++ b/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java @@ -3,7 +3,6 @@ package io.metersphere.performance.engine; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.metersphere.api.dto.RunRequest; import io.metersphere.base.domain.LoadTestReportWithBLOBs; import io.metersphere.base.domain.TestResource; import io.metersphere.base.domain.TestResourcePool; @@ -13,6 +12,7 @@ import io.metersphere.commons.constants.ResourceStatusEnum; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.config.JmeterProperties; +import io.metersphere.dto.JmeterRunRequestDTO; import io.metersphere.performance.service.PerformanceTestService; import io.metersphere.service.TestResourcePoolService; import io.metersphere.service.TestResourceService; @@ -42,7 +42,7 @@ public abstract class AbstractEngine implements Engine { GC_ALGO = CommonBeanFactory.getBean(JmeterProperties.class).getGcAlgo(); } - protected void initApiConfig(RunRequest runRequest) { + protected void initApiConfig(JmeterRunRequestDTO runRequest) { String resourcePoolId = runRequest.getPoolId(); resourcePool = testResourcePoolService.getResourcePool(resourcePoolId); if (resourcePool == null || StringUtils.equals(resourcePool.getStatus(), ResourceStatusEnum.DELETE.name())) { diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index a1e39f9c1b..3cac4fd4c1 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit a1e39f9c1baf30f52da50ab34ea1bacbfbeff60c +Subproject commit 3cac4fd4c1cb2b3dfb4bd82a6a09cc55ae2f2d34