接口同步

Author: zxcvbnmzsedr

apidoc-core/src/main/java/com/ztianzeng/apidoc/utils/RefUtils.java

@@ -1,10 +1,6 @@
 package com.ztianzeng.apidoc.utils;
 
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
 public class RefUtils {
 
     public static String constructRef(String simpleRef) {
@@ -15,15 +11,8 @@ public static String constructRef(String simpleRef, String prefix) {
         return prefix + simpleRef;
     }
 
-    public static Pair extractSimpleName(String ref) {
-        int idx = ref.lastIndexOf("/");
-        if (idx > 0) {
-            String simple = ref.substring(idx + 1);
-            if (!StringUtils.isEmpty(simple)) {
-                return new ImmutablePair<>(simple, ref.substring(0, idx + 1));
-            }
-        }
-        return new ImmutablePair<>(ref, null);
+    public static String getRef(String ref) {
+        return ref.replace("#/components/schemas/", "");
 
     }
 }

apidoc-yapi-plugin/src/main/java/com/ztianzeng/apidoc/yapi/module/KV.java

@@ -0,0 +1,99 @@
+package com.ztianzeng.apidoc.yapi.module;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @description: kv
+ * @author: chengsheng@qbb6.com
+ * @date: 2018/10/27
+ */
+public class KV<K, V> extends LinkedHashMap<K, V> {
+    public <K, V> KV() {
+    }
+
+    public static <K, V> KV by(K key, V value) {
+        return new KV().set(key, value);
+    }
+
+    public static <K, V> KV create() {
+        return new KV();
+    }
+
+    public KV set(K key, V value) {
+        super.put(key, value);
+        return this;
+    }
+
+    public KV set(Map map) {
+        super.putAll(map);
+        return this;
+    }
+
+    public KV set(KV KV) {
+        super.putAll(KV);
+        return this;
+    }
+
+    public KV delete(Object key) {
+        super.remove(key);
+        return this;
+    }
+
+    public <T> T getAs(Object key) {
+        return (T) get(key);
+    }
+
+    public String getStr(Object key) {
+        return (String) get(key);
+    }
+
+    public Integer getInt(Object key) {
+        return (Integer) get(key);
+    }
+
+    public Long getLong(Object key) {
+        return (Long) get(key);
+    }
+
+    public Boolean getBoolean(Object key) {
+        return (Boolean) get(key);
+    }
+
+    public Float getFloat(Object key) {
+        return (Float) get(key);
+    }
+
+
+    /**
+     * key 存在，并且 value 不为 null
+     */
+    public boolean notNull(Object key) {
+        return get(key) != null;
+    }
+
+    /**
+     * key 不存在，或者 key 存在但 value 为null
+     */
+    public boolean isNull(Object key) {
+        return get(key) == null;
+    }
+
+    /**
+     * key 存在，并且 value 为 true，则返回 true
+     */
+    public boolean isTrue(Object key) {
+        Object value = get(key);
+        return (value instanceof Boolean && ((Boolean) value == true));
+    }
+
+    /**
+     * key 存在，并且 value 为 false，则返回 true
+     */
+    public boolean isFalse(Object key) {
+        Object value = get(key);
+        return (value instanceof Boolean && ((Boolean) value == false));
+    }
+
+
+}

apidoc-yapi-plugin/src/main/java/com/ztianzeng/apidoc/yapi/upload/UploadToYapi.java

@@ -6,7 +6,10 @@
 import com.ztianzeng.apidoc.models.OpenAPI;
 import com.ztianzeng.apidoc.models.Operation;
 import com.ztianzeng.apidoc.models.Paths;
+import com.ztianzeng.apidoc.models.media.Schema;
+import com.ztianzeng.apidoc.models.parameters.RequestBody;
 import com.ztianzeng.apidoc.utils.Json;
+import com.ztianzeng.apidoc.utils.RefUtils;
 import com.ztianzeng.apidoc.yapi.constant.YapiConstant;
 import com.ztianzeng.apidoc.yapi.module.*;
 import com.ztianzeng.apidoc.yapi.utils.HttpClientUtil;
@@ -135,19 +138,28 @@ public List<YapiApiDTO> toYapiDTO(OpenAPI openAPI) {
         List<YapiApiDTO> apiDTOS = new ArrayList<>(paths.size());
 
         openAPI.getPaths().forEach((k, v) -> {
-            Operation operation = v.getPost();
-            if (operation == null) {
-                operation = v.getGet();
+            boolean isGet = false;
+            if (v.getPost() == null) {
+                isGet = true;
             }
+            Operation operation = isGet ? v.getGet() : v.getPost();
 
             YapiApiDTO yapiApiDTO = new YapiApiDTO();
             yapiApiDTO.setDesc(operation.getDescription());
 
 
-            yapiApiDTO.setReq_params(operation.getParameters());
             yapiApiDTO.setTag(operation.getTags().stream().findFirst().orElse(""));
             try {
-                yapiApiDTO.setRequestBody(mapper.writeValueAsString(operation.getRequestBody()));
+                if (isGet) {
+                    yapiApiDTO.setReq_params(operation.getParameters());
+                } else {
+
+
+                    yapiApiDTO.setRequestBody(getRequestBOdy(openAPI, operation.getRequestBody()));
+
+                }
+
+
                 yapiApiDTO.setResponse(mapper.writeValueAsString(operation.getResponses()));
             } catch (JsonProcessingException e) {
                 e.printStackTrace();
@@ -230,4 +242,20 @@ private HttpGet getHttpGet(String url) {
         return null;
     }
 
+    public String getRequestBOdy(OpenAPI openAPI, RequestBody requestBody) throws JsonProcessingException {
+        KV kv = KV.create();
+        ;
+        if (StringUtils.isNotBlank(requestBody.getContent().get("application/json").getSchema().get$ref())) {
+            Schema schema = openAPI.getComponents().getSchemas().get(RefUtils.getRef(requestBody.getContent().get("application/json").getSchema().get$ref()));
+
+            kv.set("type", schema.getType());
+            kv.set("description", "1111");
+            kv.set("items", schema.getTitle());
+
+        }
+        return mapper.writeValueAsString(kv);
+
+
+    }
+
 }