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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2020-12-31 14:04:15 +08:00
parent 75bb894228 53943f4176
commit a9a6c52122
10 changed files with 65 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/ISSUE_TEMPLATE/bug---.md → .github/ISSUE_TEMPLATE/bug.md vendored
View File

@ -1,9 +1,9 @@
---
name: Bug 提交
name: BUG 提交
about: 提交产品缺陷帮助我们更好的改进
title: "[BUG]"
labels: bug
assignees: ''
assignees: AgAngle
---

0
.github/ISSUE_TEMPLATE/----.md → .github/ISSUE_TEMPLATE/feature.md vendored
View File

3
.github/ISSUE_TEMPLATE/question.md vendored
View File

@ -3,9 +3,8 @@ name: 问题咨询
about: 提出针对本项目安装部署、使用及其他方面的相关问题
title: "[QUESTION]"
labels: question
assignees: 'wangzhen-fit2cloud'
assignees: wangzhen-fit2cloud
---
**请描述您的问题.**

14
.github/ISSUE_TEMPLATE/v1.6.1-issue.md vendored Normal file
View File

@ -0,0 +1,14 @@
---
name: v1.6.1 问题
about: 提交关于 v1.6.1 的缺陷与建议，赢取Lv同款鼠标垫！马克杯！文化衫！
title: "[v1.6.1]"
labels: v1.6.1
assignees: luty2018
---
**问题/需求描述**
简要描述您碰到的问题或您面临的需求
**截图**
如果有截图，请附上截图.

11
backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
View File

@ -32,12 +32,7 @@ public class KeyValue {
}
public KeyValue(String name, String value, String description, String contentType) {
this.name = name;
this.value = value;
this.description = description;
this.contentType = contentType;
this.enable = true;
this.required = true;
this(name, value, description, contentType, true);
}
public KeyValue(String name, String value, String description, String contentType, boolean required) {
@ -49,6 +44,10 @@ public class KeyValue {
this.required = required;
}
public KeyValue(String name, String value, String description, boolean required) {
this(name, value, description, "", required);
}
public boolean isValid() {
return (StringUtils.isNotBlank(name) || StringUtils.isNotBlank(value)) && !StringUtils.equalsIgnoreCase(type, "file");
}

4
backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
View File

@ -142,10 +142,10 @@ public abstract class ApiImportAbstractParser implements ApiImportParser {
}
protected void addCookie(List<KeyValue> headers, String key, String value) {
addCookie(headers, key, value, "", "", true);
addCookie(headers, key, value, "", true);
}
protected void addCookie(List<KeyValue> headers, String key, String value, String description, String contentType, boolean required) {
protected void addCookie(List<KeyValue> headers, String key, String value, String description, boolean required) {
boolean hasCookie = false;
for (KeyValue header : headers) {
if (StringUtils.equalsIgnoreCase("Cookie", header.getName())) {

4
backend/src/main/java/io/metersphere/api/parse/MsParser.java
View File

@ -41,7 +41,9 @@ public class MsParser extends ApiImportAbstractParser {
List<ApiDefinitionResult> data = apiDefinitionImport.getData();
data.forEach(apiDefinition -> {
String id = UUID.randomUUID().toString();
// apiDefinition.setModuleId(null);
if (StringUtils.isBlank(apiDefinition.getModulePath())) {
apiDefinition.setModuleId(null);
}
parseModule(apiDefinition, importRequest.isSaved());
apiDefinition.setId(id);
apiDefinition.setProjectId(this.projectId);

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

@ -166,8 +166,7 @@ public class Swagger2Parser extends ApiImportAbstractParser {
private void parseCookieParameters(Parameter parameter, List<KeyValue> headers) {
CookieParameter cookieParameter = (CookieParameter) parameter;
addCookie(headers, cookieParameter.getName(), "", getDefaultStringValue(cookieParameter.getDescription()),
"", parameter.getRequired());
addCookie(headers, cookieParameter.getName(), "", getDefaultStringValue(cookieParameter.getDescription()), parameter.getRequired());
}
private void parseHeaderParameters(Parameter parameter, List<KeyValue> headers) {
@ -301,8 +300,7 @@ public class Swagger2Parser extends ApiImportAbstractParser {
private void parseFormDataParameters(FormParameter parameter, Body body) {
List<KeyValue> keyValues = Optional.ofNullable(body.getKvs()).orElse(new ArrayList<>());
KeyValue kv = new KeyValue(parameter.getName(), "", getDefaultStringValue(parameter.getDescription()),
"", parameter.getRequired());
KeyValue kv = new KeyValue(parameter.getName(), "", getDefaultStringValue(parameter.getDescription()), parameter.getRequired());
if (StringUtils.equals(parameter.getType(), "file")) {
kv.setType("file");
}
@ -312,7 +310,6 @@ public class Swagger2Parser extends ApiImportAbstractParser {
private void parseQueryParameters(Parameter parameter, List<KeyValue> arguments) {
QueryParameter queryParameter = (QueryParameter) parameter;
arguments.add(new KeyValue(queryParameter.getName(), "", getDefaultStringValue(queryParameter.getDescription()),
"", queryParameter.getRequired()));
arguments.add(new KeyValue(queryParameter.getName(), "", getDefaultStringValue(queryParameter.getDescription()), queryParameter.getRequired()));
}
}

57
backend/src/main/java/io/metersphere/api/parse/Swagger3Parser.java
View File

@ -17,7 +17,6 @@ import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.commons.utils.XMLUtils;
import io.swagger.models.parameters.FormParameter;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.*;
import io.swagger.v3.oas.models.headers.Header;
@ -51,7 +50,7 @@ public class Swagger3Parser extends ApiImportAbstractParser {
public ApiDefinitionImport parse(String sourceStr, ApiTestImportRequest request) {
SwaggerParseResult result;
if (StringUtils.isNotBlank(request.getSwaggerUrl())) {
result = new OpenAPIParser().readLocation("https://petstore3.swagger.io/api/v3/openapi.json", null, null);
result = new OpenAPIParser().readLocation(request.getSwaggerUrl(), null, null);
} else {
result = new OpenAPIParser().readContents(sourceStr, null, null);
}
@ -179,12 +178,12 @@ public class Swagger3Parser extends ApiImportAbstractParser {
private void parseCookieParameters(Parameter parameter, List<KeyValue> headers) {
CookieParameter cookieParameter = (CookieParameter) parameter;
addCookie(headers, cookieParameter.getName(), "", getDefaultStringValue(cookieParameter.getDescription()), "", true);
addCookie(headers, cookieParameter.getName(), "", getDefaultStringValue(cookieParameter.getDescription()), parameter.getRequired());
}
private void parseHeaderParameters(Parameter parameter, List<KeyValue> headers) {
HeaderParameter headerParameter = (HeaderParameter) parameter;
addHeader(headers, headerParameter.getName(), "", getDefaultStringValue(headerParameter.getDescription()), "", true);
addHeader(headers, headerParameter.getName(), "", getDefaultStringValue(headerParameter.getDescription()), "", parameter.getRequired());
}
private HttpResponse parseResponse(ApiResponses responses) {
@ -250,9 +249,9 @@ public class Swagger3Parser extends ApiImportAbstractParser {
}
Set<String> refSet = new HashSet<>();
Map<String, String> binaryKeyMap = new HashMap();
Map<String, Schema> infoMap = new HashMap();
Schema schema = mediaType.getSchema();
Object bodyData = parseSchema(schema, refSet, binaryKeyMap);
Object bodyData = parseSchema(schema, refSet, infoMap);
if (bodyData == null) {
return;
@ -261,7 +260,7 @@ public class Swagger3Parser extends ApiImportAbstractParser {
body.setType(getBodyType(contentType));
if (StringUtils.equals(contentType, org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE)) {
parseKvBody(schema, body, bodyData, binaryKeyMap);
parseKvBody(schema, body, bodyData, infoMap);
} else if (StringUtils.equals(contentType, org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE)) {
body.setRaw(bodyData.toString());
} else if (StringUtils.equals(contentType, org.springframework.http.MediaType.APPLICATION_JSON_VALUE)) {
@ -269,27 +268,34 @@ public class Swagger3Parser extends ApiImportAbstractParser {
} else if (StringUtils.equals(contentType, org.springframework.http.MediaType.APPLICATION_XML_VALUE)) {
body.setRaw(parseXmlBody(schema, bodyData));
} else if (StringUtils.equals(contentType, org.springframework.http.MediaType.APPLICATION_OCTET_STREAM_VALUE)) {
parseKvBody(schema, body, bodyData, binaryKeyMap);
parseKvBody(schema, body, bodyData, infoMap);
} else {
body.setRaw(bodyData.toString());
}
}
private void parseKvBody(Schema schema, Body body, Object data, Map<String, String> binaryKeyMap) {
private void parseKvBody(Schema schema, Body body, Object data, Map<String, Schema> infoMap) {
if (data instanceof JSONObject) {
((JSONObject) data).forEach((k, v) -> {
KeyValue kv = new KeyValue(k, v.toString());
if (binaryKeyMap.keySet().contains(k)) {
kv.setDescription(binaryKeyMap.get(k));
kv.setType("file");
Schema schemaInfo = infoMap.get(k);
if (schemaInfo != null) {
kv.setDescription(schemaInfo.getDescription());
// kv.setRequired(schemaInfo.getRequired());
if (schemaInfo instanceof BinarySchema) {
kv.setType("file");
}
}
body.getKvs().add(kv);
});
} else {
KeyValue kv = new KeyValue(schema.getName(), data.toString(), schema.getDescription());
if (binaryKeyMap.keySet().contains(schema.getName())) {
kv.setDescription(binaryKeyMap.get(schema.getDescription()));
kv.setType("file");
Schema schemaInfo = infoMap.get(schema.getName());
if (schemaInfo != null) {
kv.setDescription(schemaInfo.getDescription());
if (schemaInfo instanceof BinarySchema) {
kv.setType("file");
}
}
body.getKvs().add(kv);
}
@ -315,34 +321,37 @@ public class Swagger3Parser extends ApiImportAbstractParser {
return this.components.getSchemas().get(ref);
}
private Object parseSchema(Schema schema, Set<String> refSet, Map<String, String> binaryKeyMap) {
private Object parseSchema(Schema schema, Set<String> refSet, Map<String, Schema> infoMap) {
infoMap.put(schema.getName(), schema);
if (StringUtils.isNotBlank(schema.get$ref())) {
if (refSet.contains(schema.get$ref())) {
return new JSONObject();
}
refSet.add(schema.get$ref());
Object propertiesResult = parseSchemaProperties(getModelByRef(schema.get$ref()), refSet, binaryKeyMap);
Object propertiesResult = parseSchemaProperties(getModelByRef(schema.get$ref()), refSet, infoMap);
return propertiesResult == null ? getDefaultValueByPropertyType(schema) : propertiesResult;
} else if (schema instanceof ArraySchema) {
JSONArray jsonArray = new JSONArray();
Schema items = ((ArraySchema) schema).getItems();
parseSchema(items, refSet, binaryKeyMap);
jsonArray.add(parseSchema(items, refSet, binaryKeyMap));
parseSchema(items, refSet, infoMap);
jsonArray.add(parseSchema(items, refSet, infoMap));
return jsonArray;
} else if (schema instanceof BinarySchema) {
binaryKeyMap.put(schema.getName(), schema.getDescription());
return getDefaultValueByPropertyType(schema);
} else {
Object propertiesResult = parseSchemaProperties(schema, refSet, binaryKeyMap);
Object propertiesResult = parseSchemaProperties(schema, refSet, infoMap);
return propertiesResult == null ? getDefaultValueByPropertyType(schema) : propertiesResult;
}
}
private Object parseSchemaProperties(Schema schema, Set<String> refSet, Map<String, String> binaryKeyMap) {
private Object parseSchemaProperties(Schema schema, Set<String> refSet, Map<String, Schema> infoMap) {
Map<String, Schema> properties = schema.getProperties();
if (MapUtils.isEmpty(properties)) {
return null;
}
JSONObject jsonObject = new JSONObject();
properties.forEach((key, value) -> {
jsonObject.put(key, parseSchema(value, refSet, binaryKeyMap));
jsonObject.put(key, parseSchema(value, refSet, infoMap));
});
return jsonObject;
}
@ -360,6 +369,6 @@ public class Swagger3Parser extends ApiImportAbstractParser {
private void parseQueryParameters(Parameter parameter, List<KeyValue> arguments) {
QueryParameter queryParameter = (QueryParameter) parameter;
arguments.add(new KeyValue(queryParameter.getName(), "", getDefaultStringValue(queryParameter.getDescription())));
arguments.add(new KeyValue(queryParameter.getName(), "", getDefaultStringValue(queryParameter.getDescription()), parameter.getRequired()));
}
}

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit 068127ce59ea8b016434ed52a9de4a7a4b13bdb4
Subproject commit f27d1609d77f7d6c988d37d709466e844d350e17