test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: postman导入报错

This commit is contained in:
chenjianxing 2021-07-23 14:13:43 +08:00 committed by jianxing
parent 9760b70762
commit 1182aa78bf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/metersphere/api/parse/PostmanAbstractParserParser.java
View File

@ -54,6 +54,9 @@ public abstract class PostmanAbstractParserParser<T> extends ApiImportAbstractPa
* @return * @return
*/ */
public String parseVariable(String value) { public String parseVariable(String value) {
if (StringUtils.isBlank(value)) {
return value;
}
try { try {
Pattern pattern = Pattern.compile("(\\{\\{(.*?)\\}\\})"); Pattern pattern = Pattern.compile("(\\{\\{(.*?)\\}\\})");
Matcher matcher = pattern.matcher(value); Matcher matcher = pattern.matcher(value);
@ -107,7 +110,11 @@ public abstract class PostmanAbstractParserParser<T> extends ApiImportAbstractPa
String k = parseVariable(item.getKey()); String k = parseVariable(item.getKey());
String v = parseVariable(item.getValue()); String v = parseVariable(item.getValue());
String desc = parseVariable(item.getDescription()); String desc = parseVariable(item.getDescription());
keyValues.add(new KeyValue(k, v, desc, item.getContentType())); KeyValue keyValue = new KeyValue(k, v, desc, item.getContentType());
if (StringUtils.isNotBlank(item.getType()) && StringUtils.equals("file", item.getType())) {
keyValue.setType("file");
}
keyValues.add(keyValue);
}); });
return keyValues; return keyValues;
} }

2
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -798,6 +798,7 @@ public class ApiDefinitionService {
if (i % 300 == 0) { if (i % 300 == 0) {
sqlSession.flushStatements(); sqlSession.flushStatements();
} }
sqlSession.flushStatements();
} }
//判断EsbData是否需要存储 //判断EsbData是否需要存储
if (apiImport.getEsbApiParamsMap() != null && apiImport.getEsbApiParamsMap().size() > 0) { if (apiImport.getEsbApiParamsMap() != null && apiImport.getEsbApiParamsMap().size() > 0) {
@ -819,7 +820,6 @@ public class ApiDefinitionService {
if (!CollectionUtils.isEmpty(apiImport.getCases())) { if (!CollectionUtils.isEmpty(apiImport.getCases())) {
importMsCase(apiImport, sqlSession, apiTestCaseMapper); importMsCase(apiImport, sqlSession, apiTestCaseMapper);
} }
sqlSession.flushStatements();
} }