From e839692da485c3dcdf21ee02ead3256335364240 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Mon, 26 Aug 2019 17:34:45 +0800
Subject: [PATCH] 2.0

---
 .../websiteserver/manager/DocDiscovery.java   |  3 +-
 .../manager/SwaggerDocParser.java             | 34 ++++++++-----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java
index 65591599..8cd7b4d3 100644
--- a/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java
+++ b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java
@@ -89,7 +89,8 @@ public class DocDiscovery {
                             docManager.addDocInfo(
                                     serviceName
                                     , body
-                                    , callback -> log.info("加载服务文档，instance:{}", instance)
+                                    , callback -> log.info("加载服务文档，serviceId={}, 机器={}"
+                                            , serviceName, instance.getIp() + ":" + instance.getPort())
                             );
                         }
                     }
diff --git a/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java
index 0d7dc8ae..6bf8a1cc 100644
--- a/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java
+++ b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java
@@ -137,14 +137,13 @@ public class SwaggerDocParser implements DocParser {
                 })
                 .collect(Collectors.groupingBy(DocParameter::getModule));
 
-        collect.entrySet()
-                .forEach(entry -> {
-                    DocParameter moduleDoc = new DocParameter();
-                    moduleDoc.setName(entry.getKey());
-                    moduleDoc.setType("object");
-                    moduleDoc.setRefs(entry.getValue());
-                    docParameterList.add(moduleDoc);
-                });
+        collect.forEach((key, value) -> {
+            DocParameter moduleDoc = new DocParameter();
+            moduleDoc.setName(key);
+            moduleDoc.setType("object");
+            moduleDoc.setRefs(value);
+            docParameterList.add(moduleDoc);
+        });
 
         return docParameterList.stream()
                 .filter(docParameter -> !docParameter.getName().contains("."))
@@ -242,32 +241,29 @@ public class SwaggerDocParser implements DocParser {
         return Optional.ofNullable(docInfo.getJSONObject("responses"))
                 .flatMap(jsonObject -> Optional.ofNullable(jsonObject.getJSONObject("200")))
                 .flatMap(jsonObject -> Optional.ofNullable(jsonObject.getJSONObject("schema")))
-                .flatMap(schema -> {
-                    RefInfo refInfo = getRefInfo(schema);
-                    return Optional.ofNullable(refInfo);
-                })
+                .map(this::getRefInfo)
                 .orElse(null);
     }
 
     private RefInfo getRefInfo(JSONObject jsonObject) {
-        String $ref;
+        String ref;
         boolean isArray = "array".equals(jsonObject.getString("type"));
         if (isArray) {
-            $ref = jsonObject.getJSONObject("items").getString("$ref");
+            ref = jsonObject.getJSONObject("items").getString("$ref");
         } else {
             // #/definitions/Category
-            $ref = jsonObject.getString("$ref");
+            ref = jsonObject.getString("$ref");
         }
-        if ($ref == null) {
+        if (ref == null) {
             return null;
         }
-        int index = $ref.lastIndexOf("/");
+        int index = ref.lastIndexOf("/");
         if (index > -1) {
-            $ref = $ref.substring(index + 1);
+            ref = ref.substring(index + 1);
         }
         RefInfo refInfo = new RefInfo();
         refInfo.isArray = isArray;
-        refInfo.ref = $ref;
+        refInfo.ref = ref;
         return refInfo;
     }