diff --git a/niucloud-core/pom.xml b/niucloud-core/pom.xml index d73d760a..f11e9523 100644 --- a/niucloud-core/pom.xml +++ b/niucloud-core/pom.xml @@ -98,8 +98,12 @@ - io.springfox - springfox-boot-starter + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + + + org.springdoc + springdoc-openapi-starter-webmvc-ui diff --git a/niucloud-core/src/main/java/com/niu/core/common/config/SwaggerConfig.java b/niucloud-core/src/main/java/com/niu/core/common/config/SwaggerConfig.java new file mode 100644 index 00000000..f38ec4e6 --- /dev/null +++ b/niucloud-core/src/main/java/com/niu/core/common/config/SwaggerConfig.java @@ -0,0 +1,25 @@ +package com.niu.core.common.config; + +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public GroupedOpenApi adminApi() { + return GroupedOpenApi.builder() + .group("管理端全部接口") // 分组名称 + .pathsToMatch("/adminapi/**") + .build(); + } + + @Bean + public GroupedOpenApi api() { + return GroupedOpenApi.builder() + .group("客户端全部接口") // 分组名称 + .pathsToMatch("/api/**") + .build(); + } +} diff --git a/niucloud-core/src/main/java/com/niu/core/common/config/executable/filter/WebSiteResourceFilter.java b/niucloud-core/src/main/java/com/niu/core/common/config/executable/filter/WebSiteResourceFilter.java index 2e3d0664..72f73955 100644 --- a/niucloud-core/src/main/java/com/niu/core/common/config/executable/filter/WebSiteResourceFilter.java +++ b/niucloud-core/src/main/java/com/niu/core/common/config/executable/filter/WebSiteResourceFilter.java @@ -69,7 +69,7 @@ public class WebSiteResourceFilter implements Filter { request.getRequestDispatcher("/wap/index.html").forward(request, response); return; } - if (requestUri.startsWith("/web")) { + if (requestUri.startsWith("/web/")) { request.getRequestDispatcher("/web/index.html").forward(request, response); return; } diff --git a/pom.xml b/pom.xml index 7be65edc..1adcede8 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,8 @@ 3.4.1 1.39.0 - 3.0.0 + 4.4.0 + 2.8.6 2.7.2 3.1.5 @@ -78,9 +79,14 @@ - io.springfox - springfox-boot-starter - ${swagger.version} + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + ${knife4j-openapi3.version} + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.version}