2.0.0，升级到支持spring boot 2.0，整合swagger-bootstrap-ui，提供更好看的UI

ZehlaApps · Apr 23, 2019 · a698829 · a698829
1 parent 5c94c29
commit a698829
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Swagger Butler是一个基于Swagger与Zuul构建的API文档汇集工具。通
 
 - 我的博客：http://blog.didispace.com
 - 我们社区：http://www.spring4all.com
-- 知识星球（深度交流与问答）：https://t.xiaomiquan.com/zfEiY3v
+- 知识星球：https://t.xiaomiquan.com/zfEiY3v
 - Spring Boot基础教程：http://blog.didispace.com/Spring-Boot%E5%9F%BA%E7%A1%80%E6%95%99%E7%A8%8B/
 - Spring Cloud基础教程：http://blog.didispace.com/Spring-Cloud%E5%9F%BA%E7%A1%80%E6%95%99%E7%A8%8B/
 - 公益调试Eureka：http://eureka.didispace.com
@@ -32,14 +32,14 @@ Swagger Butler是一个基于Swagger与Zuul构建的API文档汇集工具。通
 <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.10.RELEASE</version>
+    <version>2.0.0.RELEASE</version>
 </parent>
 
 <dependencies>
     <dependency>
         <groupId>com.didispace</groupId>
         <artifactId>swagger-butler-core</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
     </dependency>
 </dependencies>
 ```
@@ -87,9 +87,15 @@ swagger.butler.resources.product.swagger-version=2.0
 - `api-docs-path`：要获取的swagger文档的具体路径；如果不配置会使用全局的`swagger.butler.api-docs-path`配置，默认为`/v2/api-docs`。；这里的配置主要用户一些特殊情况，比如服务自身设置了context-path，或者修改了swagger默认的文档路径
 - `swagger-version`：swagger版本信息；如果不配置会使用全局的`swagger.butler.swagger-version`配置，默认为`2.0`。
 
-**第五步**：访问`http://localhost:11000/swagger-ui.html`
+**第五步**：查看聚合文档。
+
+原生文档：访问`http://localhost:11000/swagger-ui.html`
+
+![Example-1](https://github.com/dyc87112/swagger-butler/blob/master/static/example.png?raw=true)
+
+增强文档：访问`http://localhost:11000/doc.html`
 
-![Example](https://github.com/dyc87112/swagger-butler/blob/master/static/example.png?raw=true)
+![Example-2](https://github.com/dyc87112/swagger-butler/blob/master/static/example-2.png?raw=true)
 
 > 代码示例具体可见`swagger-butler-example-static`目录
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.didispace</groupId>
     <artifactId>swagger-butler</artifactId>
-    <version>1.1.0</version>
+    <version>2.0.0</version>
     <packaging>pom</packaging>
 
     <name>swagger-butler</name>

diff --git a/static/example-2.png b/static/example-2.png
diff --git a/swagger-butler-core/pom.xml b/swagger-butler-core/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.didispace</groupId>
     <artifactId>swagger-butler-core</artifactId>
-    <version>1.2.0</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <name>swagger-butler-core</name>
@@ -33,7 +33,7 @@
 
     <developers>
         <developer>
-            <name>翟永超-程序猿DD</name>
+            <name>程序猿DD</name>
             <email>[email protected]</email>
             <organization>http://didispace.com</organization>
         </developer>
@@ -43,8 +43,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.java>1.8</version.java>
         <version.swagger>2.9.2</version.swagger>
-        <version.spring-boot>1.5.10.RELEASE</version.spring-boot>
-        <version.spring-cloud>Dalston.SR5</version.spring-cloud>
+        <version.spring-boot>2.0.0.RELEASE</version.spring-boot>
+        <version.spring-cloud>Finchley.SR1</version.spring-cloud>
     </properties>
 
     <dependencies>
@@ -61,14 +61,21 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zuul</artifactId>
+            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
             <version>${version.swagger}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>

diff --git a/swagger-butler-example-consul/pom.xml b/swagger-butler-example-consul/pom.xml
@@ -19,19 +19,19 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.didispace</groupId>
             <artifactId>swagger-butler-core</artifactId>
-            <version>1.1.0</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-consul-discovery</artifactId>
-            <version>1.3.2.RELEASE</version>
+            <version>2.0.1.RELEASE</version>
         </dependency>
     </dependencies>
 

diff --git a/swagger-butler-example-eureka/pom.xml b/swagger-butler-example-eureka/pom.xml
@@ -19,19 +19,19 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.didispace</groupId>
             <artifactId>swagger-butler-core</artifactId>
-            <version>1.1.0</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
-            <version>1.3.2.RELEASE</version>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <version>2.0.0.RELEASE</version>
         </dependency>
     </dependencies>
 

diff --git a/swagger-butler-example-static/pom.xml b/swagger-butler-example-static/pom.xml
@@ -19,14 +19,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.10.RELEASE</version>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.didispace</groupId>
             <artifactId>swagger-butler-core</artifactId>
-            <version>1.1.0</version>
+            <version>2.0.0</version>
         </dependency>
     </dependencies>