Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
56d25dfc
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,发现更多精彩内容 >>
提交
56d25dfc
编写于
6月 29, 2020
作者:
C
chenjianxing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
支持从响应头等对象中提取
上级
ef724bdc
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
5 deletion
+22
-5
backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java
...io/metersphere/api/dto/scenario/extract/ExtractRegex.java
+1
-0
frontend/src/business/components/api/test/components/extract/ApiExtract.vue
...ess/components/api/test/components/extract/ApiExtract.vue
+2
-2
frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
...mponents/api/test/components/extract/ApiExtractCommon.vue
+17
-2
frontend/src/business/components/api/test/model/ScenarioModel.js
...d/src/business/components/api/test/model/ScenarioModel.js
+2
-1
未找到文件。
backend/src/main/java/io/metersphere/api/dto/scenario/extract/ExtractRegex.java
浏览文件 @
56d25dfc
...
...
@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
public
class
ExtractRegex
extends
ExtractCommon
{
private
String
useHeaders
;
public
ExtractRegex
()
{
setType
(
ExtractType
.
REGEX
);
}
...
...
frontend/src/business/components/api/test/components/extract/ApiExtract.vue
浏览文件 @
56d25dfc
...
...
@@ -4,7 +4,7 @@
{{
$t
(
'
api_test.request.extract.description
'
)
}}
</div>
<el-row
:gutter=
"10"
>
<el-col
:span=
"
4
"
>
<el-col
:span=
"
2
"
>
<el-select
:disabled=
"isReadOnly"
class=
"extract-item"
v-model=
"type"
:placeholder=
"$t('api_test.request.extract.select_type')"
size=
"small"
>
<el-option
:label=
"$t('api_test.request.extract.regex')"
:value=
"options.REGEX"
/>
...
...
@@ -12,7 +12,7 @@
<el-option
label=
"XPath"
:value=
"options.XPATH"
/>
</el-select>
</el-col>
<el-col
:span=
"2
0
"
>
<el-col
:span=
"2
2
"
>
<ms-api-extract-common
:is-read-only=
"isReadOnly"
:extract-type=
"type"
:list=
"list"
v-if=
"type"
:callback=
"after"
/>
</el-col>
</el-row>
...
...
frontend/src/business/components/api/test/components/extract/ApiExtractCommon.vue
浏览文件 @
56d25dfc
<
template
>
<div>
<el-row
:gutter=
"10"
type=
"flex"
justify=
"space-between"
align=
"middle"
>
<el-col
:span=
"10"
>
<el-col
v-if=
"extractType == 'Regex'"
:span=
"5"
>
<el-select
:disabled=
"isReadOnly"
class=
"extract-item"
v-model=
"common.useHeaders"
:placeholder=
"$t('api_test.request.assertions.select_subject')"
size=
"small"
>
<el-option
v-for=
"item in useHeadersOption"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</el-col>
<el-col>
<ms-api-variable-input
:is-read-only=
"isReadOnly"
v-model=
"common.variable"
size=
"small"
maxlength=
"60"
@
change=
"change"
show-word-limit
:placeholder=
"$t('api_test.variable_name')"
/>
</el-col>
...
...
@@ -53,7 +58,17 @@
data
()
{
return
{
visible
:
false
visible
:
false
,
useHeadersOption
:
[
{
label
:
'
Body
'
,
value
:
'
false
'
},
{
label
:
'
Request Headers
'
,
value
:
'
request_headers
'
},
{
label
:
'
Body (unescaped)
'
,
value
:
'
unescaped
'
},
{
label
:
'
Body as a Document
'
,
value
:
'
as_document
'
},
{
label
:
'
Response Headers
'
,
value
:
'
true
'
},
{
label
:
'
URL
'
,
value
:
'
URL
'
},
{
label
:
'
Response Code
'
,
value
:
'
code
'
},
{
label
:
'
Response Message
'
,
value
:
'
message
'
}
]
}
},
...
...
frontend/src/business/components/api/test/model/ScenarioModel.js
浏览文件 @
56d25dfc
...
...
@@ -344,6 +344,7 @@ export class ExtractCommon extends ExtractType {
constructor
(
type
,
options
)
{
super
(
type
);
this
.
variable
=
undefined
;
this
.
useHeaders
=
undefined
;
this
.
value
=
""
;
// ${variable}
this
.
expression
=
undefined
;
this
.
description
=
undefined
;
...
...
@@ -562,7 +563,7 @@ class JMXGenerator {
switch
(
extractCommon
.
type
)
{
case
EXTRACT_TYPE
.
REGEX
:
testName
+=
"
RegexExtractor
"
;
props
.
headers
=
"
false
"
;
// 对应jMeter body
props
.
headers
=
extractCommon
.
useHeaders
;
// 对应jMeter body
props
.
template
=
"
$1$
"
;
return
new
RegexExtractor
(
testName
,
props
);
case
EXTRACT_TYPE
.
JSON_PATH
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录