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

refactor: 接口导入代码优化

This commit is contained in:
chenjianxing 2021-11-17 20:39:53 +08:00 committed by jianxing
parent 3f5ad742c9
commit 940902225c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/api/dto/definition/parse/Swagger2Parser.java
View File

@ -300,7 +300,7 @@ public class Swagger2Parser extends SwaggerAbstractParser {
item.setType("object"); item.setType("object");
handleRefProperties(item, value, refSet); handleRefProperties(item, value, refSet);
} else { } else {
handleBaseProperties(item, value, refSet); handleBaseProperties(item, value);
} }
if (value.getExample() != null) { if (value.getExample() != null) {
item.getMock().put("mock", value.getExample()); item.getMock().put("mock", value.getExample());
@ -324,12 +324,12 @@ public class Swagger2Parser extends SwaggerAbstractParser {
subItem.setType("object"); subItem.setType("object");
subItem.setProperties(parseSchemaProperties(((ObjectProperty) value).getProperties(), refSet)); subItem.setProperties(parseSchemaProperties(((ObjectProperty) value).getProperties(), refSet));
} else { } else {
handleBaseProperties(subItem, value, refSet); handleBaseProperties(subItem, value);
} }
item.getItems().add(subItem); item.getItems().add(subItem);
} }
private void handleBaseProperties(JsonSchemaItem item, Property value, HashSet<String> refSet) { private void handleBaseProperties(JsonSchemaItem item, Property value) {
if (value instanceof StringProperty || value instanceof DateProperty || value instanceof DateTimeProperty ) { if (value instanceof StringProperty || value instanceof DateProperty || value instanceof DateTimeProperty ) {
item.setType("string"); item.setType("string");
} else if (value instanceof IntegerProperty) { } else if (value instanceof IntegerProperty) {

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

@ -343,17 +343,17 @@ 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) {
((JSONObject) data).forEach((k, v) -> { ((JSONObject) data).forEach((k, v) -> {
_parseKvBody(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;
_parseKvBody(schema, body, dataSchema.getName(), infoMap); parseKvBodyItem(schema, body, dataSchema.getName(), infoMap);
} }
} }
} }
private void _parseKvBody(Object schemaObject, Body body, String name, Map<String, Schema> infoMap) { private void parseKvBodyItem(Object schemaObject, Body body, String name, Map<String, Schema> infoMap) {
Schema schema = (Schema) schemaObject; Schema schema = (Schema) schemaObject;
if (schema == null) return; if (schema == null) return;
KeyValue kv = new KeyValue(name, String.valueOf(schema.getExample() == null ? "" : schema.getExample()), schema.getDescription()); KeyValue kv = new KeyValue(name, String.valueOf(schema.getExample() == null ? "" : schema.getExample()), schema.getDescription());