7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-12 07:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.0

Browse Source
This commit is contained in:
tanghc
2019-08-26 17:34:45 +08:00
parent 6408f0e7d2
commit e839692da4
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java
View File

@@ -89,7 +89,8 @@ public class DocDiscovery {
docManager.addDocInfo( docManager.addDocInfo(
serviceName serviceName
, body , body
, callback -> log.info("加载服务文档，instance:{}", instance) , callback -> log.info("加载服务文档，serviceId={}, 机器={}"
, serviceName, instance.getIp() + ":" + instance.getPort())
); );
} }
} }

26
sop-website/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java
View File

@@ -137,12 +137,11 @@ public class SwaggerDocParser implements DocParser {
}) })
.collect(Collectors.groupingBy(DocParameter::getModule)); .collect(Collectors.groupingBy(DocParameter::getModule));
collect.entrySet() collect.forEach((key, value) -> {
.forEach(entry -> {
DocParameter moduleDoc = new DocParameter(); DocParameter moduleDoc = new DocParameter();
moduleDoc.setName(entry.getKey()); moduleDoc.setName(key);
moduleDoc.setType("object"); moduleDoc.setType("object");
moduleDoc.setRefs(entry.getValue()); moduleDoc.setRefs(value);
docParameterList.add(moduleDoc); docParameterList.add(moduleDoc);
}); });
@@ -242,32 +241,29 @@ public class SwaggerDocParser implements DocParser {
return Optional.ofNullable(docInfo.getJSONObject("responses")) return Optional.ofNullable(docInfo.getJSONObject("responses"))
.flatMap(jsonObject -> Optional.ofNullable(jsonObject.getJSONObject("200"))) .flatMap(jsonObject -> Optional.ofNullable(jsonObject.getJSONObject("200")))
.flatMap(jsonObject -> Optional.ofNullable(jsonObject.getJSONObject("schema"))) .flatMap(jsonObject -> Optional.ofNullable(jsonObject.getJSONObject("schema")))
.flatMap(schema -> { .map(this::getRefInfo)
RefInfo refInfo = getRefInfo(schema);
return Optional.ofNullable(refInfo);
})
.orElse(null); .orElse(null);
} }
private RefInfo getRefInfo(JSONObject jsonObject) { private RefInfo getRefInfo(JSONObject jsonObject) {
String $ref; String ref;
boolean isArray = "array".equals(jsonObject.getString("type")); boolean isArray = "array".equals(jsonObject.getString("type"));
if (isArray) { if (isArray) {
$ref = jsonObject.getJSONObject("items").getString("$ref"); ref = jsonObject.getJSONObject("items").getString("$ref");
} else { } else {
// #/definitions/Category // #/definitions/Category
$ref = jsonObject.getString("$ref"); ref = jsonObject.getString("$ref");
} }
if ($ref == null) { if (ref == null) {
return null; return null;
} }
int index = $ref.lastIndexOf("/"); int index = ref.lastIndexOf("/");
if (index > -1) { if (index > -1) {
$ref = $ref.substring(index + 1); ref = ref.substring(index + 1);
} }
RefInfo refInfo = new RefInfo(); RefInfo refInfo = new RefInfo();
refInfo.isArray = isArray; refInfo.isArray = isArray;
refInfo.ref = $ref; refInfo.ref = ref;
return refInfo; return refInfo;
} }