Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
df34a7af
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,发现更多精彩内容 >>
提交
df34a7af
编写于
4月 29, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
env
上级
56d8182e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
53 addition
and
0 deletion
+53
-0
backend/src/main/java/io/metersphere/config/KafkaProperties.java
.../src/main/java/io/metersphere/config/KafkaProperties.java
+21
-0
backend/src/main/java/io/metersphere/engine/EngineContext.java
...nd/src/main/java/io/metersphere/engine/EngineContext.java
+9
-0
backend/src/main/java/io/metersphere/engine/EngineFactory.java
...nd/src/main/java/io/metersphere/engine/EngineFactory.java
+13
-0
backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java
...n/java/io/metersphere/engine/docker/DockerTestEngine.java
+1
-0
backend/src/main/java/io/metersphere/engine/docker/request/TestRequest.java
...ava/io/metersphere/engine/docker/request/TestRequest.java
+9
-0
未找到文件。
backend/src/main/java/io/metersphere/config/KafkaProperties.java
浏览文件 @
df34a7af
...
...
@@ -20,6 +20,7 @@ public class KafkaProperties {
private
String
clientId
;
private
String
connectionsMaxIdleMs
;
private
KafkaProperties
.
Ssl
ssl
=
new
KafkaProperties
.
Ssl
();
private
KafkaProperties
.
Log
log
=
new
KafkaProperties
.
Log
();
public
String
getAcks
()
{
return
acks
;
...
...
@@ -239,4 +240,24 @@ public class KafkaProperties {
public
void
setSsl
(
Ssl
ssl
)
{
this
.
ssl
=
ssl
;
}
public
static
class
Log
{
private
String
topic
;
public
String
getTopic
()
{
return
topic
;
}
public
void
setTopic
(
String
topic
)
{
this
.
topic
=
topic
;
}
}
public
Log
getLog
()
{
return
log
;
}
public
void
setLog
(
Log
log
)
{
this
.
log
=
log
;
}
}
backend/src/main/java/io/metersphere/engine/EngineContext.java
浏览文件 @
df34a7af
...
...
@@ -15,6 +15,7 @@ public class EngineContext {
private
String
reportId
;
private
Map
<
String
,
Object
>
properties
=
new
HashMap
<>();
private
Map
<
String
,
String
>
testData
=
new
HashMap
<>();
private
Map
<
String
,
String
>
env
=
new
HashMap
<>();
public
String
getTestId
()
{
return
testId
;
...
...
@@ -48,6 +49,14 @@ public class EngineContext {
this
.
properties
.
putAll
(
props
);
}
public
Map
<
String
,
String
>
getEnv
()
{
return
env
;
}
public
void
setEnv
(
Map
<
String
,
String
>
env
)
{
this
.
env
=
env
;
}
public
Object
getProperty
(
String
key
)
{
return
this
.
properties
.
get
(
key
);
}
...
...
backend/src/main/java/io/metersphere/engine/EngineFactory.java
浏览文件 @
df34a7af
...
...
@@ -9,6 +9,7 @@ import io.metersphere.base.domain.TestResourcePool;
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
;
...
...
@@ -31,6 +32,7 @@ import java.util.stream.Collectors;
public
class
EngineFactory
{
private
static
FileService
fileService
;
private
static
TestResourcePoolService
testResourcePoolService
;
private
static
KafkaProperties
kafkaProperties
;
public
static
Engine
createEngine
(
LoadTestWithBLOBs
loadTest
)
{
String
resourcePoolId
=
loadTest
.
getTestResourcePoolId
();
...
...
@@ -78,6 +80,12 @@ public class EngineFactory {
engineContext
.
setResourcePoolId
(
loadTest
.
getTestResourcePoolId
());
engineContext
.
setStartTime
(
startTime
);
engineContext
.
setReportId
(
reportId
);
HashMap
<
String
,
String
>
env
=
new
HashMap
<
String
,
String
>()
{{
put
(
"BOOTSTRAP_SERVERS"
,
kafkaProperties
.
getBootstrapServers
());
put
(
"LOG_TOPIC"
,
kafkaProperties
.
getLog
().
getTopic
());
put
(
"REPORT_ID"
,
reportId
);
}};
engineContext
.
setEnv
(
env
);
if
(
StringUtils
.
isNotEmpty
(
loadTest
.
getLoadConfiguration
()))
{
final
JSONArray
jsonArray
=
JSONObject
.
parseArray
(
loadTest
.
getLoadConfiguration
());
...
...
@@ -130,4 +138,9 @@ public class EngineFactory {
public
void
setTestResourcePoolService
(
TestResourcePoolService
testResourcePoolService
)
{
EngineFactory
.
testResourcePoolService
=
testResourcePoolService
;
}
@Resource
public
void
setKafkaProperties
(
KafkaProperties
kafkaProperties
)
{
EngineFactory
.
kafkaProperties
=
kafkaProperties
;
}
}
backend/src/main/java/io/metersphere/engine/docker/DockerTestEngine.java
浏览文件 @
df34a7af
...
...
@@ -82,6 +82,7 @@ public class DockerTestEngine extends AbstractEngine {
testRequest
.
setFileString
(
content
);
testRequest
.
setImage
(
JMETER_IMAGE
);
testRequest
.
setTestData
(
context
.
getTestData
());
testRequest
.
setEnv
(
context
.
getEnv
());
restTemplate
.
postForObject
(
uri
,
testRequest
,
String
.
class
);
}
...
...
backend/src/main/java/io/metersphere/engine/docker/request/TestRequest.java
浏览文件 @
df34a7af
...
...
@@ -9,6 +9,7 @@ public class TestRequest extends BaseRequest {
private
String
fileString
;
private
String
image
;
private
Map
<
String
,
String
>
testData
=
new
HashMap
<>();
private
Map
<
String
,
String
>
env
=
new
HashMap
<>();
public
int
getSize
()
{
return
size
;
...
...
@@ -41,4 +42,12 @@ public class TestRequest extends BaseRequest {
public
void
setTestData
(
Map
<
String
,
String
>
testData
)
{
this
.
testData
=
testData
;
}
public
Map
<
String
,
String
>
getEnv
()
{
return
env
;
}
public
void
setEnv
(
Map
<
String
,
String
>
env
)
{
this
.
env
=
env
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录