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

fix: 接口定义导出为swagger

This commit is contained in:
chenjianxing 2021-04-23 17:56:41 +08:00 committed by jianxing
parent 088e80792f
commit 7d51f5ddef
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,6 +542,9 @@ public class Swagger3Parser extends SwaggerAbstractParser {
} else { // JSONOArray } else { // JSONOArray
parsedParam.put("type", "array"); parsedParam.put("type", "array");
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
if (param == null) {
param = new JSONArray();
}
if(((JSONArray) param).size() > 0) { if(((JSONArray) param).size() > 0) {
if(((JSONArray) param).get(0) instanceof JSONObject) { /// if(((JSONArray) param).get(0) instanceof JSONObject) { ///
item = buildRequestBodyJsonInfo((JSONObject) ((JSONArray) param).get(0)); item = buildRequestBodyJsonInfo((JSONObject) ((JSONArray) param).get(0));
@ -591,11 +594,14 @@ public class Swagger3Parser extends SwaggerAbstractParser {
} }
*/ */
private JSONObject buildResponseBody(JSONObject response) { private JSONObject buildResponseBody(JSONObject response) {
if (response == null) {
return new JSONObject();
}
JSONObject responseBody = new JSONObject(); JSONObject responseBody = new JSONObject();
JSONObject statusCodeInfo = new JSONObject(); JSONObject statusCodeInfo = new JSONObject();
// build 请求头 // build 请求头
JSONObject headers = new JSONObject(); JSONObject headers = new JSONObject();
JSONArray headValueList =response.getJSONArray("headers"); JSONArray headValueList = response.getJSONArray("headers");
if(headValueList != null) { if(headValueList != null) {
for(Object item : headValueList) { for(Object item : headValueList) {
if(item instanceof JSONObject && ((JSONObject) item).getString("name") != null) { if(item instanceof JSONObject && ((JSONObject) item).getString("name") != null) {
@ -654,12 +660,14 @@ public class Swagger3Parser extends SwaggerAbstractParser {
} }
} }
String type = respOrReq.getJSONObject("body").getString("type"); String type = respOrReq.getJSONObject("body").getString("type");
JSONObject content = new JSONObject();
JSONObject schema = bodyInfo; // 请求体部分 JSONObject schema = bodyInfo; // 请求体部分
JSONObject typeName = new JSONObject(); JSONObject typeName = new JSONObject();
schema.put("type", null); if (schema != null) {
schema.put("format", null); schema.put("type", null);
typeName.put("schema", schema); schema.put("format", null);
JSONObject content = new JSONObject(); typeName.put("schema", schema);
}
if (type != null && StringUtils.isNotBlank(type)) { if (type != null && StringUtils.isNotBlank(type)) {
content.put(typeMap.get(type), typeName); content.put(typeMap.get(type), typeName);
} }