diff --git a/demo-one/pom.xml b/demo-one/pom.xml index 9e7fa669..280f07d9 100644 --- a/demo-one/pom.xml +++ b/demo-one/pom.xml @@ -89,7 +89,7 @@ de.codecentric spring-boot-admin-starter-client - ${spring-boot-admin-version} + ${spring-boot-admin.version} org.springframework.cloud diff --git a/demo-one/src/main/resources/static/home.html b/demo-one/src/main/resources/static/home.html index 4111e454..e7599316 100644 --- a/demo-one/src/main/resources/static/home.html +++ b/demo-one/src/main/resources/static/home.html @@ -4,7 +4,7 @@ UNSET - + diff --git a/demo-one/src/main/resources/static/icon/favicon-96x96.png b/demo-one/src/main/resources/static/icon/favicon-96x96.png deleted file mode 100644 index c25832ed..00000000 Binary files a/demo-one/src/main/resources/static/icon/favicon-96x96.png and /dev/null differ diff --git a/demo-one/src/main/resources/static/icon/favicon.ico b/demo-one/src/main/resources/static/icon/favicon.ico index 82449a26..0798d38f 100644 Binary files a/demo-one/src/main/resources/static/icon/favicon.ico and b/demo-one/src/main/resources/static/icon/favicon.ico differ diff --git a/demo-one/src/main/resources/static/video.html b/demo-one/src/main/resources/static/video.html index a8addafb..9a186caa 100644 --- a/demo-one/src/main/resources/static/video.html +++ b/demo-one/src/main/resources/static/video.html @@ -4,7 +4,7 @@ ExRx.net Crawler Server - + diff --git a/demo-two/pom.xml b/demo-two/pom.xml index d83d6ebe..a7a94c7c 100644 --- a/demo-two/pom.xml +++ b/demo-two/pom.xml @@ -89,7 +89,7 @@ de.codecentric spring-boot-admin-starter-client - ${spring-boot-admin-version} + ${spring-boot-admin.version} org.springframework.cloud diff --git a/demo-two/src/main/resources/static/home.html b/demo-two/src/main/resources/static/home.html index 4111e454..e7599316 100644 --- a/demo-two/src/main/resources/static/home.html +++ b/demo-two/src/main/resources/static/home.html @@ -4,7 +4,7 @@ UNSET - + diff --git a/demo-two/src/main/resources/static/icon/favicon-96x96.png b/demo-two/src/main/resources/static/icon/favicon-96x96.png deleted file mode 100644 index c25832ed..00000000 Binary files a/demo-two/src/main/resources/static/icon/favicon-96x96.png and /dev/null differ diff --git a/demo-two/src/main/resources/static/icon/favicon.ico b/demo-two/src/main/resources/static/icon/favicon.ico index 82449a26..0798d38f 100644 Binary files a/demo-two/src/main/resources/static/icon/favicon.ico and b/demo-two/src/main/resources/static/icon/favicon.ico differ diff --git a/demo-two/src/main/resources/static/video.html b/demo-two/src/main/resources/static/video.html index a8addafb..9a186caa 100644 --- a/demo-two/src/main/resources/static/video.html +++ b/demo-two/src/main/resources/static/video.html @@ -4,7 +4,7 @@ ExRx.net Crawler Server - + diff --git a/exercise-mis/pom.xml b/exercise-mis/pom.xml index bcbab31a..d71185f6 100644 --- a/exercise-mis/pom.xml +++ b/exercise-mis/pom.xml @@ -91,7 +91,7 @@ de.codecentric spring-boot-admin-starter-client - ${spring-boot-admin-version} + ${spring-boot-admin.version} org.springframework.cloud diff --git a/exercise-mis/src/main/resources/static/home.html b/exercise-mis/src/main/resources/static/home.html index 4111e454..e7599316 100644 --- a/exercise-mis/src/main/resources/static/home.html +++ b/exercise-mis/src/main/resources/static/home.html @@ -4,7 +4,7 @@ UNSET - + diff --git a/exercise-mis/src/main/resources/static/icon/favicon-96x96.png b/exercise-mis/src/main/resources/static/icon/favicon-96x96.png deleted file mode 100644 index c25832ed..00000000 Binary files a/exercise-mis/src/main/resources/static/icon/favicon-96x96.png and /dev/null differ diff --git a/exercise-mis/src/main/resources/static/icon/favicon.ico b/exercise-mis/src/main/resources/static/icon/favicon.ico index 82449a26..0798d38f 100644 Binary files a/exercise-mis/src/main/resources/static/icon/favicon.ico and b/exercise-mis/src/main/resources/static/icon/favicon.ico differ diff --git a/exercise-mis/src/main/resources/static/video.html b/exercise-mis/src/main/resources/static/video.html index a8addafb..9a186caa 100644 --- a/exercise-mis/src/main/resources/static/video.html +++ b/exercise-mis/src/main/resources/static/video.html @@ -4,7 +4,7 @@ ExRx.net Crawler Server - + diff --git a/gateway/pom.xml b/gateway/pom.xml index d774a338..f4a1ac0a 100644 --- a/gateway/pom.xml +++ b/gateway/pom.xml @@ -106,7 +106,13 @@ de.codecentric spring-boot-admin-starter-client - ${spring-boot-admin-version} + ${spring-boot-admin.version} + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} diff --git a/gateway/src/main/java/com/jmsoftware/gateway/universal/configuration/RedirectConfiguration.java b/gateway/src/main/java/com/jmsoftware/gateway/universal/configuration/RedirectConfiguration.java index c385643c..9bce6ac8 100644 --- a/gateway/src/main/java/com/jmsoftware/gateway/universal/configuration/RedirectConfiguration.java +++ b/gateway/src/main/java/com/jmsoftware/gateway/universal/configuration/RedirectConfiguration.java @@ -46,7 +46,7 @@ public RouterFunction doc() { @Bean public RouterFunction 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/gateway/src/main/java/com/jmsoftware/gateway/universal/configuration/SwaggerResourceProvider.java b/gateway/src/main/java/com/jmsoftware/gateway/universal/configuration/SwaggerResourceProvider.java index 4b31d978..1095775c 100644 --- a/gateway/src/main/java/com/jmsoftware/gateway/universal/configuration/SwaggerResourceProvider.java +++ b/gateway/src/main/java/com/jmsoftware/gateway/universal/configuration/SwaggerResourceProvider.java @@ -18,9 +18,13 @@ * Change description here. *

* https://blog.csdn.net/ttzommed/article/details/81103609 + *

+ * TODO: Refactor this class. * * @author Johnny Miller (鍾俊), email: johnnysviva@outlook.com * @date 2/15/20 5:40 PM + * @see + * 文档聚合业务编码 **/ @Slf4j @Component diff --git a/gateway/src/main/resources/static/home.html b/gateway/src/main/resources/static/home.html index 4111e454..e7599316 100644 --- a/gateway/src/main/resources/static/home.html +++ b/gateway/src/main/resources/static/home.html @@ -4,7 +4,7 @@ UNSET - + diff --git a/gateway/src/main/resources/static/icon/favicon-96x96.png b/gateway/src/main/resources/static/icon/favicon-96x96.png deleted file mode 100644 index c25832ed..00000000 Binary files a/gateway/src/main/resources/static/icon/favicon-96x96.png and /dev/null differ diff --git a/gateway/src/main/resources/static/icon/favicon.ico b/gateway/src/main/resources/static/icon/favicon.ico index 82449a26..0798d38f 100644 Binary files a/gateway/src/main/resources/static/icon/favicon.ico and b/gateway/src/main/resources/static/icon/favicon.ico differ diff --git a/gateway/src/main/resources/static/video.html b/gateway/src/main/resources/static/video.html index a8addafb..9a186caa 100644 --- a/gateway/src/main/resources/static/video.html +++ b/gateway/src/main/resources/static/video.html @@ -4,7 +4,7 @@ ExRx.net Crawler Server - + diff --git a/muscle-mis/pom.xml b/muscle-mis/pom.xml index 25cf2e94..de34ff8c 100644 --- a/muscle-mis/pom.xml +++ b/muscle-mis/pom.xml @@ -90,7 +90,7 @@ de.codecentric spring-boot-admin-starter-client - ${spring-boot-admin-version} + ${spring-boot-admin.version} org.springframework.cloud diff --git a/muscle-mis/src/main/resources/static/home.html b/muscle-mis/src/main/resources/static/home.html index 4111e454..e7599316 100644 --- a/muscle-mis/src/main/resources/static/home.html +++ b/muscle-mis/src/main/resources/static/home.html @@ -4,7 +4,7 @@ UNSET - + diff --git a/muscle-mis/src/main/resources/static/icon/favicon-96x96.png b/muscle-mis/src/main/resources/static/icon/favicon-96x96.png deleted file mode 100644 index c25832ed..00000000 Binary files a/muscle-mis/src/main/resources/static/icon/favicon-96x96.png and /dev/null differ diff --git a/muscle-mis/src/main/resources/static/icon/favicon.ico b/muscle-mis/src/main/resources/static/icon/favicon.ico index 82449a26..0798d38f 100644 Binary files a/muscle-mis/src/main/resources/static/icon/favicon.ico and b/muscle-mis/src/main/resources/static/icon/favicon.ico differ diff --git a/muscle-mis/src/main/resources/static/video.html b/muscle-mis/src/main/resources/static/video.html index a8addafb..9a186caa 100644 --- a/muscle-mis/src/main/resources/static/video.html +++ b/muscle-mis/src/main/resources/static/video.html @@ -4,7 +4,7 @@ ExRx.net Crawler Server - + diff --git a/pom.xml b/pom.xml index bb8a7005..df25fc24 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,9 @@ https://www.linkedin.com/in/ijohnnymiller 11 Hoxton.SR1 - 1.0.0.M5 - 2.2.2 + 1.0.0.M5 + 2.2.2 + 2.0.1 org.springframework.boot @@ -262,21 +263,10 @@ - - io.springfox - springfox-swagger2 - 2.9.2 - - - guava - com.google.guava - - - com.github.xiaoymin - swagger-bootstrap-ui - 1.9.6 + knife4j-micro-spring-boot-starter + ${knife4j.version} diff --git a/service-registry/src/main/resources/static/home.html b/service-registry/src/main/resources/static/home.html index 4111e454..e7599316 100644 --- a/service-registry/src/main/resources/static/home.html +++ b/service-registry/src/main/resources/static/home.html @@ -4,7 +4,7 @@ UNSET - + diff --git a/service-registry/src/main/resources/static/icon/favicon-96x96.png b/service-registry/src/main/resources/static/icon/favicon-96x96.png deleted file mode 100644 index c25832ed..00000000 Binary files a/service-registry/src/main/resources/static/icon/favicon-96x96.png and /dev/null differ diff --git a/service-registry/src/main/resources/static/icon/favicon.ico b/service-registry/src/main/resources/static/icon/favicon.ico index 82449a26..0798d38f 100644 Binary files a/service-registry/src/main/resources/static/icon/favicon.ico and b/service-registry/src/main/resources/static/icon/favicon.ico differ diff --git a/service-registry/src/main/resources/static/video.html b/service-registry/src/main/resources/static/video.html index a8addafb..9a186caa 100644 --- a/service-registry/src/main/resources/static/video.html +++ b/service-registry/src/main/resources/static/video.html @@ -4,7 +4,7 @@ ExRx.net Crawler Server - + diff --git a/spring-boot-admin/pom.xml b/spring-boot-admin/pom.xml index 7ed733d9..b9a2f46b 100644 --- a/spring-boot-admin/pom.xml +++ b/spring-boot-admin/pom.xml @@ -89,7 +89,7 @@ de.codecentric spring-boot-admin-starter-server - ${spring-boot-admin-version} + ${spring-boot-admin.version} diff --git a/spring-boot-admin/src/main/resources/static/home.html b/spring-boot-admin/src/main/resources/static/home.html index 4111e454..e7599316 100644 --- a/spring-boot-admin/src/main/resources/static/home.html +++ b/spring-boot-admin/src/main/resources/static/home.html @@ -4,7 +4,7 @@ UNSET - + 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 deleted file mode 100644 index c25832ed..00000000 Binary files a/spring-boot-admin/src/main/resources/static/icon/favicon-96x96.png and /dev/null differ diff --git a/spring-boot-admin/src/main/resources/static/icon/favicon.ico b/spring-boot-admin/src/main/resources/static/icon/favicon.ico index 82449a26..0798d38f 100644 Binary files a/spring-boot-admin/src/main/resources/static/icon/favicon.ico and b/spring-boot-admin/src/main/resources/static/icon/favicon.ico differ diff --git a/spring-boot-admin/src/main/resources/static/video.html b/spring-boot-admin/src/main/resources/static/video.html index a8addafb..9a186caa 100644 --- a/spring-boot-admin/src/main/resources/static/video.html +++ b/spring-boot-admin/src/main/resources/static/video.html @@ -4,7 +4,7 @@ ExRx.net Crawler Server - +