Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
2bad9f92
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,发现更多精彩内容 >>
提交
2bad9f92
编写于
9月 17, 2020
作者:
S
shiziyuan9527
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/metersphere/metersphere
上级
5c9c6450
98a46cc5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
11 addition
and
26 deletion
+11
-26
backend/pom.xml
backend/pom.xml
+1
-1
backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
...ava/io/metersphere/api/parse/ApiImportAbstractParser.java
+2
-7
backend/src/main/java/io/metersphere/excel/listener/EasyExcelListener.java
...java/io/metersphere/excel/listener/EasyExcelListener.java
+3
-1
backend/src/main/java/io/metersphere/excel/utils/EasyExcelExporter.java
...in/java/io/metersphere/excel/utils/EasyExcelExporter.java
+2
-2
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
...in/java/io/metersphere/track/service/TestCaseService.java
+3
-15
未找到文件。
backend/pom.xml
浏览文件 @
2bad9f92
...
...
@@ -15,7 +15,7 @@
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<shiro.version>
1.
5.1
</shiro.version>
<shiro.version>
1.
6.0
</shiro.version>
<java.version>
1.8
</java.version>
<jmeter.version>
5.2.1
</jmeter.version>
<nacos.version>
1.1.3
</nacos.version>
...
...
backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
浏览文件 @
2bad9f92
...
...
@@ -9,10 +9,7 @@ import io.metersphere.commons.utils.LogUtil;
import
org.apache.commons.lang3.StringUtils
;
import
org.eclipse.jetty.http.HttpHeader
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStreamReader
;
import
java.io.*
;
import
java.nio.charset.StandardCharsets
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -21,10 +18,8 @@ import java.util.Optional;
public
abstract
class
ApiImportAbstractParser
implements
ApiImportParser
{
protected
String
getApiTestStr
(
InputStream
source
)
{
BufferedReader
bufferedReader
;
StringBuilder
testStr
=
null
;
try
{
bufferedReader
=
new
BufferedReader
(
new
InputStreamReader
(
source
,
StandardCharsets
.
UTF_8
));
try
(
BufferedReader
bufferedReader
=
new
BufferedReader
(
new
InputStreamReader
(
source
,
StandardCharsets
.
UTF_8
)))
{
testStr
=
new
StringBuilder
();
String
inputStr
;
while
((
inputStr
=
bufferedReader
.
readLine
())
!=
null
)
{
...
...
backend/src/main/java/io/metersphere/excel/listener/EasyExcelListener.java
浏览文件 @
2bad9f92
...
...
@@ -17,7 +17,7 @@ import java.lang.reflect.ParameterizedType;
import
java.lang.reflect.Type
;
import
java.util.*
;
public
abstract
class
EasyExcelListener
<
T
>
extends
AnalysisEventListener
<
T
>
{
public
abstract
class
EasyExcelListener
<
T
>
extends
AnalysisEventListener
<
T
>
implements
AutoCloseable
{
protected
List
<
ExcelErrData
<
T
>>
errList
=
new
ArrayList
<>();
...
...
@@ -153,6 +153,8 @@ public abstract class EasyExcelListener<T> extends AnalysisEventListener<T> {
return
errList
;
}
@Override
public
void
close
()
{
this
.
easyExcelI18nTranslator
.
resetExcelProperty
();
}
...
...
backend/src/main/java/io/metersphere/excel/utils/EasyExcelExporter.java
浏览文件 @
2bad9f92
...
...
@@ -5,7 +5,6 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle;
import
com.alibaba.excel.write.style.HorizontalCellStyleStrategy
;
import
io.metersphere.commons.utils.LogUtil
;
import
io.metersphere.exception.ExcelException
;
import
org.apache.poi.ss.usermodel.IndexedColors
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
...
...
@@ -13,7 +12,7 @@ import java.io.UnsupportedEncodingException;
import
java.net.URLEncoder
;
import
java.util.List
;
public
class
EasyExcelExporter
{
public
class
EasyExcelExporter
implements
AutoCloseable
{
EasyExcelI18nTranslator
easyExcelI18nTranslator
;
...
...
@@ -47,6 +46,7 @@ public class EasyExcelExporter {
}
}
@Override
public
void
close
()
{
easyExcelI18nTranslator
.
resetExcelProperty
();
}
...
...
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
浏览文件 @
2bad9f92
...
...
@@ -273,16 +273,12 @@ public class TestCaseService {
Set
<
String
>
userIds
=
userRoleMapper
.
selectByExample
(
userRoleExample
).
stream
().
map
(
UserRole:
:
getUserId
).
collect
(
Collectors
.
toSet
());
EasyExcelListener
easyExcelListener
=
null
;
try
{
easyExcelListener
=
new
TestCaseDataListener
(
this
,
projectId
,
testCaseNames
,
userIds
);
try
(
EasyExcelListener
easyExcelListener
=
new
TestCaseDataListener
(
this
,
projectId
,
testCaseNames
,
userIds
))
{
EasyExcelFactory
.
read
(
multipartFile
.
getInputStream
(),
TestCaseExcelData
.
class
,
easyExcelListener
).
sheet
().
doRead
();
errList
=
easyExcelListener
.
getErrList
();
}
catch
(
Exception
e
)
{
LogUtil
.
error
(
e
.
getMessage
(),
e
);
MSException
.
throwException
(
e
.
getMessage
());
}
finally
{
easyExcelListener
.
close
();
}
}
...
...
@@ -316,15 +312,11 @@ public class TestCaseService {
}
public
void
testCaseTemplateExport
(
HttpServletResponse
response
)
{
EasyExcelExporter
easyExcelExporter
=
null
;
try
{
easyExcelExporter
=
new
EasyExcelExporter
(
TestCaseExcelData
.
class
);
try
(
EasyExcelExporter
easyExcelExporter
=
new
EasyExcelExporter
(
TestCaseExcelData
.
class
))
{
easyExcelExporter
.
export
(
response
,
generateExportTemplate
(),
Translator
.
get
(
"test_case_import_template_name"
),
Translator
.
get
(
"test_case_import_template_sheet"
));
}
catch
(
Exception
e
)
{
MSException
.
throwException
(
e
);
}
finally
{
easyExcelExporter
.
close
();
}
}
...
...
@@ -398,15 +390,11 @@ public class TestCaseService {
}
public
void
testCaseExport
(
HttpServletResponse
response
,
TestCaseBatchRequest
request
)
{
EasyExcelExporter
easyExcelExporter
=
null
;
try
{
easyExcelExporter
=
new
EasyExcelExporter
(
TestCaseExcelData
.
class
);
try
(
EasyExcelExporter
easyExcelExporter
=
new
EasyExcelExporter
(
TestCaseExcelData
.
class
))
{
easyExcelExporter
.
export
(
response
,
generateTestCaseExcel
(
request
),
Translator
.
get
(
"test_case_import_template_name"
),
Translator
.
get
(
"test_case_import_template_sheet"
));
}
catch
(
Exception
e
)
{
MSException
.
throwException
(
e
);
}
finally
{
easyExcelExporter
.
close
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录