Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
19a0fe3b
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
19a0fe3b
编写于
5月 12, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
代码结构调整,性能测试的相关代码放到一起
上级
94556d66
变更
42
隐藏空白更改
内联
并排
Showing
42 changed file
with
84 addition
and
89 deletion
+84
-89
backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java
.../metersphere/base/mapper/ext/ExtLoadTestReportMapper.java
+1
-1
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
...ava/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
+0
-4
backend/src/main/java/io/metersphere/performance/base/ChartsData.java
...main/java/io/metersphere/performance/base/ChartsData.java
+1
-1
backend/src/main/java/io/metersphere/performance/base/Errors.java
...src/main/java/io/metersphere/performance/base/Errors.java
+1
-1
backend/src/main/java/io/metersphere/performance/base/ErrorsTop5.java
...main/java/io/metersphere/performance/base/ErrorsTop5.java
+1
-1
backend/src/main/java/io/metersphere/performance/base/ReportTimeInfo.java
.../java/io/metersphere/performance/base/ReportTimeInfo.java
+1
-1
backend/src/main/java/io/metersphere/performance/base/Statistics.java
...main/java/io/metersphere/performance/base/Statistics.java
+1
-1
backend/src/main/java/io/metersphere/performance/base/TestOverview.java
...in/java/io/metersphere/performance/base/TestOverview.java
+1
-1
backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
...e/performance/controller/PerformanceReportController.java
+4
-4
backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
...ere/performance/controller/PerformanceTestController.java
+2
-2
backend/src/main/java/io/metersphere/performance/controller/request/ReportRequest.java
...rsphere/performance/controller/request/ReportRequest.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java
...ava/io/metersphere/performance/engine/AbstractEngine.java
+2
-2
backend/src/main/java/io/metersphere/performance/engine/Engine.java
...c/main/java/io/metersphere/performance/engine/Engine.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/EngineContext.java
...java/io/metersphere/performance/engine/EngineContext.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
...java/io/metersphere/performance/engine/EngineFactory.java
+5
-5
backend/src/main/java/io/metersphere/performance/engine/EngineThread.java
.../java/io/metersphere/performance/engine/EngineThread.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
...tersphere/performance/engine/docker/DockerTestEngine.java
+5
-5
backend/src/main/java/io/metersphere/performance/engine/docker/request/BaseRequest.java
...sphere/performance/engine/docker/request/BaseRequest.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/docker/request/TestRequest.java
...sphere/performance/engine/docker/request/TestRequest.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/KubernetesTestEngine.java
...e/performance/engine/kubernetes/KubernetesTestEngine.java
+8
-8
backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResource.java
...nce/engine/kubernetes/crds/MeterSphereCustomResource.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java
...ne/kubernetes/crds/MeterSphereCustomResourceDoneable.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/MeterSphereCustomResourceList.java
...engine/kubernetes/crds/MeterSphereCustomResourceList.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/Jmeter.java
...ere/performance/engine/kubernetes/crds/jmeter/Jmeter.java
+2
-2
backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterDoneable.java
...ormance/engine/kubernetes/crds/jmeter/JmeterDoneable.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterSpec.java
...performance/engine/kubernetes/crds/jmeter/JmeterSpec.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/crds/jmeter/JmeterStatus.java
...rformance/engine/kubernetes/crds/jmeter/JmeterStatus.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/AbstractClientProvider.java
...ce/engine/kubernetes/provider/AbstractClientProvider.java
+4
-4
backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/ClientCredential.java
...formance/engine/kubernetes/provider/ClientCredential.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/DockerRegistry.java
...erformance/engine/kubernetes/provider/DockerRegistry.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/DockerRegistryUtil.java
...rmance/engine/kubernetes/provider/DockerRegistryUtil.java
+1
-1
backend/src/main/java/io/metersphere/performance/engine/kubernetes/provider/KubernetesProvider.java
...rmance/engine/kubernetes/provider/KubernetesProvider.java
+1
-1
backend/src/main/java/io/metersphere/performance/parse/EngineSourceParser.java
.../io/metersphere/performance/parse/EngineSourceParser.java
+2
-2
backend/src/main/java/io/metersphere/performance/parse/EngineSourceParserFactory.java
...ersphere/performance/parse/EngineSourceParserFactory.java
+2
-2
backend/src/main/java/io/metersphere/performance/parse/xml/XmlEngineSourceParse.java
...tersphere/performance/parse/xml/XmlEngineSourceParse.java
+5
-5
backend/src/main/java/io/metersphere/performance/parse/xml/reader/DocumentParser.java
...ersphere/performance/parse/xml/reader/DocumentParser.java
+2
-4
backend/src/main/java/io/metersphere/performance/parse/xml/reader/DocumentParserFactory.java
...e/performance/parse/xml/reader/DocumentParserFactory.java
+2
-2
backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
...erformance/parse/xml/reader/jmx/JmeterDocumentParser.java
+3
-3
backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
...tersphere/performance/service/PerformanceTestService.java
+5
-3
backend/src/main/java/io/metersphere/performance/service/ReportService.java
...ava/io/metersphere/performance/service/ReportService.java
+6
-8
backend/src/main/java/io/metersphere/service/ProjectService.java
.../src/main/java/io/metersphere/service/ProjectService.java
+1
-0
backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
.../java/io/metersphere/service/TestResourcePoolService.java
+1
-1
未找到文件。
backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/
report
/base/ChartsData.java
→
backend/src/main/java/io/metersphere/
performance
/base/ChartsData.java
浏览文件 @
19a0fe3b
package
io.metersphere.
report
.base
;
package
io.metersphere.
performance
.base
;
import
lombok.Data
;
...
...
backend/src/main/java/io/metersphere/
report
/base/Errors.java
→
backend/src/main/java/io/metersphere/
performance
/base/Errors.java
浏览文件 @
19a0fe3b
package
io.metersphere.
report
.base
;
package
io.metersphere.
performance
.base
;
import
lombok.Data
;
...
...
backend/src/main/java/io/metersphere/
report
/base/ErrorsTop5.java
→
backend/src/main/java/io/metersphere/
performance
/base/ErrorsTop5.java
浏览文件 @
19a0fe3b
package
io.metersphere.
report
.base
;
package
io.metersphere.
performance
.base
;
import
lombok.Data
;
...
...
backend/src/main/java/io/metersphere/
report
/base/ReportTimeInfo.java
→
backend/src/main/java/io/metersphere/
performance
/base/ReportTimeInfo.java
浏览文件 @
19a0fe3b
package
io.metersphere.
report
.base
;
package
io.metersphere.
performance
.base
;
import
lombok.Data
;
...
...
backend/src/main/java/io/metersphere/
report
/base/Statistics.java
→
backend/src/main/java/io/metersphere/
performance
/base/Statistics.java
浏览文件 @
19a0fe3b
package
io.metersphere.
report
.base
;
package
io.metersphere.
performance
.base
;
import
lombok.Data
;
...
...
backend/src/main/java/io/metersphere/
report
/base/TestOverview.java
→
backend/src/main/java/io/metersphere/
performance
/base/TestOverview.java
浏览文件 @
19a0fe3b
package
io.metersphere.
report
.base
;
package
io.metersphere.
performance
.base
;
import
lombok.Data
;
...
...
backend/src/main/java/io/metersphere/controller/PerformanceReportController.java
→
backend/src/main/java/io/metersphere/
performance/
controller/PerformanceReportController.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/controller/PerformanceTestController.java
→
backend/src/main/java/io/metersphere/
performance/
controller/PerformanceTestController.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/controller/request/ReportRequest.java
→
backend/src/main/java/io/metersphere/
performance/
controller/request/ReportRequest.java
浏览文件 @
19a0fe3b
package
io.metersphere.controller.request
;
package
io.metersphere.
performance.
controller.request
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
backend/src/main/java/io/metersphere/engine/AbstractEngine.java
→
backend/src/main/java/io/metersphere/
performance/
engine/AbstractEngine.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/Engine.java
→
backend/src/main/java/io/metersphere/
performance/
engine/Engine.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine
;
package
io.metersphere.
performance.
engine
;
import
java.util.Map
;
...
...
backend/src/main/java/io/metersphere/engine/EngineContext.java
→
backend/src/main/java/io/metersphere/
performance/
engine/EngineContext.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine
;
package
io.metersphere.
performance.
engine
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
backend/src/main/java/io/metersphere/engine/EngineFactory.java
→
backend/src/main/java/io/metersphere/
performance/
engine/EngineFactory.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/EngineThread.java
→
backend/src/main/java/io/metersphere/
performance/
engine/EngineThread.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine
;
package
io.metersphere.
performance.
engine
;
import
java.util.concurrent.atomic.AtomicBoolean
;
...
...
backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java
→
backend/src/main/java/io/metersphere/
performance/
engine/docker/DockerTestEngine.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/docker/request/BaseRequest.java
→
backend/src/main/java/io/metersphere/
performance/
engine/docker/request/BaseRequest.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine.docker.request
;
package
io.metersphere.
performance.
engine.docker.request
;
public
class
BaseRequest
{
private
String
testId
;
...
...
backend/src/main/java/io/metersphere/engine/docker/request/TestRequest.java
→
backend/src/main/java/io/metersphere/
performance/
engine/docker/request/TestRequest.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine.docker.request
;
package
io.metersphere.
performance.
engine.docker.request
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/KubernetesTestEngine.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResource.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/crds/MeterSphereCustomResource.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine.kubernetes.crds
;
package
io.metersphere.
performance.
engine.kubernetes.crds
;
import
io.fabric8.kubernetes.client.CustomResource
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/crds/MeterSphereCustomResourceDoneable.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/crds/MeterSphereCustomResourceList.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/crds/MeterSphereCustomResourceList.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine.kubernetes.crds
;
package
io.metersphere.
performance.
engine.kubernetes.crds
;
import
io.fabric8.kubernetes.client.CustomResourceList
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/Jmeter.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/crds/jmeter/Jmeter.java
浏览文件 @
19a0fe3b
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"
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterDoneable.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/crds/jmeter/JmeterDoneable.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterSpec.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/crds/jmeter/JmeterSpec.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterStatus.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/crds/jmeter/JmeterStatus.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/provider/AbstractClientProvider.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/provider/AbstractClientProvider.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/provider/ClientCredential.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/provider/ClientCredential.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine.kubernetes.provider
;
package
io.metersphere.
performance.
engine.kubernetes.provider
;
public
class
ClientCredential
{
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/provider/DockerRegistry.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/provider/DockerRegistry.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine.kubernetes.provider
;
package
io.metersphere.
performance.
engine.kubernetes.provider
;
public
class
DockerRegistry
{
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/provider/DockerRegistryUtil.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/provider/DockerRegistryUtil.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine.kubernetes.provider
;
package
io.metersphere.
performance.
engine.kubernetes.provider
;
import
com.alibaba.fastjson.JSONObject
;
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/provider/KubernetesProvider.java
→
backend/src/main/java/io/metersphere/
performance/
engine/kubernetes/provider/KubernetesProvider.java
浏览文件 @
19a0fe3b
package
io.metersphere.engine.kubernetes.provider
;
package
io.metersphere.
performance.
engine.kubernetes.provider
;
public
class
KubernetesProvider
extends
AbstractClientProvider
{
public
KubernetesProvider
(
String
credential
)
{
...
...
backend/src/main/java/io/metersphere/parse/EngineSourceParser.java
→
backend/src/main/java/io/metersphere/p
erformance/p
arse/EngineSourceParser.java
浏览文件 @
19a0fe3b
package
io.metersphere.parse
;
package
io.metersphere.p
erformance.p
arse
;
import
io.metersphere.engine.EngineContext
;
import
io.metersphere.
performance.
engine.EngineContext
;
import
java.io.InputStream
;
...
...
backend/src/main/java/io/metersphere/parse/EngineSourceParserFactory.java
→
backend/src/main/java/io/metersphere/p
erformance/p
arse/EngineSourceParserFactory.java
浏览文件 @
19a0fe3b
package
io.metersphere.parse
;
package
io.metersphere.p
erformance.p
arse
;
import
io.metersphere.commons.constants.FileType
;
import
io.metersphere.parse.xml.XmlEngineSourceParse
;
import
io.metersphere.p
erformance.p
arse.xml.XmlEngineSourceParse
;
public
class
EngineSourceParserFactory
{
public
static
EngineSourceParser
createEngineSourceParser
(
String
type
)
{
...
...
backend/src/main/java/io/metersphere/parse/xml/XmlEngineSourceParse.java
→
backend/src/main/java/io/metersphere/p
erformance/p
arse/xml/XmlEngineSourceParse.java
浏览文件 @
19a0fe3b
package
io.metersphere.parse.xml
;
package
io.metersphere.p
erformance.p
arse.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.p
erformance.p
arse.EngineSourceParser
;
import
io.metersphere.p
erformance.p
arse.xml.reader.DocumentParser
;
import
io.metersphere.p
erformance.p
arse.xml.reader.DocumentParserFactory
;
import
org.w3c.dom.Document
;
import
org.xml.sax.InputSource
;
...
...
backend/src/main/java/io/metersphere/parse/xml/reader/DocumentParser.java
→
backend/src/main/java/io/metersphere/p
erformance/p
arse/xml/reader/DocumentParser.java
浏览文件 @
19a0fe3b
package
io.metersphere.parse.xml.reader
;
package
io.metersphere.p
erformance.p
arse.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
;
}
backend/src/main/java/io/metersphere/parse/xml/reader/DocumentParserFactory.java
→
backend/src/main/java/io/metersphere/p
erformance/p
arse/xml/reader/DocumentParserFactory.java
浏览文件 @
19a0fe3b
package
io.metersphere.parse.xml.reader
;
package
io.metersphere.p
erformance.p
arse.xml.reader
;
import
io.metersphere.commons.constants.FileType
;
import
io.metersphere.parse.xml.reader.jmx.JmeterDocumentParser
;
import
io.metersphere.p
erformance.p
arse.xml.reader.jmx.JmeterDocumentParser
;
public
class
DocumentParserFactory
{
public
static
DocumentParser
createDocumentParser
(
String
type
)
{
...
...
backend/src/main/java/io/metersphere/parse/xml/reader/jmx/JmeterDocumentParser.java
→
backend/src/main/java/io/metersphere/p
erformance/p
arse/xml/reader/jmx/JmeterDocumentParser.java
浏览文件 @
19a0fe3b
package
io.metersphere.parse.xml.reader.jmx
;
package
io.metersphere.p
erformance.p
arse.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.p
erformance.p
arse.xml.reader.DocumentParser
;
import
org.apache.commons.lang3.StringUtils
;
import
org.w3c.dom.Document
;
import
org.w3c.dom.Element
;
...
...
backend/src/main/java/io/metersphere/service/PerformanceTestService.java
→
backend/src/main/java/io/metersphere/
performance/
service/PerformanceTestService.java
浏览文件 @
19a0fe3b
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
;
...
...
backend/src/main/java/io/metersphere/service/ReportService.java
→
backend/src/main/java/io/metersphere/
performance/
service/ReportService.java
浏览文件 @
19a0fe3b
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
...
...
backend/src/main/java/io/metersphere/service/ProjectService.java
浏览文件 @
19a0fe3b
...
...
@@ -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
;
...
...
backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
浏览文件 @
19a0fe3b
...
...
@@ -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
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录