Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
a40d3056
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,发现更多精彩内容 >>
提交
a40d3056
编写于
6月 04, 2020
作者:
王
王振
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:metersphere/metersphere into dev
上级
ee306e72
22fb6855
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
4 deletion
+4
-4
backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
...a/io/metersphere/api/jmeter/APIBackendListenerClient.java
+1
-1
backend/src/main/resources/jmeter/bin/jmeter.properties
backend/src/main/resources/jmeter/bin/jmeter.properties
+1
-1
frontend/src/business/components/api/test/ApiTestList.vue
frontend/src/business/components/api/test/ApiTestList.vue
+1
-1
frontend/src/business/components/performance/test/PerformanceTestPlan.vue
...iness/components/performance/test/PerformanceTestPlan.vue
+1
-1
未找到文件。
backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
浏览文件 @
a40d3056
...
...
@@ -126,7 +126,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
}
ResponseResult
responseResult
=
requestResult
.
getResponseResult
();
responseResult
.
setBody
(
new
String
(
result
.
getResponseData
(),
StandardCharsets
.
UTF_8
));
responseResult
.
setBody
(
result
.
getResponseDataAsString
(
));
responseResult
.
setHeaders
(
result
.
getResponseHeaders
());
responseResult
.
setLatency
(
result
.
getLatency
());
responseResult
.
setResponseCode
(
result
.
getResponseCode
());
...
...
backend/src/main/resources/jmeter/bin/jmeter.properties
浏览文件 @
a40d3056
...
...
@@ -1081,7 +1081,7 @@ csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII
#httpsampler.user_defined_methods=VERSION-CONTROL,REPORT,CHECKOUT,CHECKIN,UNCHECKOUT,MKWORKSPACE,UPDATE,LABEL,MERGE,BASELINE-CONTROL,MKACTIVITY
# The encoding to be used if none is provided (default ISO-8859-1)
#sampleresult.default.encoding=ISO-8859-1
sampleresult.default.encoding
=
UTF-8
# CookieManager behaviour - should cookies with null/empty values be deleted?
# Default is true. Use false to revert to original behaviour
...
...
frontend/src/business/components/api/test/ApiTestList.vue
浏览文件 @
a40d3056
...
...
@@ -139,7 +139,7 @@
},
handleCopy
(
test
)
{
this
.
result
=
this
.
$post
(
"
/api/copy
"
,
{
id
:
test
.
id
},
()
=>
{
this
.
$success
(
this
.
$t
(
'
commons.
delete
_success
'
));
this
.
$success
(
this
.
$t
(
'
commons.
copy
_success
'
));
this
.
search
();
});
},
...
...
frontend/src/business/components/performance/test/PerformanceTestPlan.vue
浏览文件 @
a40d3056
...
...
@@ -174,7 +174,7 @@
},
handleCopy
(
testPlan
)
{
this
.
result
=
this
.
$post
(
"
/performance/copy
"
,
{
id
:
testPlan
.
id
},
()
=>
{
this
.
$success
(
this
.
$t
(
'
commons.
save
_success
'
));
this
.
$success
(
this
.
$t
(
'
commons.
copy
_success
'
));
this
.
search
();
});
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录