perf($Swagger): use new enhaced generation of Swagger UI; update M&F …

…favicon knife4j-spring-boot-starter knife4j-micro-spring-boot-starter M&F favicon BREAKING CHANGE: use new enhaced generation of Swagger UI; update M&F favicon
johnnymillergh · Feb 25, 2020 · 4b33cde · 4b33cde
1 parent 8b48392
commit 4b33cde
Show file tree

Hide file tree

Showing 37 changed files with 36 additions and 36 deletions.
diff --git a/demo-one/pom.xml b/demo-one/pom.xml
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin-version}</version>
+            <version>${spring-boot-admin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/demo-one/src/main/resources/static/home.html b/demo-one/src/main/resources/static/home.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>UNSET</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/home.css">
 </head>
 <body>

diff --git a/demo-one/src/main/resources/static/icon/favicon-96x96.png b/demo-one/src/main/resources/static/icon/favicon-96x96.png
diff --git a/demo-one/src/main/resources/static/icon/favicon.ico b/demo-one/src/main/resources/static/icon/favicon.ico
diff --git a/demo-one/src/main/resources/static/video.html b/demo-one/src/main/resources/static/video.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ExRx.net Crawler Server</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/video.css">
 </head>
 <body>

diff --git a/demo-two/pom.xml b/demo-two/pom.xml
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin-version}</version>
+            <version>${spring-boot-admin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/demo-two/src/main/resources/static/home.html b/demo-two/src/main/resources/static/home.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>UNSET</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/home.css">
 </head>
 <body>

diff --git a/demo-two/src/main/resources/static/icon/favicon-96x96.png b/demo-two/src/main/resources/static/icon/favicon-96x96.png
diff --git a/demo-two/src/main/resources/static/icon/favicon.ico b/demo-two/src/main/resources/static/icon/favicon.ico
diff --git a/demo-two/src/main/resources/static/video.html b/demo-two/src/main/resources/static/video.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ExRx.net Crawler Server</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/video.css">
 </head>
 <body>

diff --git a/exercise-mis/pom.xml b/exercise-mis/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin-version}</version>
+            <version>${spring-boot-admin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/exercise-mis/src/main/resources/static/home.html b/exercise-mis/src/main/resources/static/home.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>UNSET</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/home.css">
 </head>
 <body>

diff --git a/exercise-mis/src/main/resources/static/icon/favicon-96x96.png b/exercise-mis/src/main/resources/static/icon/favicon-96x96.png
diff --git a/exercise-mis/src/main/resources/static/icon/favicon.ico b/exercise-mis/src/main/resources/static/icon/favicon.ico
diff --git a/exercise-mis/src/main/resources/static/video.html b/exercise-mis/src/main/resources/static/video.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ExRx.net Crawler Server</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/video.css">
 </head>
 <body>

diff --git a/gateway/pom.xml b/gateway/pom.xml
@@ -106,7 +106,13 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin-version}</version>
+            <version>${spring-boot-admin.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>${knife4j.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/...y/src/main/java/com/jmsoftware/gateway/universal/configuration/RedirectConfiguration.java b/...y/src/main/java/com/jmsoftware/gateway/universal/configuration/RedirectConfiguration.java
@@ -46,7 +46,7 @@ public RouterFunction<ServerResponse> doc() {
 
     @Bean
     public RouterFunction<ServerResponse> favicon() {
-        return route(GET("/webjars/bycdao-ui/images/api.ico"), request -> {
+        return route(GET("/favicon.ico"), request -> {
             log.info("Redirect to Bootstrap Swagger API documentation.");
             return ServerResponse.temporaryRedirect(URI.create("/static/icon/favicon.ico")).build();
         });

diff --git a/...src/main/java/com/jmsoftware/gateway/universal/configuration/SwaggerResourceProvider.java b/...src/main/java/com/jmsoftware/gateway/universal/configuration/SwaggerResourceProvider.java
@@ -18,9 +18,13 @@
  * Change description here.
  * <p>
  * https://blog.csdn.net/ttzommed/article/details/81103609
+ * <p>
+ * TODO: Refactor this class.
  *
  * @author Johnny Miller (鍾俊), email: johnnysviva@outlook.com
  * @date 2/15/20 5:40 PM
+ * @see
+ * <a href='https://doc.xiaominfo.com/guide/ui-front-gateway.html#%E6%96%87%E6%A1%A3%E8%81%9A%E5%90%88%E4%B8%9A%E5%8A%A1%E7%BC%96%E7%A0%81'>文档聚合业务编码</a>
  **/
 @Slf4j
 @Component

diff --git a/gateway/src/main/resources/static/home.html b/gateway/src/main/resources/static/home.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>UNSET</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/home.css">
 </head>
 <body>

diff --git a/gateway/src/main/resources/static/icon/favicon-96x96.png b/gateway/src/main/resources/static/icon/favicon-96x96.png
diff --git a/gateway/src/main/resources/static/icon/favicon.ico b/gateway/src/main/resources/static/icon/favicon.ico
diff --git a/gateway/src/main/resources/static/video.html b/gateway/src/main/resources/static/video.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ExRx.net Crawler Server</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/video.css">
 </head>
 <body>

diff --git a/muscle-mis/pom.xml b/muscle-mis/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin-version}</version>
+            <version>${spring-boot-admin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/muscle-mis/src/main/resources/static/home.html b/muscle-mis/src/main/resources/static/home.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>UNSET</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/home.css">
 </head>
 <body>

diff --git a/muscle-mis/src/main/resources/static/icon/favicon-96x96.png b/muscle-mis/src/main/resources/static/icon/favicon-96x96.png
diff --git a/muscle-mis/src/main/resources/static/icon/favicon.ico b/muscle-mis/src/main/resources/static/icon/favicon.ico
diff --git a/muscle-mis/src/main/resources/static/video.html b/muscle-mis/src/main/resources/static/video.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ExRx.net Crawler Server</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/video.css">
 </head>
 <body>

diff --git a/pom.xml b/pom.xml
@@ -17,8 +17,9 @@
         <developerUrl>https://www.linkedin.com/in/ijohnnymiller</developerUrl>
         <java.version>11</java.version>
         <spring-cloud.version>Hoxton.SR1</spring-cloud.version>
-        <spring-content-version>1.0.0.M5</spring-content-version>
-        <spring-boot-admin-version>2.2.2</spring-boot-admin-version>
+        <spring-content.version>1.0.0.M5</spring-content.version>
+        <spring-boot-admin.version>2.2.2</spring-boot-admin.version>
+        <knife4j.version>2.0.1</knife4j.version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -262,21 +263,10 @@
         </dependency>
 
         <!-- Swagger: JSON API documentation for spring based applications -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.6</version>
+            <artifactId>knife4j-micro-spring-boot-starter</artifactId>
+            <version>${knife4j.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/service-registry/src/main/resources/static/home.html b/service-registry/src/main/resources/static/home.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>UNSET</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/home.css">
 </head>
 <body>

diff --git a/service-registry/src/main/resources/static/icon/favicon-96x96.png b/service-registry/src/main/resources/static/icon/favicon-96x96.png
diff --git a/service-registry/src/main/resources/static/icon/favicon.ico b/service-registry/src/main/resources/static/icon/favicon.ico
diff --git a/service-registry/src/main/resources/static/video.html b/service-registry/src/main/resources/static/video.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ExRx.net Crawler Server</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/video.css">
 </head>
 <body>

diff --git a/spring-boot-admin/pom.xml b/spring-boot-admin/pom.xml
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>${spring-boot-admin-version}</version>
+            <version>${spring-boot-admin.version}</version>
         </dependency>
 
         <dependency>

diff --git a/spring-boot-admin/src/main/resources/static/home.html b/spring-boot-admin/src/main/resources/static/home.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>UNSET</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/home.css">
 </head>
 <body>

diff --git a/spring-boot-admin/src/main/resources/static/icon/favicon-96x96.png b/spring-boot-admin/src/main/resources/static/icon/favicon-96x96.png
diff --git a/spring-boot-admin/src/main/resources/static/icon/favicon.ico b/spring-boot-admin/src/main/resources/static/icon/favicon.ico
diff --git a/spring-boot-admin/src/main/resources/static/video.html b/spring-boot-admin/src/main/resources/static/video.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ExRx.net Crawler Server</title>
-    <link rel="icon" type="image/png" sizes="96x96" href="icon/favicon-96x96.png">
+    <link rel="icon" href="icon/favicon.ico">
     <link rel="stylesheet" href="styles/video.css">
 </head>
 <body>