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

fix(接口测试): swagger导入formdata值处理优化 

--user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001016219
This commit is contained in:
guoyuqi 2022-08-24 17:15:53 +08:00 committed by xiaomeinvG
parent e25f6164af
commit 02fb1f3f67
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger3Parser.java
View File

@ -396,6 +396,9 @@ public class Swagger3Parser extends SwaggerAbstractParser {
if (MapUtils.isEmpty(properties)) return null; if (MapUtils.isEmpty(properties)) return null;
JSONObject jsonObject = new JSONObject(true); JSONObject jsonObject = new JSONObject(true);
properties.forEach((key, value) -> { properties.forEach((key, value) -> {
if (StringUtils.isBlank(value.getName())) {
value.setName(key);
}
jsonObject.put(key, parseSchemaToJson(value, refSet, infoMap)); jsonObject.put(key, parseSchemaToJson(value, refSet, infoMap));
}); });
return jsonObject; return jsonObject;
@ -403,9 +406,18 @@ public class Swagger3Parser extends SwaggerAbstractParser {
private void parseKvBody(Schema schema, Body body, Object data, Map<String, Schema> infoMap) { private void parseKvBody(Schema schema, Body body, Object data, Map<String, Schema> infoMap) {
if (data instanceof JSONObject) { if (data instanceof JSONObject) {
if (MapUtils.isNotEmpty(schema.getProperties())) {
schema.getProperties().forEach((key, value) -> {
if (value instanceof Schema) {
parseKvBodyItem(value, body, key.toString(), infoMap);
}
});
} else {
((JSONObject) data).forEach((k, v) -> { ((JSONObject) data).forEach((k, v) -> {
parseKvBodyItem(schema, body, k, infoMap); parseKvBodyItem(schema, body, k, infoMap);
}); });
}
} else { } else {
if (data instanceof Schema) { if (data instanceof Schema) {
Schema dataSchema = (Schema) data; Schema dataSchema = (Schema) data;
@ -538,7 +550,7 @@ public class Swagger3Parser extends SwaggerAbstractParser {
return example == null ? 0 : example; return example == null ? 0 : example;
} else if (value instanceof NumberSchema) { } else if (value instanceof NumberSchema) {
return example == null ? 0.0 : example; return example == null ? 0.0 : example;
} else if (value instanceof StringSchema || StringUtils.equals("string", value.getType())) { } else if (value instanceof StringSchema || StringUtils.equals("string", value.getType()) || StringUtils.equals("text", value.getType())) {
return example == null ? "" : example; return example == null ? "" : example;
} else {// todo 其他类型? } else {// todo 其他类型?
return getDefaultStringValue(value.getDescription()); return getDefaultStringValue(value.getDescription());