From 8ddd9a6afb9d9f69ddd1a0a0e7a97d77820d0e2c Mon Sep 17 00:00:00 2001
From: wangchen147 <30853657+wangchen147@users.noreply.github.com>
Date: Sat, 23 Aug 2025 12:18:21 +0800
Subject: [PATCH] Swagger

---
 niucloud-core/pom.xml                         |  8 ++++--
 .../niu/core/common/config/SwaggerConfig.java | 25 +++++++++++++++++++
 .../filter/WebSiteResourceFilter.java         |  2 +-
 pom.xml                                       | 14 ++++++++---
 4 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 niucloud-core/src/main/java/com/niu/core/common/config/SwaggerConfig.java

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 @@
         </dependency>
         <!--swagger3-->
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         </dependency>
         <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
         <dependency>
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 @@
         <!-- 集成框架 -->
         <spring-boot.version>3.4.1</spring-boot.version>
         <spring-boot-satoken.version>1.39.0</spring-boot-satoken.version>
-        <swagger.version>3.0.0</swagger.version>
+        <knife4j-openapi3.version>4.4.0</knife4j-openapi3.version>
+        <springdoc.version>2.8.6</springdoc.version>
         <quartz.version>2.7.2</quartz.version>
         <log4j2.version>3.1.5</log4j2.version>
         <!-- 持久框架 -->
@@ -78,9 +79,14 @@
             <!-- =============================================================================  -->
             <!--swagger3-->
             <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-boot-starter</artifactId>
-                <version>${swagger.version}</version>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+                <version>${knife4j-openapi3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                <version>${springdoc.version}</version>
             </dependency>
 
             <dependency>