From 19a0fe3b70a209477e32e1dba4881e4d8350782e Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 12 May 2020 16:03:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E6=94=BE=E5=88=B0=E4=B8=80?= =?UTF-8?q?=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/ext/ExtLoadTestReportMapper.java | 2 +- .../base/mapper/ext/ExtTestCaseMapper.java | 4 ---- .../{report => performance}/base/ChartsData.java | 2 +- .../{report => performance}/base/Errors.java | 2 +- .../{report => performance}/base/ErrorsTop5.java | 2 +- .../base/ReportTimeInfo.java | 2 +- .../{report => performance}/base/Statistics.java | 2 +- .../base/TestOverview.java | 2 +- .../controller/PerformanceReportController.java | 8 ++++---- .../controller/PerformanceTestController.java | 4 ++-- .../controller/request/ReportRequest.java | 2 +- .../{ => performance}/engine/AbstractEngine.java | 4 ++-- .../{ => performance}/engine/Engine.java | 2 +- .../{ => performance}/engine/EngineContext.java | 2 +- .../{ => performance}/engine/EngineFactory.java | 10 +++++----- .../{ => performance}/engine/EngineThread.java | 2 +- .../engine/docker/DockerTestEngine.java | 10 +++++----- .../engine/docker/request/BaseRequest.java | 2 +- .../engine/docker/request/TestRequest.java | 2 +- .../engine/kubernetes/KubernetesTestEngine.java | 16 ++++++++-------- .../crds/MeterSphereCustomResource.java | 2 +- .../crds/MeterSphereCustomResourceDoneable.java | 2 +- .../crds/MeterSphereCustomResourceList.java | 2 +- .../engine/kubernetes/crds/jmeter/Jmeter.java | 4 ++-- .../kubernetes/crds/jmeter/JmeterDoneable.java | 2 +- .../kubernetes/crds/jmeter/JmeterSpec.java | 2 +- .../kubernetes/crds/jmeter/JmeterStatus.java | 2 +- .../provider/AbstractClientProvider.java | 8 ++++---- .../kubernetes/provider/ClientCredential.java | 2 +- .../kubernetes/provider/DockerRegistry.java | 2 +- .../kubernetes/provider/DockerRegistryUtil.java | 2 +- .../kubernetes/provider/KubernetesProvider.java | 2 +- .../parse/EngineSourceParser.java | 4 ++-- .../parse/EngineSourceParserFactory.java | 4 ++-- .../parse/xml/XmlEngineSourceParse.java | 10 +++++----- .../parse/xml/reader/DocumentParser.java | 6 ++---- .../parse/xml/reader/DocumentParserFactory.java | 4 ++-- .../xml/reader/jmx/JmeterDocumentParser.java | 6 +++--- .../service/PerformanceTestService.java | 8 +++++--- .../{ => performance}/service/ReportService.java | 14 ++++++-------- .../io/metersphere/service/ProjectService.java | 1 + .../service/TestResourcePoolService.java | 2 +- 42 files changed, 84 insertions(+), 89 deletions(-) rename backend/src/main/java/io/metersphere/{report => performance}/base/ChartsData.java (95%) rename backend/src/main/java/io/metersphere/{report => performance}/base/Errors.java (82%) rename backend/src/main/java/io/metersphere/{report => performance}/base/ErrorsTop5.java (91%) rename backend/src/main/java/io/metersphere/{report => performance}/base/ReportTimeInfo.java (78%) rename backend/src/main/java/io/metersphere/{report => performance}/base/Statistics.java (90%) rename backend/src/main/java/io/metersphere/{report => performance}/base/TestOverview.java (86%) rename backend/src/main/java/io/metersphere/{ => performance}/controller/PerformanceReportController.java (95%) rename backend/src/main/java/io/metersphere/{ => performance}/controller/PerformanceTestController.java (97%) rename backend/src/main/java/io/metersphere/{ => performance}/controller/request/ReportRequest.java (73%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/AbstractEngine.java (97%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/Engine.java (80%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/EngineContext.java (98%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/EngineFactory.java (95%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/EngineThread.java (96%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/docker/DockerTestEngine.java (93%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/docker/request/BaseRequest.java (77%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/docker/request/TestRequest.java (94%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/KubernetesTestEngine.java (91%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/crds/MeterSphereCustomResource.java (90%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java (85%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/crds/MeterSphereCustomResourceList.java (74%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/crds/jmeter/Jmeter.java (80%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/crds/jmeter/JmeterDoneable.java (82%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/crds/jmeter/JmeterSpec.java (93%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/crds/jmeter/JmeterStatus.java (92%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/provider/AbstractClientProvider.java (97%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/provider/ClientCredential.java (90%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/provider/DockerRegistry.java (93%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/provider/DockerRegistryUtil.java (92%) rename backend/src/main/java/io/metersphere/{ => performance}/engine/kubernetes/provider/KubernetesProvider.java (70%) rename backend/src/main/java/io/metersphere/{ => performance}/parse/EngineSourceParser.java (60%) rename backend/src/main/java/io/metersphere/{ => performance}/parse/EngineSourceParserFactory.java (77%) rename backend/src/main/java/io/metersphere/{ => performance}/parse/xml/XmlEngineSourceParse.java (75%) rename backend/src/main/java/io/metersphere/{ => performance}/parse/xml/reader/DocumentParser.java (55%) rename backend/src/main/java/io/metersphere/{ => performance}/parse/xml/reader/DocumentParserFactory.java (75%) rename backend/src/main/java/io/metersphere/{ => performance}/parse/xml/reader/jmx/JmeterDocumentParser.java (99%) rename backend/src/main/java/io/metersphere/{ => performance}/service/PerformanceTestService.java (98%) rename backend/src/main/java/io/metersphere/{ => performance}/service/ReportService.java (96%) diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java index 541877a15..8393cbe12 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java @@ -1,8 +1,8 @@ package io.metersphere.base.mapper.ext; import io.metersphere.base.domain.LoadTestReport; -import io.metersphere.controller.request.ReportRequest; import io.metersphere.dto.ReportDTO; +import io.metersphere.performance.controller.request.ReportRequest; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java index 9635eb28e..f9c0d46ce 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java @@ -1,12 +1,8 @@ package io.metersphere.base.mapper.ext; import io.metersphere.base.domain.TestCase; -import io.metersphere.controller.request.ReportRequest; import io.metersphere.controller.request.testcase.QueryTestCaseRequest; -import io.metersphere.controller.request.testplancase.QueryTestPlanCaseRequest; -import io.metersphere.dto.ReportDTO; import io.metersphere.dto.TestCaseDTO; -import io.metersphere.dto.TestPlanCaseDTO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/io/metersphere/report/base/ChartsData.java b/backend/src/main/java/io/metersphere/performance/base/ChartsData.java similarity index 95% rename from backend/src/main/java/io/metersphere/report/base/ChartsData.java rename to backend/src/main/java/io/metersphere/performance/base/ChartsData.java index f6450973d..88b53b3ee 100644 --- a/backend/src/main/java/io/metersphere/report/base/ChartsData.java +++ b/backend/src/main/java/io/metersphere/performance/base/ChartsData.java @@ -1,4 +1,4 @@ -package io.metersphere.report.base; +package io.metersphere.performance.base; import lombok.Data; diff --git a/backend/src/main/java/io/metersphere/report/base/Errors.java b/backend/src/main/java/io/metersphere/performance/base/Errors.java similarity index 82% rename from backend/src/main/java/io/metersphere/report/base/Errors.java rename to backend/src/main/java/io/metersphere/performance/base/Errors.java index 41478c1b1..de4300b69 100644 --- a/backend/src/main/java/io/metersphere/report/base/Errors.java +++ b/backend/src/main/java/io/metersphere/performance/base/Errors.java @@ -1,4 +1,4 @@ -package io.metersphere.report.base; +package io.metersphere.performance.base; import lombok.Data; diff --git a/backend/src/main/java/io/metersphere/report/base/ErrorsTop5.java b/backend/src/main/java/io/metersphere/performance/base/ErrorsTop5.java similarity index 91% rename from backend/src/main/java/io/metersphere/report/base/ErrorsTop5.java rename to backend/src/main/java/io/metersphere/performance/base/ErrorsTop5.java index 129529acd..bcdeb4329 100644 --- a/backend/src/main/java/io/metersphere/report/base/ErrorsTop5.java +++ b/backend/src/main/java/io/metersphere/performance/base/ErrorsTop5.java @@ -1,4 +1,4 @@ -package io.metersphere.report.base; +package io.metersphere.performance.base; import lombok.Data; diff --git a/backend/src/main/java/io/metersphere/report/base/ReportTimeInfo.java b/backend/src/main/java/io/metersphere/performance/base/ReportTimeInfo.java similarity index 78% rename from backend/src/main/java/io/metersphere/report/base/ReportTimeInfo.java rename to backend/src/main/java/io/metersphere/performance/base/ReportTimeInfo.java index 72e71cb6a..afa4de1f8 100644 --- a/backend/src/main/java/io/metersphere/report/base/ReportTimeInfo.java +++ b/backend/src/main/java/io/metersphere/performance/base/ReportTimeInfo.java @@ -1,4 +1,4 @@ -package io.metersphere.report.base; +package io.metersphere.performance.base; import lombok.Data; diff --git a/backend/src/main/java/io/metersphere/report/base/Statistics.java b/backend/src/main/java/io/metersphere/performance/base/Statistics.java similarity index 90% rename from backend/src/main/java/io/metersphere/report/base/Statistics.java rename to backend/src/main/java/io/metersphere/performance/base/Statistics.java index 336a9fea1..119e5100c 100644 --- a/backend/src/main/java/io/metersphere/report/base/Statistics.java +++ b/backend/src/main/java/io/metersphere/performance/base/Statistics.java @@ -1,4 +1,4 @@ -package io.metersphere.report.base; +package io.metersphere.performance.base; import lombok.Data; diff --git a/backend/src/main/java/io/metersphere/report/base/TestOverview.java b/backend/src/main/java/io/metersphere/performance/base/TestOverview.java similarity index 86% rename from backend/src/main/java/io/metersphere/report/base/TestOverview.java rename to backend/src/main/java/io/metersphere/performance/base/TestOverview.java index 304ba8744..2cdc23888 100644 --- a/backend/src/main/java/io/metersphere/report/base/TestOverview.java +++ b/backend/src/main/java/io/metersphere/performance/base/TestOverview.java @@ -1,4 +1,4 @@ -package io.metersphere.report.base; +package io.metersphere.performance.base; import lombok.Data; diff --git a/backend/src/main/java/io/metersphere/controller/PerformanceReportController.java b/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java similarity index 95% rename from backend/src/main/java/io/metersphere/controller/PerformanceReportController.java rename to backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java index dbbacda10..0a50a1a85 100644 --- a/backend/src/main/java/io/metersphere/controller/PerformanceReportController.java +++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java @@ -1,4 +1,4 @@ -package io.metersphere.controller; +package io.metersphere.performance.controller; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -6,11 +6,11 @@ import io.metersphere.base.domain.LoadTestReport; import io.metersphere.commons.constants.RoleConstants; import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.Pager; -import io.metersphere.controller.request.ReportRequest; import io.metersphere.dto.LogDetailDTO; import io.metersphere.dto.ReportDTO; -import io.metersphere.report.base.*; -import io.metersphere.service.ReportService; +import io.metersphere.performance.base.*; +import io.metersphere.performance.controller.request.ReportRequest; +import io.metersphere.performance.service.ReportService; import io.metersphere.user.SessionUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresRoles; diff --git a/backend/src/main/java/io/metersphere/controller/PerformanceTestController.java b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java similarity index 97% rename from backend/src/main/java/io/metersphere/controller/PerformanceTestController.java rename to backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java index a046035ed..56e096866 100644 --- a/backend/src/main/java/io/metersphere/controller/PerformanceTestController.java +++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java @@ -1,4 +1,4 @@ -package io.metersphere.controller; +package io.metersphere.performance.controller; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -8,8 +8,8 @@ import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.Pager; import io.metersphere.controller.request.testplan.*; import io.metersphere.dto.LoadTestDTO; +import io.metersphere.performance.service.PerformanceTestService; import io.metersphere.service.FileService; -import io.metersphere.service.PerformanceTestService; import io.metersphere.user.SessionUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresRoles; diff --git a/backend/src/main/java/io/metersphere/controller/request/ReportRequest.java b/backend/src/main/java/io/metersphere/performance/controller/request/ReportRequest.java similarity index 73% rename from backend/src/main/java/io/metersphere/controller/request/ReportRequest.java rename to backend/src/main/java/io/metersphere/performance/controller/request/ReportRequest.java index 2169c3172..f5c8cf659 100644 --- a/backend/src/main/java/io/metersphere/controller/request/ReportRequest.java +++ b/backend/src/main/java/io/metersphere/performance/controller/request/ReportRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.controller.request; +package io.metersphere.performance.controller.request; import lombok.Getter; import lombok.Setter; diff --git a/backend/src/main/java/io/metersphere/engine/AbstractEngine.java b/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java similarity index 97% rename from backend/src/main/java/io/metersphere/engine/AbstractEngine.java rename to backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java index c7e07b5d9..be4819486 100644 --- a/backend/src/main/java/io/metersphere/engine/AbstractEngine.java +++ b/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java @@ -1,4 +1,4 @@ -package io.metersphere.engine; +package io.metersphere.performance.engine; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -11,7 +11,7 @@ import io.metersphere.commons.constants.ResourcePoolTypeEnum; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.config.JmeterProperties; -import io.metersphere.service.PerformanceTestService; +import io.metersphere.performance.service.PerformanceTestService; import io.metersphere.service.TestResourcePoolService; import io.metersphere.service.TestResourceService; import org.apache.commons.collections.CollectionUtils; diff --git a/backend/src/main/java/io/metersphere/engine/Engine.java b/backend/src/main/java/io/metersphere/performance/engine/Engine.java similarity index 80% rename from backend/src/main/java/io/metersphere/engine/Engine.java rename to backend/src/main/java/io/metersphere/performance/engine/Engine.java index a7bb071a3..6394f9d41 100644 --- a/backend/src/main/java/io/metersphere/engine/Engine.java +++ b/backend/src/main/java/io/metersphere/performance/engine/Engine.java @@ -1,4 +1,4 @@ -package io.metersphere.engine; +package io.metersphere.performance.engine; import java.util.Map; diff --git a/backend/src/main/java/io/metersphere/engine/EngineContext.java b/backend/src/main/java/io/metersphere/performance/engine/EngineContext.java similarity index 98% rename from backend/src/main/java/io/metersphere/engine/EngineContext.java rename to backend/src/main/java/io/metersphere/performance/engine/EngineContext.java index f3eac08cd..e140ab4dc 100644 --- a/backend/src/main/java/io/metersphere/engine/EngineContext.java +++ b/backend/src/main/java/io/metersphere/performance/engine/EngineContext.java @@ -1,4 +1,4 @@ -package io.metersphere.engine; +package io.metersphere.performance.engine; import java.util.HashMap; import java.util.Map; diff --git a/backend/src/main/java/io/metersphere/engine/EngineFactory.java b/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java similarity index 95% rename from backend/src/main/java/io/metersphere/engine/EngineFactory.java rename to backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java index 909bc9580..01b3eeff4 100644 --- a/backend/src/main/java/io/metersphere/engine/EngineFactory.java +++ b/backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java @@ -1,4 +1,4 @@ -package io.metersphere.engine; +package io.metersphere.performance.engine; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -10,11 +10,11 @@ import io.metersphere.commons.constants.FileType; import io.metersphere.commons.constants.ResourcePoolTypeEnum; import io.metersphere.commons.exception.MSException; import io.metersphere.config.KafkaProperties; -import io.metersphere.engine.docker.DockerTestEngine; -import io.metersphere.engine.kubernetes.KubernetesTestEngine; import io.metersphere.i18n.Translator; -import io.metersphere.parse.EngineSourceParser; -import io.metersphere.parse.EngineSourceParserFactory; +import io.metersphere.performance.engine.docker.DockerTestEngine; +import io.metersphere.performance.engine.kubernetes.KubernetesTestEngine; +import io.metersphere.performance.parse.EngineSourceParser; +import io.metersphere.performance.parse.EngineSourceParserFactory; import io.metersphere.service.FileService; import io.metersphere.service.TestResourcePoolService; import org.apache.commons.collections.CollectionUtils; diff --git a/backend/src/main/java/io/metersphere/engine/EngineThread.java b/backend/src/main/java/io/metersphere/performance/engine/EngineThread.java similarity index 96% rename from backend/src/main/java/io/metersphere/engine/EngineThread.java rename to backend/src/main/java/io/metersphere/performance/engine/EngineThread.java index c37ed127f..e00c9b135 100644 --- a/backend/src/main/java/io/metersphere/engine/EngineThread.java +++ b/backend/src/main/java/io/metersphere/performance/engine/EngineThread.java @@ -1,4 +1,4 @@ -package io.metersphere.engine; +package io.metersphere.performance.engine; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java similarity index 93% rename from backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java rename to backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java index a998e6ffb..0f09c8501 100644 --- a/backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java +++ b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.docker; +package io.metersphere.performance.engine.docker; import com.alibaba.fastjson.JSON; import io.metersphere.base.domain.LoadTestWithBLOBs; @@ -7,11 +7,11 @@ import io.metersphere.commons.constants.ResourceStatusEnum; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.dto.NodeDTO; -import io.metersphere.engine.AbstractEngine; -import io.metersphere.engine.EngineContext; -import io.metersphere.engine.EngineFactory; -import io.metersphere.engine.docker.request.TestRequest; import io.metersphere.i18n.Translator; +import io.metersphere.performance.engine.AbstractEngine; +import io.metersphere.performance.engine.EngineContext; +import io.metersphere.performance.engine.EngineFactory; +import io.metersphere.performance.engine.docker.request.TestRequest; import org.springframework.web.client.RestTemplate; import java.util.HashMap; diff --git a/backend/src/main/java/io/metersphere/engine/docker/request/BaseRequest.java b/backend/src/main/java/io/metersphere/performance/engine/docker/request/BaseRequest.java similarity index 77% rename from backend/src/main/java/io/metersphere/engine/docker/request/BaseRequest.java rename to backend/src/main/java/io/metersphere/performance/engine/docker/request/BaseRequest.java index 9f7de0c36..f0e167068 100644 --- a/backend/src/main/java/io/metersphere/engine/docker/request/BaseRequest.java +++ b/backend/src/main/java/io/metersphere/performance/engine/docker/request/BaseRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.docker.request; +package io.metersphere.performance.engine.docker.request; public class BaseRequest { private String testId; diff --git a/backend/src/main/java/io/metersphere/engine/docker/request/TestRequest.java b/backend/src/main/java/io/metersphere/performance/engine/docker/request/TestRequest.java similarity index 94% rename from backend/src/main/java/io/metersphere/engine/docker/request/TestRequest.java rename to backend/src/main/java/io/metersphere/performance/engine/docker/request/TestRequest.java index 0cdd97f42..8cc6f8ab7 100644 --- a/backend/src/main/java/io/metersphere/engine/docker/request/TestRequest.java +++ b/backend/src/main/java/io/metersphere/performance/engine/docker/request/TestRequest.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.docker.request; +package io.metersphere.performance.engine.docker.request; import java.util.HashMap; import java.util.Map; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/KubernetesTestEngine.java similarity index 91% rename from backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/KubernetesTestEngine.java index bdd60a871..63fee0f0e 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/KubernetesTestEngine.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes; +package io.metersphere.performance.engine.kubernetes; import com.alibaba.fastjson.JSON; import io.fabric8.kubernetes.api.model.ConfigMap; @@ -8,14 +8,14 @@ import io.metersphere.base.domain.LoadTestWithBLOBs; import io.metersphere.commons.constants.FileType; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.LogUtil; -import io.metersphere.engine.AbstractEngine; -import io.metersphere.engine.EngineContext; -import io.metersphere.engine.EngineFactory; -import io.metersphere.engine.kubernetes.crds.jmeter.Jmeter; -import io.metersphere.engine.kubernetes.crds.jmeter.JmeterSpec; -import io.metersphere.engine.kubernetes.provider.ClientCredential; -import io.metersphere.engine.kubernetes.provider.KubernetesProvider; import io.metersphere.i18n.Translator; +import io.metersphere.performance.engine.AbstractEngine; +import io.metersphere.performance.engine.EngineContext; +import io.metersphere.performance.engine.EngineFactory; +import io.metersphere.performance.engine.kubernetes.crds.jmeter.Jmeter; +import io.metersphere.performance.engine.kubernetes.crds.jmeter.JmeterSpec; +import io.metersphere.performance.engine.kubernetes.provider.ClientCredential; +import io.metersphere.performance.engine.kubernetes.provider.KubernetesProvider; import org.apache.commons.collections.MapUtils; import java.util.HashMap; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResource.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResource.java similarity index 90% rename from backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResource.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResource.java index 91a0dce6a..d0eed411c 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResource.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResource.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.crds; +package io.metersphere.performance.engine.kubernetes.crds; import io.fabric8.kubernetes.client.CustomResource; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java similarity index 85% rename from backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java index f3075fa69..a0aae5efa 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.crds; +package io.metersphere.performance.engine.kubernetes.crds; import io.fabric8.kubernetes.api.builder.Function; import io.fabric8.kubernetes.client.CustomResourceDoneable; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResourceList.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResourceList.java similarity index 74% rename from backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResourceList.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResourceList.java index 086cf9e1b..73b0d494c 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResourceList.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResourceList.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.crds; +package io.metersphere.performance.engine.kubernetes.crds; import io.fabric8.kubernetes.client.CustomResourceList; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/Jmeter.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/Jmeter.java similarity index 80% rename from backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/Jmeter.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/Jmeter.java index 0727157ec..91ce1804e 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/Jmeter.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/Jmeter.java @@ -1,6 +1,6 @@ -package io.metersphere.engine.kubernetes.crds.jmeter; +package io.metersphere.performance.engine.kubernetes.crds.jmeter; -import io.metersphere.engine.kubernetes.crds.MeterSphereCustomResource; +import io.metersphere.performance.engine.kubernetes.crds.MeterSphereCustomResource; public class Jmeter extends MeterSphereCustomResource { public static final String CRD = "jmeters.metersphere.io"; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterDoneable.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterDoneable.java similarity index 82% rename from backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterDoneable.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterDoneable.java index 42acb26ae..ec8b80d74 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterDoneable.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterDoneable.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.crds.jmeter; +package io.metersphere.performance.engine.kubernetes.crds.jmeter; import io.fabric8.kubernetes.api.builder.Function; import io.fabric8.kubernetes.client.CustomResourceDoneable; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterSpec.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterSpec.java similarity index 93% rename from backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterSpec.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterSpec.java index 9ed26694e..6603e0257 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterSpec.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterSpec.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.crds.jmeter; +package io.metersphere.performance.engine.kubernetes.crds.jmeter; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterStatus.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterStatus.java similarity index 92% rename from backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterStatus.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterStatus.java index 9b24290bf..8132f1781 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterStatus.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterStatus.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.crds.jmeter; +package io.metersphere.performance.engine.kubernetes.crds.jmeter; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/AbstractClientProvider.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/AbstractClientProvider.java similarity index 97% rename from backend/src/main/java/io/metersphere/engine/kubernetes/provider/AbstractClientProvider.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/AbstractClientProvider.java index ba65cd2cb..4add6c111 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/AbstractClientProvider.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/AbstractClientProvider.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.provider; +package io.metersphere.performance.engine.kubernetes.provider; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; @@ -8,9 +8,9 @@ import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.*; -import io.metersphere.engine.kubernetes.crds.MeterSphereCustomResource; -import io.metersphere.engine.kubernetes.crds.MeterSphereCustomResourceDoneable; -import io.metersphere.engine.kubernetes.crds.MeterSphereCustomResourceList; +import io.metersphere.performance.engine.kubernetes.crds.MeterSphereCustomResource; +import io.metersphere.performance.engine.kubernetes.crds.MeterSphereCustomResourceDoneable; +import io.metersphere.performance.engine.kubernetes.crds.MeterSphereCustomResourceList; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/ClientCredential.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/ClientCredential.java similarity index 90% rename from backend/src/main/java/io/metersphere/engine/kubernetes/provider/ClientCredential.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/ClientCredential.java index 8a509a521..0da95ac90 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/ClientCredential.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/ClientCredential.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.provider; +package io.metersphere.performance.engine.kubernetes.provider; public class ClientCredential { diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/DockerRegistry.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/DockerRegistry.java similarity index 93% rename from backend/src/main/java/io/metersphere/engine/kubernetes/provider/DockerRegistry.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/DockerRegistry.java index 344afdbba..301835fb4 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/DockerRegistry.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/DockerRegistry.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.provider; +package io.metersphere.performance.engine.kubernetes.provider; public class DockerRegistry { diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/DockerRegistryUtil.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/DockerRegistryUtil.java similarity index 92% rename from backend/src/main/java/io/metersphere/engine/kubernetes/provider/DockerRegistryUtil.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/DockerRegistryUtil.java index 11340e7f2..f11512537 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/DockerRegistryUtil.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/DockerRegistryUtil.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.provider; +package io.metersphere.performance.engine.kubernetes.provider; import com.alibaba.fastjson.JSONObject; diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/KubernetesProvider.java b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/KubernetesProvider.java similarity index 70% rename from backend/src/main/java/io/metersphere/engine/kubernetes/provider/KubernetesProvider.java rename to backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/KubernetesProvider.java index 26a41c29a..c7b645020 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/provider/KubernetesProvider.java +++ b/backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/KubernetesProvider.java @@ -1,4 +1,4 @@ -package io.metersphere.engine.kubernetes.provider; +package io.metersphere.performance.engine.kubernetes.provider; public class KubernetesProvider extends AbstractClientProvider { public KubernetesProvider(String credential) { diff --git a/backend/src/main/java/io/metersphere/parse/EngineSourceParser.java b/backend/src/main/java/io/metersphere/performance/parse/EngineSourceParser.java similarity index 60% rename from backend/src/main/java/io/metersphere/parse/EngineSourceParser.java rename to backend/src/main/java/io/metersphere/performance/parse/EngineSourceParser.java index 25de3624d..803514581 100644 --- a/backend/src/main/java/io/metersphere/parse/EngineSourceParser.java +++ b/backend/src/main/java/io/metersphere/performance/parse/EngineSourceParser.java @@ -1,6 +1,6 @@ -package io.metersphere.parse; +package io.metersphere.performance.parse; -import io.metersphere.engine.EngineContext; +import io.metersphere.performance.engine.EngineContext; import java.io.InputStream; diff --git a/backend/src/main/java/io/metersphere/parse/EngineSourceParserFactory.java b/backend/src/main/java/io/metersphere/performance/parse/EngineSourceParserFactory.java similarity index 77% rename from backend/src/main/java/io/metersphere/parse/EngineSourceParserFactory.java rename to backend/src/main/java/io/metersphere/performance/parse/EngineSourceParserFactory.java index 6659d8d17..e2e54994d 100644 --- a/backend/src/main/java/io/metersphere/parse/EngineSourceParserFactory.java +++ b/backend/src/main/java/io/metersphere/performance/parse/EngineSourceParserFactory.java @@ -1,7 +1,7 @@ -package io.metersphere.parse; +package io.metersphere.performance.parse; import io.metersphere.commons.constants.FileType; -import io.metersphere.parse.xml.XmlEngineSourceParse; +import io.metersphere.performance.parse.xml.XmlEngineSourceParse; public class EngineSourceParserFactory { public static EngineSourceParser createEngineSourceParser(String type) { diff --git a/backend/src/main/java/io/metersphere/parse/xml/XmlEngineSourceParse.java b/backend/src/main/java/io/metersphere/performance/parse/xml/XmlEngineSourceParse.java similarity index 75% rename from backend/src/main/java/io/metersphere/parse/xml/XmlEngineSourceParse.java rename to backend/src/main/java/io/metersphere/performance/parse/xml/XmlEngineSourceParse.java index db8dfe02a..3723b4543 100644 --- a/backend/src/main/java/io/metersphere/parse/xml/XmlEngineSourceParse.java +++ b/backend/src/main/java/io/metersphere/performance/parse/xml/XmlEngineSourceParse.java @@ -1,9 +1,9 @@ -package io.metersphere.parse.xml; +package io.metersphere.performance.parse.xml; -import io.metersphere.engine.EngineContext; -import io.metersphere.parse.EngineSourceParser; -import io.metersphere.parse.xml.reader.DocumentParser; -import io.metersphere.parse.xml.reader.DocumentParserFactory; +import io.metersphere.performance.engine.EngineContext; +import io.metersphere.performance.parse.EngineSourceParser; +import io.metersphere.performance.parse.xml.reader.DocumentParser; +import io.metersphere.performance.parse.xml.reader.DocumentParserFactory; import org.w3c.dom.Document; import org.xml.sax.InputSource; diff --git a/backend/src/main/java/io/metersphere/parse/xml/reader/DocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/DocumentParser.java similarity index 55% rename from backend/src/main/java/io/metersphere/parse/xml/reader/DocumentParser.java rename to backend/src/main/java/io/metersphere/performance/parse/xml/reader/DocumentParser.java index 2ab6f67a7..34c8be44f 100644 --- a/backend/src/main/java/io/metersphere/parse/xml/reader/DocumentParser.java +++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/DocumentParser.java @@ -1,10 +1,8 @@ -package io.metersphere.parse.xml.reader; +package io.metersphere.performance.parse.xml.reader; -import io.metersphere.engine.EngineContext; +import io.metersphere.performance.engine.EngineContext; import org.w3c.dom.Document; -import java.io.InputStream; - public interface DocumentParser { String parse(EngineContext context, Document document) throws Exception; } diff --git a/backend/src/main/java/io/metersphere/parse/xml/reader/DocumentParserFactory.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/DocumentParserFactory.java similarity index 75% rename from backend/src/main/java/io/metersphere/parse/xml/reader/DocumentParserFactory.java rename to backend/src/main/java/io/metersphere/performance/parse/xml/reader/DocumentParserFactory.java index d5772d174..dc3e8ee20 100644 --- a/backend/src/main/java/io/metersphere/parse/xml/reader/DocumentParserFactory.java +++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/DocumentParserFactory.java @@ -1,7 +1,7 @@ -package io.metersphere.parse.xml.reader; +package io.metersphere.performance.parse.xml.reader; import io.metersphere.commons.constants.FileType; -import io.metersphere.parse.xml.reader.jmx.JmeterDocumentParser; +import io.metersphere.performance.parse.xml.reader.jmx.JmeterDocumentParser; public class DocumentParserFactory { public static DocumentParser createDocumentParser(String type) { diff --git a/backend/src/main/java/io/metersphere/parse/xml/reader/jmx/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java similarity index 99% rename from backend/src/main/java/io/metersphere/parse/xml/reader/jmx/JmeterDocumentParser.java rename to backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java index 1e2b2dc2c..40efd5fff 100644 --- a/backend/src/main/java/io/metersphere/parse/xml/reader/jmx/JmeterDocumentParser.java +++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java @@ -1,11 +1,11 @@ -package io.metersphere.parse.xml.reader.jmx; +package io.metersphere.performance.parse.xml.reader.jmx; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.config.KafkaProperties; -import io.metersphere.engine.EngineContext; -import io.metersphere.parse.xml.reader.DocumentParser; +import io.metersphere.performance.engine.EngineContext; +import io.metersphere.performance.parse.xml.reader.DocumentParser; import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/backend/src/main/java/io/metersphere/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java similarity index 98% rename from backend/src/main/java/io/metersphere/service/PerformanceTestService.java rename to backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java index 8496274ee..707f26398 100644 --- a/backend/src/main/java/io/metersphere/service/PerformanceTestService.java +++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java @@ -1,4 +1,4 @@ -package io.metersphere.service; +package io.metersphere.performance.service; import io.metersphere.base.domain.*; import io.metersphere.base.mapper.*; @@ -10,9 +10,11 @@ import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.LogUtil; import io.metersphere.controller.request.testplan.*; import io.metersphere.dto.LoadTestDTO; -import io.metersphere.engine.Engine; -import io.metersphere.engine.EngineFactory; import io.metersphere.i18n.Translator; +import io.metersphere.performance.engine.Engine; +import io.metersphere.performance.engine.EngineFactory; +import io.metersphere.service.FileService; +import io.metersphere.service.TestResourceService; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/io/metersphere/service/ReportService.java b/backend/src/main/java/io/metersphere/performance/service/ReportService.java similarity index 96% rename from backend/src/main/java/io/metersphere/service/ReportService.java rename to backend/src/main/java/io/metersphere/performance/service/ReportService.java index a8265df60..95eaa13bd 100644 --- a/backend/src/main/java/io/metersphere/service/ReportService.java +++ b/backend/src/main/java/io/metersphere/performance/service/ReportService.java @@ -1,4 +1,4 @@ -package io.metersphere.service; +package io.metersphere.performance.service; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -12,21 +12,19 @@ import io.metersphere.commons.constants.PerformanceTestStatus; import io.metersphere.commons.constants.ReportKeys; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.LogUtil; -import io.metersphere.controller.request.ReportRequest; import io.metersphere.dto.LogDetailDTO; import io.metersphere.dto.ReportDTO; -import io.metersphere.engine.Engine; -import io.metersphere.engine.EngineFactory; -import io.metersphere.report.base.*; +import io.metersphere.performance.base.*; +import io.metersphere.performance.controller.request.ReportRequest; +import io.metersphere.performance.engine.Engine; +import io.metersphere.performance.engine.EngineFactory; +import io.metersphere.service.TestResourceService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java index 4dc397a05..bba9dc89e 100644 --- a/backend/src/main/java/io/metersphere/service/ProjectService.java +++ b/backend/src/main/java/io/metersphere/service/ProjectService.java @@ -12,6 +12,7 @@ import io.metersphere.controller.request.ProjectRequest; import io.metersphere.controller.request.testplan.DeleteTestPlanRequest; import io.metersphere.dto.ProjectDTO; import io.metersphere.i18n.Translator; +import io.metersphere.performance.service.PerformanceTestService; import io.metersphere.user.SessionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java index 0be3736ad..1055347a6 100644 --- a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java +++ b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java @@ -14,8 +14,8 @@ import io.metersphere.commons.utils.LogUtil; import io.metersphere.controller.request.resourcepool.QueryResourcePoolRequest; import io.metersphere.dto.NodeDTO; import io.metersphere.dto.TestResourcePoolDTO; -import io.metersphere.engine.kubernetes.provider.KubernetesProvider; import io.metersphere.i18n.Translator; +import io.metersphere.performance.engine.kubernetes.provider.KubernetesProvider; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -- GitLab