Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
2bc11e4f
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,体验更适合开发者的 AI 搜索 >>
提交
2bc11e4f
编写于
7月 22, 2020
作者:
C
chenjianxing
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'v1.1' of
https://github.com/metersphere/server
into v1.1
上级
e32635ed
0e54e56c
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
33 addition
and
28 deletion
+33
-28
Dockerfile
Dockerfile
+2
-2
backend/pom.xml
backend/pom.xml
+2
-2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
...ava/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
+2
-1
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
...java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+2
-2
backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
...e/performance/controller/PerformanceReportController.java
+12
-9
backend/src/main/java/io/metersphere/performance/service/ReportService.java
...ava/io/metersphere/performance/service/ReportService.java
+3
-3
backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
...a/io/metersphere/track/controller/TestCaseController.java
+2
-2
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
...in/java/io/metersphere/track/service/TestCaseService.java
+2
-2
frontend/pom.xml
frontend/pom.xml
+1
-1
frontend/src/business/components/track/case/components/TestCaseList.vue
...usiness/components/track/case/components/TestCaseList.vue
+4
-3
pom.xml
pom.xml
+1
-1
未找到文件。
Dockerfile
浏览文件 @
2bc11e4f
...
...
@@ -6,11 +6,11 @@ ARG MS_VERSION=dev
RUN
mkdir
-p
/opt/apps
&&
mkdir
-p
/opt/jmeter
ADD
backend/target/backend-1.
0
.jar /opt/apps
ADD
backend/target/backend-1.
1
.jar /opt/apps
ADD
backend/target/classes/jmeter/ /opt/jmeter/
ENV
JAVA_APP_JAR=/opt/apps/backend-1.
0
.jar
ENV
JAVA_APP_JAR=/opt/apps/backend-1.
1
.jar
ENV
AB_OFF=true
...
...
backend/pom.xml
浏览文件 @
2bc11e4f
...
...
@@ -7,7 +7,7 @@
<parent>
<artifactId>
metersphere-server
</artifactId>
<groupId>
io.metersphere
</groupId>
<version>
1.
0
</version>
<version>
1.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
@@ -376,4 +376,4 @@
<url>
https://maven.pkg.github.com/metersphere/jmeter-plugins-for-apache-dubbo
</url>
</repository>
</repositories>
</project>
\ No newline at end of file
</project>
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
浏览文件 @
2bc11e4f
...
...
@@ -3,6 +3,7 @@ package io.metersphere.base.mapper.ext;
import
io.metersphere.base.domain.TestCase
;
import
io.metersphere.track.request.testcase.QueryTestCaseRequest
;
import
io.metersphere.track.dto.TestCaseDTO
;
import
io.metersphere.track.request.testcase.TestCaseBatchRequest
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -15,7 +16,7 @@ public interface ExtTestCaseMapper {
List
<
TestCaseDTO
>
listByMethod
(
@Param
(
"request"
)
QueryTestCaseRequest
request
);
List
<
TestCaseDTO
>
listBytestCaseIds
(
@Param
(
"request"
)
QueryTestCase
Request
request
);
List
<
TestCaseDTO
>
listBytestCaseIds
(
@Param
(
"request"
)
TestCaseBatch
Request
request
);
TestCase
getMaxNumByProjectId
(
@Param
(
"projectId"
)
String
projectId
);
...
...
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
浏览文件 @
2bc11e4f
...
...
@@ -202,9 +202,9 @@
select test_case.*,api_test.name as apiName,load_test.name AS performName from test_case left join api_test on
test_case.test_id=api_test.id left join load_test on test_case.test_id=load_test.id
<where>
<if
test=
"request.
testCaseIds!=null and request.testCaseI
ds.size() > 0"
>
<if
test=
"request.
ids!=null and request.i
ds.size() > 0"
>
and test_case.id in
<foreach
collection=
"request.
testCaseI
ds"
open=
"("
close=
")"
separator=
","
item=
"id"
>
<foreach
collection=
"request.
i
ds"
open=
"("
close=
")"
separator=
","
item=
"id"
>
#{id}
</foreach>
</if>
...
...
backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
浏览文件 @
2bc11e4f
...
...
@@ -15,12 +15,11 @@ import io.metersphere.performance.controller.request.ReportRequest;
import
io.metersphere.performance.service.ReportService
;
import
org.apache.shiro.authz.annotation.Logical
;
import
org.apache.shiro.authz.annotation.RequiresRoles
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.OutputStream
;
import
java.util.List
;
@RestController
...
...
@@ -112,11 +111,15 @@ public class PerformanceReportController {
}
@GetMapping
(
"log/download/{reportId}/{resourceId}"
)
public
ResponseEntity
<
byte
[]>
downloadLog
(
@PathVariable
String
reportId
,
@PathVariable
String
resourceId
)
{
byte
[]
bytes
=
reportService
.
downloadLog
(
reportId
,
resourceId
);
return
ResponseEntity
.
ok
()
.
contentType
(
MediaType
.
parseMediaType
(
"application/octet-stream"
))
.
header
(
HttpHeaders
.
CONTENT_DISPOSITION
,
"attachment; filename=\"jmeter.log\""
)
.
body
(
bytes
);
public
void
downloadLog
(
@PathVariable
String
reportId
,
@PathVariable
String
resourceId
,
HttpServletResponse
response
)
throws
Exception
{
try
(
OutputStream
outputStream
=
response
.
getOutputStream
())
{
List
<
String
>
content
=
reportService
.
downloadLog
(
reportId
,
resourceId
);
response
.
setContentType
(
"application/x-download"
);
response
.
addHeader
(
"Content-Disposition"
,
"attachment;filename=jmeter.log"
);
for
(
String
log
:
content
)
{
outputStream
.
write
(
log
.
getBytes
());
}
outputStream
.
flush
();
}
}
}
backend/src/main/java/io/metersphere/performance/service/ReportService.java
浏览文件 @
2bc11e4f
...
...
@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Service
@Transactional
(
rollbackFor
=
Exception
.
class
)
...
...
@@ -210,14 +211,13 @@ public class ReportService {
return
loadTestReportLogMapper
.
selectByExampleWithBLOBs
(
example
);
}
public
byte
[]
downloadLog
(
String
reportId
,
String
resourceId
)
{
public
List
<
String
>
downloadLog
(
String
reportId
,
String
resourceId
)
{
LoadTestReportLogExample
example
=
new
LoadTestReportLogExample
();
example
.
createCriteria
().
andReportIdEqualTo
(
reportId
).
andResourceIdEqualTo
(
resourceId
);
example
.
setOrderByClause
(
"part desc"
);
List
<
LoadTestReportLog
>
loadTestReportLogs
=
loadTestReportLogMapper
.
selectByExampleWithBLOBs
(
example
);
String
content
=
loadTestReportLogs
.
stream
().
map
(
LoadTestReportLog:
:
getContent
).
reduce
(
""
,
(
a
,
b
)
->
a
+
b
);
return
content
.
getBytes
();
return
loadTestReportLogs
.
stream
().
map
(
LoadTestReportLog:
:
getContent
).
collect
(
Collectors
.
toList
());
}
public
LoadTestReport
getReport
(
String
reportId
)
{
...
...
backend/src/main/java/io/metersphere/track/controller/TestCaseController.java
浏览文件 @
2bc11e4f
...
...
@@ -110,9 +110,9 @@ public class TestCaseController {
public
void
testCaseTemplateExport
(
HttpServletResponse
response
){
testCaseService
.
testCaseTemplateExport
(
response
);
}
@
GetMapping
(
"/export/testCase/{testCaseIds}
"
)
@
PostMapping
(
"/export/testcase
"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
TEST_USER
,
RoleConstants
.
TEST_MANAGER
},
logical
=
Logical
.
OR
)
public
void
testCaseExport
(
HttpServletResponse
response
,
QueryTestCase
Request
request
){
public
void
testCaseExport
(
HttpServletResponse
response
,
@RequestBody
TestCaseBatch
Request
request
){
testCaseService
.
testCaseExport
(
response
,
request
);
}
...
...
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
浏览文件 @
2bc11e4f
...
...
@@ -310,7 +310,7 @@ public class TestCaseService {
return
list
;
}
public
void
testCaseExport
(
HttpServletResponse
response
,
QueryTestCase
Request
request
)
{
public
void
testCaseExport
(
HttpServletResponse
response
,
TestCaseBatch
Request
request
)
{
EasyExcelExporter
easyExcelExporter
=
null
;
try
{
easyExcelExporter
=
new
EasyExcelExporter
(
TestCaseExcelData
.
class
);
...
...
@@ -323,7 +323,7 @@ public class TestCaseService {
}
}
private
List
<
TestCaseExcelData
>
generateTestCaseExcel
(
QueryTestCase
Request
request
)
{
private
List
<
TestCaseExcelData
>
generateTestCaseExcel
(
TestCaseBatch
Request
request
)
{
List
<
TestCaseDTO
>
TestCaseList
=
extTestCaseMapper
.
listBytestCaseIds
(
request
);
List
<
TestCaseExcelData
>
list
=
new
ArrayList
<>();
SessionUser
user
=
SessionUtils
.
getUser
();
...
...
frontend/pom.xml
浏览文件 @
2bc11e4f
...
...
@@ -7,7 +7,7 @@
<parent>
<artifactId>
metersphere-server
</artifactId>
<groupId>
io.metersphere
</groupId>
<version>
1.
0
</version>
<version>
1.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
frontend/src/business/components/track/case/components/TestCaseList.vue
浏览文件 @
2bc11e4f
...
...
@@ -292,9 +292,10 @@
},
exportTestCase
()
{
let
config
=
{
url
:
'
/test/case/export/testCase/
'
+
[...
this
.
selectIds
],
method
:
'
get
'
,
responseType
:
'
blob
'
url
:
'
/test/case/export/testcase
'
,
method
:
'
post
'
,
responseType
:
'
blob
'
,
data
:
{
ids
:
[...
this
.
selectIds
]}
};
this
.
result
=
this
.
$request
(
config
).
then
(
response
=>
{
const
filename
=
this
.
$t
(
'
test_track.case.test_case
'
)
+
"
.xlsx
"
;
...
...
pom.xml
浏览文件 @
2bc11e4f
...
...
@@ -4,7 +4,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
io.metersphere
</groupId>
<artifactId>
metersphere-server
</artifactId>
<version>
1.
0
</version>
<version>
1.
1
</version>
<packaging>
pom
</packaging>
<parent>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录