From e2236b53c7876190074565aa41851e26c25549eb Mon Sep 17 00:00:00 2001
From: xingzi <1771761586@qq.com>
Date: Thu, 9 Jan 2020 20:44:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=BF=E7=9F=AD=E5=90=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../power/doc/builder/DocBuilderTemplate.java |  2 +-
 .../power/doc/builder/PostmanJsonBuilder.java | 30 ++++++++++++-------
 .../SpringMvcRequestAnnotationsEnum.java      |  4 +++
 src/test/java/com/power/doc/ApiDocTest.java   |  2 +-
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/power/doc/builder/DocBuilderTemplate.java b/src/main/java/com/power/doc/builder/DocBuilderTemplate.java
index 6cf8f47..d9a6f83 100644
--- a/src/main/java/com/power/doc/builder/DocBuilderTemplate.java
+++ b/src/main/java/com/power/doc/builder/DocBuilderTemplate.java
@@ -162,7 +162,7 @@ public class DocBuilderTemplate {
     /**
      * Generate a single controller api document
      *
-     * @param outPath        output path
+     * @param projectBuilder projectBuilder
      * @param controllerName controller name
      * @param template       template
      * @param fileExtension  file extension
diff --git a/src/main/java/com/power/doc/builder/PostmanJsonBuilder.java b/src/main/java/com/power/doc/builder/PostmanJsonBuilder.java
index e6f97f3..1751283 100644
--- a/src/main/java/com/power/doc/builder/PostmanJsonBuilder.java
+++ b/src/main/java/com/power/doc/builder/PostmanJsonBuilder.java
@@ -32,16 +32,7 @@ import java.util.List;
  */
 public class PostmanJsonBuilder {
 
-    /**
-     * 构建postman json
-     *
-     * @param config 配置文件
-     */
-    public static void buildPostmanApi(ApiConfig config) {
-        DocBuilderTemplate builderTemplate = new DocBuilderTemplate();
-        builderTemplate.checkAndInit(config);
-        JavaProjectBuilder javaProjectBuilder = new JavaProjectBuilder();
-        ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
+    public static void postManCreate(ApiConfig config,ProjectDocConfigBuilder configBuilder){
         IDocBuildTemplate docBuildTemplate = new SpringBootDocBuildTemplate();
         List<ApiDoc> apiDocList = docBuildTemplate.getApiData(configBuilder);
         RequestItem requestItem = new RequestItem();
@@ -60,6 +51,25 @@ public class PostmanJsonBuilder {
         String data = gson.toJson(requestItem);
         FileUtil.nioWriteFile(data, filePath);
     }
+    /**
+     * 构建postman json
+     *
+     * @param config 配置文件
+     */
+    public static void buildPostmanApi(ApiConfig config) {
+        DocBuilderTemplate builderTemplate = new DocBuilderTemplate();
+        builderTemplate.checkAndInit(config);
+        JavaProjectBuilder javaProjectBuilder = new JavaProjectBuilder();
+        ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
+        postManCreate(config,configBuilder);
+
+    }
+    public static void buildPostmanApi(ApiConfig config,JavaProjectBuilder projectBuilder) {
+        DocBuilderTemplate builderTemplate = new DocBuilderTemplate();
+        builderTemplate.checkAndInit(config);
+        ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, projectBuilder);
+        postManCreate(config,configBuilder);
+    }
 
     /**
      * 第一层的Item
diff --git a/src/main/java/com/power/doc/constants/SpringMvcRequestAnnotationsEnum.java b/src/main/java/com/power/doc/constants/SpringMvcRequestAnnotationsEnum.java
index 7a3ddae..095d5db 100644
--- a/src/main/java/com/power/doc/constants/SpringMvcRequestAnnotationsEnum.java
+++ b/src/main/java/com/power/doc/constants/SpringMvcRequestAnnotationsEnum.java
@@ -9,9 +9,13 @@ import java.util.List;
 public enum SpringMvcRequestAnnotationsEnum {
 
     PATH_VARIABLE("PathVariable"),
+    PATH_VARIABLE_FULLY("org.springframework.web.bind.annotation.PathVariable"),
     REQ_PARAM ("RequestParam"),
+    REQ_PARAM_FULLY("org.springframework.web.bind.annotation.RequestParam"),
     REQUEST_BODY("RequestBody"),
+    REQUEST_BODY_FULLY("org.springframework.web.bind.annotation.RequestBody"),
     REQUEST_HERDER ("RequestHeader"),
+    REQUEST_HERDER_FULLY ("org.springframework.web.bind.annotation.RequestHeader"),
     ;
     private String value;
 
diff --git a/src/test/java/com/power/doc/ApiDocTest.java b/src/test/java/com/power/doc/ApiDocTest.java
index e3c4082..43f6a32 100644
--- a/src/test/java/com/power/doc/ApiDocTest.java
+++ b/src/test/java/com/power/doc/ApiDocTest.java
@@ -70,7 +70,7 @@ public class ApiDocTest {
 
         long start = System.currentTimeMillis();
 //        ApiDocBuilder.builderControllersApi(config);
-        HtmlApiDocBuilder.builderControllersApi(config);
+        //HtmlApiDocBuilder.builderControllersApi(config);
         PostmanJsonBuilder.buildPostmanApi(config);
         long end = System.currentTimeMillis();
         DateTimeUtil.printRunTime(end, start);