feat(性能测试): request 包名修改

backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.java

@@ -3,7 +3,7 @@ package io.metersphere.base.mapper.ext;
 import io.metersphere.base.domain.LoadTest;
 import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.performance.dto.LoadTestFileDTO;
-import io.metersphere.track.request.testplan.QueryTestPlanRequest;
+import io.metersphere.performance.request.QueryTestPlanRequest;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

backend/src/main/java/io/metersphere/job/sechedule/PerformanceTestJob.java

@@ -3,8 +3,8 @@ package io.metersphere.job.sechedule;
 import io.metersphere.commons.constants.ReportTriggerMode;
 import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.performance.request.RunTestPlanRequest;
 import io.metersphere.performance.service.PerformanceTestService;
-import io.metersphere.track.request.testplan.RunTestPlanRequest;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobKey;
 import org.quartz.TriggerKey;

backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java

@@ -1,23 +1,11 @@
 package io.metersphere.job.sechedule;
 
-import io.metersphere.api.dto.automation.ExecuteType;
-import io.metersphere.api.dto.automation.SchedulePlanScenarioExecuteRequest;
-import io.metersphere.api.service.ApiTestCaseService;
-import io.metersphere.base.domain.*;
-import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.ReportTriggerMode;
 import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.commons.utils.CommonBeanFactory;
-import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.performance.service.PerformanceTestService;
-import io.metersphere.track.dto.TestPlanLoadCaseDTO;
-import io.metersphere.track.request.testplan.LoadCaseRequest;
-import io.metersphere.track.request.testplan.RunTestPlanRequest;
-import io.metersphere.track.service.*;
+import io.metersphere.track.service.TestPlanService;
 import org.quartz.*;
 
-import java.util.*;
-
 /**
  * 情景测试Job
  *

backend/src/main/java/io/metersphere/notice/service/ApiAndPerformanceHelper.java

@@ -10,8 +10,8 @@ import io.metersphere.base.mapper.ext.ExtApiTestReportMapper;
 import io.metersphere.base.mapper.ext.ExtLoadTestMapper;
 import io.metersphere.commons.constants.ScheduleGroup;
 import io.metersphere.dto.LoadTestDTO;
+import io.metersphere.performance.request.QueryTestPlanRequest;
 import io.metersphere.service.ScheduleService;
-import io.metersphere.track.request.testplan.QueryTestPlanRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 

backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java

@@ -15,10 +15,11 @@ import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.dto.ScheduleDao;
 import io.metersphere.performance.dto.LoadTestExportJmx;
 import io.metersphere.performance.dto.LoadTestFileDTO;
+import io.metersphere.performance.request.*;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.service.CheckPermissionService;
 import io.metersphere.service.FileService;
-import io.metersphere.track.request.testplan.*;
+import io.metersphere.track.request.testplan.FileOperationRequest;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.http.HttpHeaders;

backend/src/main/java/io/metersphere/performance/request/DeleteTestPlanRequest.java

@@ -1,4 +1,4 @@
-package io.metersphere.track.request.testplan;
+package io.metersphere.performance.request;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/metersphere/performance/request/EditTestPlanRequest.java

@@ -1,4 +1,4 @@
-package io.metersphere.track.request.testplan;
+package io.metersphere.performance.request;
 
 import io.metersphere.base.domain.FileMetadata;
 import lombok.Getter;

backend/src/main/java/io/metersphere/performance/request/QueryTestPlanRequest.java

@@ -1,4 +1,4 @@
-package io.metersphere.track.request.testplan;
+package io.metersphere.performance.request;
 
 import io.metersphere.controller.request.OrderRequest;
 import lombok.Getter;

backend/src/main/java/io/metersphere/performance/request/RunTestPlanRequest.java

@@ -1,4 +1,4 @@
-package io.metersphere.track.request.testplan;
+package io.metersphere.performance.request;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/metersphere/performance/request/SaveTestPlanRequest.java

@@ -1,4 +1,4 @@
-package io.metersphere.track.request.testplan;
+package io.metersphere.performance.request;
 
 import io.metersphere.base.domain.FileMetadata;
 import lombok.Getter;
@@ -10,5 +10,4 @@ import java.util.List;
 @Getter
 public class SaveTestPlanRequest extends TestPlanRequest {
     private List<FileMetadata> updatedFileList;
-
 }

backend/src/main/java/io/metersphere/performance/request/TestPlanRequest.java

@@ -1,4 +1,4 @@
-package io.metersphere.track.request.testplan;
+package io.metersphere.performance.request;
 
 import io.metersphere.base.domain.Schedule;
 import lombok.Getter;

backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java

@@ -24,10 +24,10 @@ import io.metersphere.performance.dto.LoadTestFileDTO;
 import io.metersphere.performance.engine.Engine;
 import io.metersphere.performance.engine.EngineFactory;
 import io.metersphere.performance.engine.producer.LoadTestProducer;
+import io.metersphere.performance.request.*;
 import io.metersphere.service.FileService;
 import io.metersphere.service.QuotaService;
 import io.metersphere.service.ScheduleService;
-import io.metersphere.track.request.testplan.*;
 import io.metersphere.track.service.TestCaseService;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;

backend/src/main/java/io/metersphere/service/ProjectService.java

@@ -16,8 +16,8 @@ import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.ProjectRequest;
 import io.metersphere.dto.ProjectDTO;
 import io.metersphere.i18n.Translator;
+import io.metersphere.performance.request.DeleteTestPlanRequest;
 import io.metersphere.performance.service.PerformanceTestService;
-import io.metersphere.track.request.testplan.DeleteTestPlanRequest;
 import io.metersphere.track.service.TestCaseService;
 import io.metersphere.track.service.TestPlanProjectService;
 import io.metersphere.track.service.TestPlanService;

backend/src/main/java/io/metersphere/service/QuotaService.java

@@ -1,6 +1,7 @@
 package io.metersphere.service;
 
-import io.metersphere.track.request.testplan.TestPlanRequest;
+
+import io.metersphere.performance.request.TestPlanRequest;
 
 import java.util.Set;
 

backend/src/main/java/io/metersphere/track/controller/TestPlanLoadCaseController.java

@@ -6,12 +6,13 @@ import io.metersphere.base.domain.LoadTest;
 import io.metersphere.base.domain.TestPlanLoadCase;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.performance.request.RunTestPlanRequest;
 import io.metersphere.track.dto.TestPlanLoadCaseDTO;
 import io.metersphere.track.request.testplan.LoadCaseReportRequest;
 import io.metersphere.track.request.testplan.LoadCaseRequest;
-import io.metersphere.track.request.testplan.RunTestPlanRequest;
 import io.metersphere.track.service.TestPlanLoadCaseService;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.List;
 

backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java

@@ -6,11 +6,11 @@ import io.metersphere.base.mapper.LoadTestReportMapper;
 import io.metersphere.base.mapper.TestPlanLoadCaseMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanLoadCaseMapper;
 import io.metersphere.controller.request.OrderRequest;
+import io.metersphere.performance.request.RunTestPlanRequest;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.track.dto.TestPlanLoadCaseDTO;
 import io.metersphere.track.request.testplan.LoadCaseReportRequest;
 import io.metersphere.track.request.testplan.LoadCaseRequest;
-import io.metersphere.track.request.testplan.RunTestPlanRequest;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;

backend/src/main/java/io/metersphere/track/service/TestPlanService.java

@@ -26,6 +26,7 @@ import io.metersphere.dto.BaseSystemConfigDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.service.NoticeSendService;
+import io.metersphere.performance.request.RunTestPlanRequest;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.service.ScheduleService;
 import io.metersphere.service.SystemParameterService;
@@ -36,7 +37,6 @@ import io.metersphere.track.request.testcase.PlanCaseRelevanceRequest;
 import io.metersphere.track.request.testcase.QueryTestPlanRequest;
 import io.metersphere.track.request.testplan.AddTestPlanRequest;
 import io.metersphere.track.request.testplan.LoadCaseRequest;
-import io.metersphere.track.request.testplan.RunTestPlanRequest;
 import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit e6af25ffb8cabdfc2de5ae07cb04492cc78345f3
+Subproject commit fb5ecdccbb0102d365a80d7ed294801b9340afc5