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 541877a15ba748e0108a0ccbbbccfaf89652c88a..8393cbe12ace091c256ce558457b706aca91f9e2 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 9635eb28efd16be79f8635f08f3abe17d4cd4349..f9c0d46ce7117c7ec2a397b662376ccd73a3342b 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 f6450973d527a7b90897ca625b1c5e796b4f1bd9..88b53b3eed78102dd7cb652bcd12ff6c6ba3beb2 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 41478c1b1ecf73ba571e8f5ca8fa768b8300c56a..de4300b698f7530436b3e06e421da8d849921f55 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 129529acd67555918bf4e91aaef3c19ab2112be3..bcdeb4329454d3c8c228229d6a10aabd67111384 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 72e71cb6a6ca81fe60188d7d1dc715b12757fca3..afa4de1f8f6fe2892041c3bcc3af4a581f508e61 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 336a9fea14d6887423172e2b6887cb115077c66e..119e5100c7ac86ca22f9efe833330fd86683265a 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 304ba87443de27eccecf5a1bb7ba1e6ce72caa4c..2cdc238888c5782d0d66dba6cf1f5e8a21ace24e 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 dbbacda10cbb8f7adb70cc3c396f05ee01b0f323..0a50a1a855fbb35be967d914734c506a39204f18 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 a046035ed05b6274fc76dbef1b6bc482acd27686..56e0968664fc53846b9ac96a22a9b24ede21ba35 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 2169c317263f8005cec72aec38cf7ba762764809..f5c8cf6596ffb2d0ed33268048d2fa7ae755bea9 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 c7e07b5d901ef02c7ca3f081ba234609457b3ae2..be48194868a1e3d92248698592b3523be3b97cb2 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 a7bb071a31925c2bceaf7f1401fef6c9f4f2d961..6394f9d4108e7a27c2171a4589c6d38e14ecca04 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 f3eac08cd93518e064ab00d7a7346f361a19d500..e140ab4dc53591e3909caf6e7f3431613a5a093b 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 909bc9580914bc3c6b80676a0db3948e1d54d083..01b3eeff487072bf1a78a518ab36bd70afca3bcf 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 c37ed127f84e597165c9f9d89ed8f7d17049801d..e00c9b1354c93f91acc96c5250a878fc192b5781 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 a998e6ffbd7c82304228dc99b058119086b3f84b..0f09c8501eacaa644537d594d2aab50a855d5889 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 9f7de0c369d2faf9ba212a921063884529627eff..f0e1670684d3567a1300427c30474fde0191fa51 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 0cdd97f42ad38310d16b025ef78e0d8d13454427..8cc6f8ab7e3bb155429059263efd06802ed30d1d 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 bdd60a871e50bc1616b8e23b52d5a49a4d1a537a..63fee0f0ecdd9157e6065e739b7d3e187445f420 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 91a0dce6a277d2244562e1e7656b5f3aad90718d..d0eed411c264111702eb37e18b4dd0015a689468 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 f3075fa6951ab23dce30c4409074b97e7cb21ca4..a0aae5efa73cd9510c1c04bd5843939b1bbf6528 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 086cf9e1b6c35bf73640b7419fe3f8477f38097a..73b0d494c5e27456aa487792095fa3c20b3b9ee1 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 0727157ecc5b557ab7829132b42d59f9bc6666c2..91ce1804ecf010dbe61d79b277229b6082258c1f 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 42acb26aef53967ba3706c4f517f01632ef95ed7..ec8b80d742abb88e2b0b7f0b0f318d4321c0aff8 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 9ed26694e009b9fca5ffe556fe49325c1f57e2ce..6603e0257b491bcca9316d8b0d3dae40d88e3c99 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 9b24290bf79da962c4e005f818f4f83906c4a05c..8132f1781af89bd6a733228a31b935058ef6369b 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 ba65cd2cb5934bd66715c325409c84c53bba1618..4add6c111c58a7d197a0a712e73501e8a0d64aba 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 8a509a5214f987ab66cb9da2b9288b2cb8e9e76e..0da95ac90909ff2f58b1c4434ca0f1ef74042a4c 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 344afdbbac09d798ffc129d0b0caa567dfe6da42..301835fb4d8eafffe140489a1d0c3a3e156dbdc7 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 11340e7f2f28bd7789a7b51ea1653bad04c73237..f11512537a0c0d9778f5bace2cd143ac8ecfcd0d 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 26a41c29a44f857bbb82f4bce0a4c1b55eb870fd..c7b645020d4ed7da3967c35bb6fc1343b027be62 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 25de3624d2995398b06e624ab5a99eb6b7793737..8035145812e9448d7d2f396e546592f3da749002 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 6659d8d17d7b91ab988cf76a4e37feb9bb7d2953..e2e54994d2f8947cac249eac74e8f76754c96950 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 db8dfe02ae87a37054e59772675a15ae1d47b1c9..3723b454332e791964739c1b2725cf8b988f652b 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 2ab6f67a727135fcc21120f97be5daa3de3a9635..34c8be44f22b133bd35b64abb897351678b09894 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 d5772d174a800fbf65952564df36862a3ad073c7..dc3e8ee20bc090945b7cba870f672b5652e5f447 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 1e2b2dc2c3aa80b1324389c1e1ccf04b1376fcce..40efd5fffd7ecb93a31676549d683ec84c06763a 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 8496274ee1426e120405641764717ebd71494b3b..707f26398be76931ed5b12c4ccdf19e9526b1afc 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 a8265df607f935aa8d7c071a494b1d390c618827..95eaa13bd90985e7f492fb10e00079dbeec5f0b0 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 4dc397a05d76b9e49defa21de35e57b0b89383c8..bba9dc89e88a8cb4698b85d6eb2e62401c70bd20 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 0be3736ad57809f5102dd890a0723fe3cedcbbe8..1055347a62dae52ed46d0b0c73d9ff86e4f137f2 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;