diff --git a/README.md b/README.md
index de233cb3..5f308c45 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # 项目简述
 
-项目基于 Spring Boot 2.7 、Spring Security 5.4 、 JWT 、 Redis 、 Mybatis-Plus 、 Knife4j 等技术栈搭建的前后端分离开源权限管理系统。
+项目基于 Spring Boot 3.0 、Spring Security 6.0 、 JWT 、 Redis 、 Mybatis-Plus 、 Knife4j 等技术栈搭建的前后端分离开源权限管理系统。
 
 
 ## 项目特色
-- Spring Boot 2.7 + Vue3 前后端分离单体应用，适合快速开发；
+- Spring Boot 3.0 + Vue3 前后端分离单体应用，适合快速开发；
 - Spring Security + JWT 认证鉴权方案；
 - 基于 RBAC 模型的权限设计，细粒度接口方法、按钮级别权限控制。
 
diff --git a/pom.xml b/pom.xml
index 135810a7..ce3d03db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.6</version>
+        <version>3.0.2</version> <!-- lookup parent from repository -->
         <relativePath/>
     </parent>
 
@@ -21,14 +21,13 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
 
-        <lombok.version>1.18.24</lombok.version>
         <hutool.version>5.7.21</hutool.version>
 
         <mysql.version>8.0.19</mysql.version>
         <druid.version>1.2.4</druid.version>
-        <mybatis-plus.version>3.5.2</mybatis-plus.version>
+        <mybatis-plus.version>3.5.3</mybatis-plus.version>
 
-        <knife4j.version>3.0.2</knife4j.version>
+        <knife4j.version>4.0.0</knife4j.version>
 
         <spring.boot.version>2.7.6</spring.boot.version>
 
@@ -49,7 +48,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -98,7 +97,7 @@
 
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
             <version>${knife4j.version}</version>
         </dependency>
 
@@ -160,20 +159,20 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${parent.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/youlai/system/common/base/BasePageQuery.java b/src/main/java/com/youlai/system/common/base/BasePageQuery.java
index 620ed156..e9c1dac8 100644
--- a/src/main/java/com/youlai/system/common/base/BasePageQuery.java
+++ b/src/main/java/com/youlai/system/common/base/BasePageQuery.java
@@ -1,7 +1,7 @@
 package com.youlai.system.common.base;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -11,12 +11,12 @@ import lombok.Data;
  * @date 2021/2/28
  */
 @Data
-@ApiModel
+@Schema
 public class BasePageQuery {
 
-    @ApiModelProperty(value = "页码", example = "1")
+    @Schema(description = "页码", example = "1")
     private int pageNum = 1;
 
-    @ApiModelProperty(value = "每页记录数", example = "10")
+    @Schema(description = "每页记录数", example = "10")
     private int pageSize = 10;
 }
diff --git a/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java b/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java
index 0d87d9c1..4669cec9 100644
--- a/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java
@@ -18,9 +18,9 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
-import javax.servlet.ServletException;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.servlet.ServletException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import java.sql.SQLSyntaxErrorException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/com/youlai/system/common/util/ResponseUtils.java b/src/main/java/com/youlai/system/common/util/ResponseUtils.java
index 458f7721..d969b1fe 100644
--- a/src/main/java/com/youlai/system/common/util/ResponseUtils.java
+++ b/src/main/java/com/youlai/system/common/util/ResponseUtils.java
@@ -3,10 +3,12 @@ package com.youlai.system.common.util;
 import cn.hutool.json.JSONUtil;
 import com.youlai.system.common.result.Result;
 import com.youlai.system.common.result.ResultCode;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
-import javax.servlet.http.HttpServletResponse;
+// import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
diff --git a/src/main/java/com/youlai/system/config/SecurityConfig.java b/src/main/java/com/youlai/system/config/SecurityConfig.java
index 7df9e20a..66108783 100644
--- a/src/main/java/com/youlai/system/config/SecurityConfig.java
+++ b/src/main/java/com/youlai/system/config/SecurityConfig.java
@@ -57,8 +57,10 @@ public class SecurityConfig {
 
     @Bean
     public WebSecurityCustomizer webSecurityCustomizer() {
-        return (web) -> web.ignoring()
-                .antMatchers("/api/v1/auth/login", "/webjars/**", "/doc.html", "/swagger-resources/**", "/v3/api-docs");
+        return (web) -> web.ignoring().requestMatchers("/api/v1/auth/login", "/webjars/**", "/doc.html",
+                "/swagger-resources/**",
+                "/v3/api-docs/swagger-config",
+                "/v3/api-docs");
     }
 
     @Bean
diff --git a/src/main/java/com/youlai/system/config/SwaggerConfig.java b/src/main/java/com/youlai/system/config/SwaggerConfig.java
index 33154141..2d35b6bd 100644
--- a/src/main/java/com/youlai/system/config/SwaggerConfig.java
+++ b/src/main/java/com/youlai/system/config/SwaggerConfig.java
@@ -1,82 +1,54 @@
 package com.youlai.system.config;
 
-import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
+import cn.hutool.core.util.RandomUtil;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
+
 
 @Configuration
-@EnableSwagger2
 public class SwaggerConfig {
 
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.OAS_30)
-                .apiInfo(apiInfo())
-                .groupName("权限服务")
-                //是否开启 (true 开启  false隐藏。生产环境建议隐藏)
-                //.enable(false)
-                .select()
-                //扫描的路径包,设置basePackage会将包下的所有被@Api标记类的所有方法作为api
-                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
-                //指定路径处理PathSelectors.any()代表所有的路径
-                .paths(PathSelectors.any())
-                .build().securityContexts(CollectionUtil.newArrayList(securityContext()))
-                .securitySchemes(CollectionUtil.newArrayList(apiKey()));
-    }
-
     /**
-     * 配置基本信息
+     * 根据@Tag 上的排序，写入x-order
      *
-     * @return
+     * @return the global open api customizer
      */
     @Bean
-    public ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                //设置文档标题(API名称)
-                .title("SpringBoot单体应用开发文档")
-                //文档描述
-                .description("快速开发文档-接口说明")
-                //版本号
-                .version("1.0.0")
-                //联系人
-                .contact(new Contact("", "http://localhost", ""))
-                .build();
+    public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() {
+        return openApi -> {
+            if (openApi.getTags() != null) {
+                openApi.getTags().forEach(tag -> {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("x-order", RandomUtil.randomInt(0, 100));
+                    tag.setExtensions(map);
+                });
+            }
+            if (openApi.getPaths() != null) {
+                openApi.addExtension("x-test123", "333");
+                openApi.getPaths().addExtension("x-abb", RandomUtil.randomInt(1, 100));
+            }
+
+        };
     }
 
-    private List<SecurityScheme> securitySchemes() {
-        List<SecurityScheme> apiKeyList= new ArrayList<>();
+    @Bean
+    public OpenAPI customOpenAPI() {
+        return new OpenAPI()
+                .info(new Info()
+                        .title("XXX用户系统API")
+                        .version("1.0")
 
-        apiKeyList.add(HttpAuthenticationScheme.JWT_BEARER_BUILDER.name("Authorization").build());
-        return apiKeyList;
+                        .description("Knife4j集成springdoc-openapi示例")
+                        .termsOfService("http://doc.xiaominfo.com")
+                        .license(new License().name("Apache 2.0")
+                                .url("http://doc.xiaominfo.com")));
     }
 
-    private ApiKey apiKey() {
-        return new ApiKey("Authorization", "Authorization", "header");
-    }
-
-    List<SecurityReference> defaultAuth() {
-        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
-        authorizationScopes[0] = authorizationScope;
-        return CollectionUtil.newArrayList(new SecurityReference("Authorization", authorizationScopes));
-    }
-
-    private SecurityContext securityContext() {
-        return SecurityContext.builder()
-                .securityReferences(defaultAuth())
-                //.forPaths(PathSelectors.regex(".*?208.*$"))
-                .build();
-    }
 }
diff --git a/src/main/java/com/youlai/system/config/WebMvcConfig.java b/src/main/java/com/youlai/system/config/WebMvcConfig.java
index 81f05a57..92911c96 100644
--- a/src/main/java/com/youlai/system/config/WebMvcConfig.java
+++ b/src/main/java/com/youlai/system/config/WebMvcConfig.java
@@ -15,9 +15,9 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
 import org.springframework.validation.beanvalidation.SpringConstraintValidatorFactory;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.util.List;
diff --git a/src/main/java/com/youlai/system/controller/AuthController.java b/src/main/java/com/youlai/system/controller/AuthController.java
index 7e56505a..d1cbc950 100644
--- a/src/main/java/com/youlai/system/controller/AuthController.java
+++ b/src/main/java/com/youlai/system/controller/AuthController.java
@@ -4,8 +4,8 @@ package com.youlai.system.controller;
 import com.youlai.system.common.result.Result;
 import com.youlai.system.pojo.dto.TokenResult;
 import com.youlai.system.security.JwtTokenManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation; 
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -13,7 +13,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-@Api(tags = "认证管理")
+@Tag(name = "认证管理")
 @RestController
 @RequestMapping("/api/v1/auth")
 @RequiredArgsConstructor
@@ -21,7 +21,7 @@ public class AuthController {
     private final AuthenticationManager authenticationManager;
     private final JwtTokenManager jwtTokenManager;
 
-    @ApiOperation(value = "登录")
+    @Operation(summary = "登录")
     @PostMapping("/login")
     public Result<TokenResult> login(
             @RequestParam String username,
@@ -41,7 +41,7 @@ public class AuthController {
         return Result.success(tokenResult);
     }
 
-    @ApiOperation(value = "注销")
+    @Operation(summary = "注销")
     @DeleteMapping("/logout")
     public Result login() {
         SecurityContextHolder.clearContext();
diff --git a/src/main/java/com/youlai/system/controller/FileController.java b/src/main/java/com/youlai/system/controller/FileController.java
index ea602b19..a58c34c3 100644
--- a/src/main/java/com/youlai/system/controller/FileController.java
+++ b/src/main/java/com/youlai/system/controller/FileController.java
@@ -3,15 +3,15 @@ package com.youlai.system.controller;
 import com.youlai.system.common.result.Result;
 import com.youlai.system.pojo.vo.file.FileInfo;
 import com.youlai.system.service.FileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation; 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-@Api(tags = "文件接口")
+@Tag(name = "文件接口")
 @RestController
 @RequestMapping("/api/v1/files")
 @RequiredArgsConstructor
@@ -20,19 +20,19 @@ public class FileController {
     private final FileService fileService;
 
     @PostMapping
-    @ApiOperation(value = "文件上传")
+    @Operation(summary = "文件上传")
     public Result<FileInfo> uploadFile(
-            @ApiParam("表单文件对象") @RequestParam(value = "file") MultipartFile file
+            @Parameter(name ="表单文件对象") @RequestParam(value = "file") MultipartFile file
     ) {
         FileInfo fileInfo = fileService.uploadFile(file);
         return Result.success(fileInfo);
     }
 
     @DeleteMapping
-    @ApiOperation(value = "文件删除")
+    @Operation(summary = "文件删除")
     @SneakyThrows
     public Result deleteFile(
-            @ApiParam("文件路径") @RequestParam String filePath
+            @Parameter(name ="文件路径") @RequestParam String filePath
     ) {
         boolean result = fileService.deleteFile(filePath);
         return Result.judge(result);
diff --git a/src/main/java/com/youlai/system/controller/SysDeptController.java b/src/main/java/com/youlai/system/controller/SysDeptController.java
index 7e88115d..18fa6de3 100644
--- a/src/main/java/com/youlai/system/controller/SysDeptController.java
+++ b/src/main/java/com/youlai/system/controller/SysDeptController.java
@@ -6,13 +6,14 @@ import com.youlai.system.pojo.form.DeptForm;
 import com.youlai.system.pojo.query.DeptQuery;
 import com.youlai.system.pojo.vo.dept.DeptVO;
 import com.youlai.system.service.SysDeptService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation; 
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 
 /**
@@ -21,7 +22,7 @@ import java.util.List;
  * @author haoxr
  * @date 2020/11/6
  */
-@Api(tags = "部门接口")
+@Tag(name = "部门接口")
 @RestController
 @RequestMapping("/api/v1/dept")
 @RequiredArgsConstructor
@@ -29,30 +30,30 @@ public class SysDeptController {
 
     private final SysDeptService deptService;
 
-    @ApiOperation(value = "获取部门列表")
+    @Operation(summary = "获取部门列表")
     @GetMapping
     public Result<List<DeptVO>> listDepartments(DeptQuery queryParams) {
         List<DeptVO> list = deptService.listDepartments(queryParams);
         return Result.success(list);
     }
 
-    @ApiOperation(value = "获取部门下拉选项")
+    @Operation(summary = "获取部门下拉选项")
     @GetMapping("/options")
     public Result<List<Option>> listDeptOptions() {
         List<Option> list = deptService.listDeptOptions();
         return Result.success(list);
     }
 
-    @ApiOperation(value = "获取部门详情")
+    @Operation(summary = "获取部门详情")
     @GetMapping("/{deptId}/form")
     public Result<DeptForm> getDeptForm(
-            @ApiParam("部门ID") @PathVariable Long deptId
+            @Parameter(name ="部门ID") @PathVariable Long deptId
     ) {
         DeptForm deptForm = deptService.getDeptForm(deptId);
         return Result.success(deptForm);
     }
 
-    @ApiOperation(value = "新增部门")
+    @Operation(summary = "新增部门")
     @PostMapping
     public Result saveDept(
             @Valid @RequestBody DeptForm formData
@@ -61,7 +62,7 @@ public class SysDeptController {
         return Result.success(id);
     }
 
-    @ApiOperation(value = "修改部门")
+    @Operation(summary = "修改部门")
     @PutMapping(value = "/{deptId}")
     public Result updateDept(
             @PathVariable Long deptId,
@@ -71,10 +72,10 @@ public class SysDeptController {
         return Result.success(deptId);
     }
 
-    @ApiOperation(value = "删除部门")
+    @Operation(summary = "删除部门")
     @DeleteMapping("/{ids}")
     public Result deleteDepartments(
-            @ApiParam("部门ID，多个以英文逗号(,)分割") @PathVariable("ids") String ids
+            @Parameter(name ="部门ID，多个以英文逗号(,)分割") @PathVariable("ids") String ids
     ) {
         boolean result = deptService.deleteByIds(ids);
         return Result.judge(result);
diff --git a/src/main/java/com/youlai/system/controller/SysDictItemController.java b/src/main/java/com/youlai/system/controller/SysDictItemController.java
index da804404..19663801 100644
--- a/src/main/java/com/youlai/system/controller/SysDictItemController.java
+++ b/src/main/java/com/youlai/system/controller/SysDictItemController.java
@@ -7,13 +7,14 @@ import com.youlai.system.pojo.form.DictItemForm;
 import com.youlai.system.pojo.query.DictItemPageQuery;
 import com.youlai.system.pojo.vo.dict.DictItemPageVO;
 import com.youlai.system.service.SysDictItemService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation; 
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-@Api(tags = "字典数据接口")
+@Tag(name = "字典数据接口")
 @RestController
 @RequestMapping("/api/v1/dict/items")
 @RequiredArgsConstructor
@@ -21,7 +22,7 @@ public class SysDictItemController {
 
     private final SysDictItemService dictItemService;
 
-    @ApiOperation(value = "字典数据分页列表")
+    @Operation(summary = "字典数据分页列表")
     @GetMapping("/pages")
     public PageResult<DictItemPageVO> listDictItemPages(
             DictItemPageQuery queryParams
@@ -30,16 +31,16 @@ public class SysDictItemController {
         return PageResult.success(result);
     }
 
-    @ApiOperation(value = "字典数据表单数据")
+    @Operation(summary = "字典数据表单数据")
     @GetMapping("/{id}/form")
     public Result<DictItemForm> getDictItemForm(
-            @ApiParam("字典ID") @PathVariable Long id
+            @Parameter(name ="字典ID") @PathVariable Long id
     ) {
         DictItemForm formData = dictItemService.getDictItemForm(id);
         return Result.success(formData);
     }
 
-    @ApiOperation(value = "新增字典数据")
+    @Operation(summary = "新增字典数据")
     @PostMapping
     public Result saveDictItem(
             @RequestBody DictItemForm DictItemForm
@@ -48,7 +49,7 @@ public class SysDictItemController {
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改字典数据")
+    @Operation(summary = "修改字典数据")
     @PutMapping("/{id}")
     public Result updateDictItem(
             @PathVariable Long id,
@@ -58,10 +59,10 @@ public class SysDictItemController {
         return Result.judge(status);
     }
 
-    @ApiOperation(value = "删除字典")
+    @Operation(summary = "删除字典")
     @DeleteMapping("/{ids}")
     public Result deleteDictItems(
-            @ApiParam("字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
+            @Parameter(name ="字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
     ) {
         boolean result = dictItemService.deleteDictItems(ids);
         return Result.judge(result);
diff --git a/src/main/java/com/youlai/system/controller/SysDictTypeController.java b/src/main/java/com/youlai/system/controller/SysDictTypeController.java
index ded93bb2..2784e112 100644
--- a/src/main/java/com/youlai/system/controller/SysDictTypeController.java
+++ b/src/main/java/com/youlai/system/controller/SysDictTypeController.java
@@ -8,15 +8,16 @@ import com.youlai.system.pojo.form.DictTypeForm;
 import com.youlai.system.pojo.query.DictTypePageQuery;
 import com.youlai.system.pojo.vo.dict.DictTypePageVO;
 import com.youlai.system.service.SysDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation; 
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@Api(tags = "字典类型接口")
+@Tag(name = "字典类型接口")
 @RestController
 @RequestMapping("/api/v1/dict/types")
 @RequiredArgsConstructor
@@ -24,49 +25,49 @@ public class SysDictTypeController {
 
     private final SysDictTypeService dictTypeService;
 
-    @ApiOperation(value = "字典类型分页列表")
+    @Operation(summary = "字典类型分页列表")
     @GetMapping("/pages")
     public PageResult<DictTypePageVO> listDictTypePages(DictTypePageQuery queryParams) {
         Page<DictTypePageVO> result = dictTypeService.listDictTypePages(queryParams);
         return PageResult.success(result);
     }
 
-    @ApiOperation(value = "字典类型表单详情")
+    @Operation(summary = "字典类型表单详情")
     @GetMapping("/{id}/form")
     public Result<DictTypeForm> getDictTypeFormData(
-            @ApiParam("字典ID") @PathVariable Long id
+            @Parameter(name ="字典ID") @PathVariable Long id
     ) {
         DictTypeForm dictTypeForm = dictTypeService.getDictTypeFormData(id);
         return Result.success(dictTypeForm);
     }
 
-    @ApiOperation(value = "新增字典类型")
+    @Operation(summary = "新增字典类型")
     @PostMapping
     public Result saveDictType(@RequestBody DictTypeForm dictTypeForm) {
         boolean result = dictTypeService.saveDictType(dictTypeForm);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改字典类型")
+    @Operation(summary = "修改字典类型")
     @PutMapping("/{id}")
     public Result updateDict(@PathVariable Long id, @RequestBody DictTypeForm dictTypeForm) {
         boolean status = dictTypeService.updateDictType(id, dictTypeForm);
         return Result.judge(status);
     }
 
-    @ApiOperation(value = "删除字典类型")
+    @Operation(summary = "删除字典类型")
     @DeleteMapping("/{ids}")
     public Result deleteDictTypes(
-            @ApiParam("字典类型ID，多个以英文逗号(,)分割") @PathVariable String ids
+            @Parameter(name ="字典类型ID，多个以英文逗号(,)分割") @PathVariable String ids
     ) {
         boolean result = dictTypeService.deleteDictTypes(ids);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "获取字典类型的数据项")
+    @Operation(summary = "获取字典类型的数据项")
     @GetMapping("/{typeCode}/items")
     public Result<List<Option>> listDictItemsByTypeCode(
-            @ApiParam("字典类型编码") @PathVariable String typeCode
+            @Parameter(name ="字典类型编码") @PathVariable String typeCode
     ) {
         List<Option> list = dictTypeService.listDictItemsByTypeCode(typeCode);
         return Result.success(list);
diff --git a/src/main/java/com/youlai/system/controller/SysMenuController.java b/src/main/java/com/youlai/system/controller/SysMenuController.java
index e5a80d48..dace6be3 100644
--- a/src/main/java/com/youlai/system/controller/SysMenuController.java
+++ b/src/main/java/com/youlai/system/controller/SysMenuController.java
@@ -8,9 +8,10 @@ import com.youlai.system.pojo.vo.menu.MenuVO;
 import com.youlai.system.pojo.vo.menu.ResourceVO;
 import com.youlai.system.pojo.vo.menu.RouteVO;
 import com.youlai.system.service.SysMenuService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation; 
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
@@ -25,7 +26,7 @@ import java.util.List;
  * @author haoxr
  * @date 2020/11/06
  */
-@Api(tags = "菜单接口")
+@Tag(name = "菜单接口")
 @RestController
 @RequestMapping("/api/v1/menus")
 @RequiredArgsConstructor
@@ -34,44 +35,44 @@ public class SysMenuController {
 
     private final SysMenuService menuService;
 
-    @ApiOperation(value = "资源(菜单+权限)列表")
+    @Operation(summary = "资源(菜单+权限)列表")
     @GetMapping("/resources")
     public Result<List<ResourceVO>> listResources() {
         List<ResourceVO> resources = menuService.listResources();
         return Result.success(resources);
     }
 
-    @ApiOperation(value = "菜单列表")
+    @Operation(summary = "菜单列表")
     @GetMapping
     public Result listMenus(MenuQuery queryParams) {
         List<MenuVO> menuList = menuService.listMenus(queryParams);
         return Result.success(menuList);
     }
 
-    @ApiOperation(value = "菜单下拉列表")
+    @Operation(summary = "菜单下拉列表")
     @GetMapping("/options")
     public Result listMenuOptions() {
         List<Option> menus = menuService.listMenuOptions();
         return Result.success(menus);
     }
 
-    @ApiOperation(value = "路由列表")
+    @Operation(summary = "路由列表")
     @GetMapping("/routes")
     public Result listRoutes() {
         List<RouteVO> routeList = menuService.listRoutes();
         return Result.success(routeList);
     }
 
-    @ApiOperation(value = "菜单详情")
+    @Operation(summary = "菜单详情")
     @GetMapping("/{id}")
     public Result detail(
-            @ApiParam(value = "菜单ID") @PathVariable Long id
+            @Parameter(name =  "菜单ID") @PathVariable Long id
     ) {
         SysMenu menu = menuService.getById(id);
         return Result.success(menu);
     }
 
-    @ApiOperation(value = "新增菜单")
+    @Operation(summary = "新增菜单")
     @PostMapping
     @CacheEvict(cacheNames = "system", key = "'routes'")
     public Result addMenu(@RequestBody SysMenu menu) {
@@ -79,7 +80,7 @@ public class SysMenuController {
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改菜单")
+    @Operation(summary = "修改菜单")
     @PutMapping(value = "/{id}")
     @CacheEvict(cacheNames = "system", key = "'routes'")
     public Result updateMenu(
@@ -89,21 +90,21 @@ public class SysMenuController {
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "删除菜单")
+    @Operation(summary = "删除菜单")
     @DeleteMapping("/{ids}")
     @CacheEvict(cacheNames = "system", key = "'routes'")
     public Result deleteMenus(
-            @ApiParam("菜单ID，多个以英文(,)分割") @PathVariable("ids") String ids
+            @Parameter(name ="菜单ID，多个以英文(,)分割") @PathVariable("ids") String ids
     ) {
         boolean result = menuService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改菜单显示状态")
+    @Operation(summary = "修改菜单显示状态")
     @PatchMapping("/{menuId}")
     public Result updateMenuVisible(
-            @ApiParam(value = "菜单ID") @PathVariable Long menuId,
-            @ApiParam(value = "显示状态(1:显示;0:隐藏)") Integer visible
+            @Parameter(name =  "菜单ID") @PathVariable Long menuId,
+            @Parameter(name =  "显示状态(1:显示;0:隐藏)") Integer visible
 
     ) {
         boolean result =menuService.updateMenuVisible(menuId, visible);
diff --git a/src/main/java/com/youlai/system/controller/SysRoleController.java b/src/main/java/com/youlai/system/controller/SysRoleController.java
index aa4364fa..a9969aae 100644
--- a/src/main/java/com/youlai/system/controller/SysRoleController.java
+++ b/src/main/java/com/youlai/system/controller/SysRoleController.java
@@ -9,16 +9,17 @@ import com.youlai.system.pojo.form.RoleForm;
 import com.youlai.system.pojo.query.RolePageQuery;
 import com.youlai.system.pojo.vo.role.RolePageVO;
 import com.youlai.system.service.SysRoleService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation; 
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 
-@Api(tags = "角色接口")
+@Tag(name = "角色接口")
 @RestController
 @RequestMapping("/api/v1/roles")
 @RequiredArgsConstructor
@@ -26,72 +27,72 @@ public class SysRoleController {
 
     private final SysRoleService roleService;
 
-    @ApiOperation(value = "角色分页列表")
+    @Operation(summary = "角色分页列表")
     @GetMapping("/pages")
     public PageResult<RolePageVO> listRolePages(RolePageQuery queryParams) {
         Page<RolePageVO> result = roleService.listRolePages(queryParams);
         return PageResult.success(result);
     }
 
-    @ApiOperation(value = "角色下拉列表")
+    @Operation(summary = "角色下拉列表")
     @GetMapping("/options")
     public Result<List<Option>> listRoleOptions() {
         List<Option> list = roleService.listRoleOptions();
         return Result.success(list);
     }
 
-    @ApiOperation(value = "角色详情")
+    @Operation(summary = "角色详情")
     @GetMapping("/{roleId}")
     public Result getRoleDetail(
-            @ApiParam("角色ID") @PathVariable Long roleId
+            @Parameter(name ="角色ID") @PathVariable Long roleId
     ) {
         SysRole role = roleService.getById(roleId);
         return Result.success(role);
     }
 
-    @ApiOperation(value = "新增角色")
+    @Operation(summary = "新增角色")
     @PostMapping
     public Result addRole(@Valid @RequestBody RoleForm roleForm) {
         boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改角色")
+    @Operation(summary = "修改角色")
     @PutMapping(value = "/{id}")
     public Result updateRole(@Valid @RequestBody RoleForm roleForm) {
         boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "删除角色")
+    @Operation(summary = "删除角色")
     @DeleteMapping("/{ids}")
     public Result deleteRoles(
-            @ApiParam("删除角色，多个以英文逗号(,)分割") @PathVariable String ids
+            @Parameter(name ="删除角色，多个以英文逗号(,)分割") @PathVariable String ids
     ) {
         boolean result = roleService.deleteRoles(ids);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改角色状态")
+    @Operation(summary = "修改角色状态")
     @PutMapping(value = "/{roleId}/status")
     public Result updateRoleStatus(
-            @ApiParam("角色ID") @PathVariable Long roleId,
-            @ApiParam("角色状态:1-启用；0-禁用") @RequestParam Integer status
+            @Parameter(name ="角色ID") @PathVariable Long roleId,
+            @Parameter(name ="角色状态:1-启用；0-禁用") @RequestParam Integer status
     ) {
         boolean result = roleService.updateRoleStatus(roleId, status);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "获取角色的菜单ID集合")
+    @Operation(summary = "获取角色的菜单ID集合")
     @GetMapping("/{roleId}/menuIds")
     public Result<List<Long>> getRoleMenuIds(
-            @ApiParam("角色ID") @PathVariable Long roleId
+            @Parameter(name ="角色ID") @PathVariable Long roleId
     ) {
         List<Long> resourceIds = roleService.getRoleMenuIds(roleId);
         return Result.success(resourceIds);
     }
 
-    @ApiOperation(value = "分配角色的资源权限")
+    @Operation(summary = "分配角色的资源权限")
     @PutMapping("/{roleId}/menus")
     public Result updateRoleMenus(
             @PathVariable Long roleId,
diff --git a/src/main/java/com/youlai/system/controller/SysUserController.java b/src/main/java/com/youlai/system/controller/SysUserController.java
index 51e2c16c..4d918644 100644
--- a/src/main/java/com/youlai/system/controller/SysUserController.java
+++ b/src/main/java/com/youlai/system/controller/SysUserController.java
@@ -14,17 +14,18 @@ import com.youlai.system.pojo.vo.user.UserExportVO;
 import com.youlai.system.pojo.vo.user.UserLoginVO;
 import com.youlai.system.pojo.vo.user.UserVO;
 import com.youlai.system.service.SysUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation; 
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,7 +38,7 @@ import java.util.List;
  * @author haoxr
  * @date 2022/10/16
  */
-@Api(tags = "用户接口")
+@Tag(name = "用户接口")
 @RestController
 @RequestMapping("/api/v1/users")
 @RequiredArgsConstructor
@@ -45,23 +46,23 @@ public class SysUserController {
 
     private final SysUserService userService;
 
-    @ApiOperation(value = "用户分页列表")
+    @Operation(summary = "用户分页列表")
     @GetMapping("/pages")
     public PageResult<UserVO> listUserPages(UserPageQuery queryParams) {
         IPage<UserVO> result = userService.listUserPages(queryParams);
         return PageResult.success(result);
     }
 
-    @ApiOperation(value = "用户表单数据")
+    @Operation(summary = "用户表单数据")
     @GetMapping("/{userId}/form")
     public Result<UserForm> getUserDetail(
-            @ApiParam(value = "用户ID") @PathVariable Long userId
+            @Parameter(name =  "用户ID") @PathVariable Long userId
     ) {
         UserForm formData = userService.getUserFormData(userId);
         return Result.success(formData);
     }
 
-    @ApiOperation(value = "新增用户")
+    @Operation(summary = "新增用户")
     @PostMapping
     @PreAuthorize("@pms.hasPermission('sys:user:add')")
     public Result saveUser(
@@ -71,41 +72,41 @@ public class SysUserController {
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改用户")
+    @Operation(summary = "修改用户")
     @PutMapping(value = "/{userId}")
     @PreAuthorize("@pms.hasPermission('sys:user:edit')")
     public Result updateUser(
-            @ApiParam("用户ID") @PathVariable Long userId,
+            @Parameter(name ="用户ID") @PathVariable Long userId,
             @RequestBody @Validated UserForm userForm) {
         boolean result = userService.updateUser(userId, userForm);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "删除用户")
+    @Operation(summary = "删除用户")
     @DeleteMapping("/{ids}")
     @PreAuthorize("@pms.hasPermission('sys:user:delete')")
     public Result deleteUsers(
-            @ApiParam("用户ID，多个以英文逗号(,)分割") @PathVariable String ids
+            @Parameter(name ="用户ID，多个以英文逗号(,)分割") @PathVariable String ids
     ) {
         boolean result = userService.deleteUsers(ids);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改用户密码")
+    @Operation(summary = "修改用户密码")
     @PatchMapping(value = "/{userId}/password")
     public Result updatePassword(
-            @ApiParam("用户ID") @PathVariable Long userId,
+            @Parameter(name ="用户ID") @PathVariable Long userId,
             @RequestParam String password
     ) {
         boolean result = userService.updatePassword(userId, password);
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "修改用户状态")
+    @Operation(summary = "修改用户状态")
     @PatchMapping(value = "/{userId}/status")
     public Result updatePassword(
-            @ApiParam("用户ID") @PathVariable Long userId,
-            @ApiParam("用户状态(1:启用;0:禁用)") @RequestParam Integer status
+            @Parameter(name ="用户ID") @PathVariable Long userId,
+            @Parameter(name ="用户状态(1:启用;0:禁用)") @RequestParam Integer status
     ) {
         boolean result = userService.update(new LambdaUpdateWrapper<SysUser>()
                 .eq(SysUser::getId, userId)
@@ -114,14 +115,14 @@ public class SysUserController {
         return Result.judge(result);
     }
 
-    @ApiOperation(value = "获取登录用户信息")
+    @Operation(summary = "获取登录用户信息")
     @GetMapping("/me")
     public Result<UserLoginVO> getUserLoginInfo() {
         UserLoginVO userLoginVO = userService.getUserLoginInfo();
         return Result.success(userLoginVO);
     }
 
-    @ApiOperation("用户导入模板下载")
+    @Operation(summary ="用户导入模板下载")
     @GetMapping("/template")
     public void downloadTemplate(HttpServletResponse response) throws IOException {
         String fileName = "用户导入模板.xlsx";
@@ -137,14 +138,14 @@ public class SysUserController {
         excelWriter.finish();
     }
 
-    @ApiOperation("导入用户")
+    @Operation(summary ="导入用户")
     @PostMapping("/_import")
     public Result importUsers(UserImportDTO userImportDTO) throws IOException {
         String msg = userService.importUsers(userImportDTO);
         return Result.success(msg);
     }
 
-    @ApiOperation("导出用户")
+    @Operation(summary ="导出用户")
     @GetMapping("/_export")
     public void exportUsers(UserPageQuery queryParams, HttpServletResponse response) throws IOException {
         String fileName = "用户列表.xlsx";
diff --git a/src/main/java/com/youlai/system/pojo/Option.java b/src/main/java/com/youlai/system/pojo/Option.java
index bd70686d..80dcef3c 100644
--- a/src/main/java/com/youlai/system/pojo/Option.java
+++ b/src/main/java/com/youlai/system/pojo/Option.java
@@ -1,8 +1,8 @@
 package com.youlai.system.pojo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @author haoxr
  * @date 2022/1/22
  */
-@ApiModel("下拉选项对象")
+@Schema(description ="下拉选项对象")
 @Data
 @NoArgsConstructor
 public class Option<T> {
@@ -30,10 +30,10 @@ public class Option<T> {
         this.children= children;
     }
 
-    @ApiModelProperty("选项的值")
+    @Schema(description="选项的值")
     private T value;
 
-    @ApiModelProperty("选项的标签")
+    @Schema(description="选项的标签")
     private String label;
 
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
diff --git a/src/main/java/com/youlai/system/pojo/form/DeptForm.java b/src/main/java/com/youlai/system/pojo/form/DeptForm.java
index a12c7479..41dd6abe 100644
--- a/src/main/java/com/youlai/system/pojo/form/DeptForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/DeptForm.java
@@ -1,30 +1,29 @@
 package com.youlai.system.pojo.form;
 
 import com.youlai.system.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
-@ApiModel("部门表单对象")
+@Schema(description = "部门表单对象")
 @Data
 public class DeptForm extends BaseEntity {
 
-    @ApiModelProperty("部门ID(新增不填)")
+    @Schema(description="部门ID(新增不填)")
     private Long id;
 
-    @ApiModelProperty("部门名称")
+    @Schema(description="部门名称")
     private String name;
 
-    @ApiModelProperty("父部门ID")
+    @Schema(description="父部门ID")
     @NotNull(message = "父部门ID不能为空")
     private Long parentId;
 
-    @ApiModelProperty("状态")
+    @Schema(description="状态")
     private Integer status;
 
-    @ApiModelProperty("排序")
+    @Schema(description="排序")
     private Integer sort;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/form/DictItemForm.java b/src/main/java/com/youlai/system/pojo/form/DictItemForm.java
index be6cd07a..908a0c73 100644
--- a/src/main/java/com/youlai/system/pojo/form/DictItemForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/DictItemForm.java
@@ -1,30 +1,31 @@
 package com.youlai.system.pojo.form;
 
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel("字典数据项")
+@Schema(description = "字典数据项")
 @Data
 public class DictItemForm {
 
-    @ApiModelProperty("数据项ID")
+    @Schema(description="数据项ID")
     private Long id;
 
-    @ApiModelProperty("类型编码")
+    @Schema(description="类型编码")
     private String typeCode;
 
-    @ApiModelProperty("数据项名称")
+    @Schema(description="数据项名称")
     private String name;
 
-    @ApiModelProperty("值")
+    @Schema(description="值")
     private String value;
 
-    @ApiModelProperty("状态：1->启用;0->禁用")
+    @Schema(description="状态：1->启用;0->禁用")
     private Integer status;
 
-    @ApiModelProperty("排序")
+    @Schema(description="排序")
     private Integer sort;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/form/DictTypeForm.java b/src/main/java/com/youlai/system/pojo/form/DictTypeForm.java
index 79e7f258..0eac83aa 100644
--- a/src/main/java/com/youlai/system/pojo/form/DictTypeForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/DictTypeForm.java
@@ -1,24 +1,25 @@
 package com.youlai.system.pojo.form;
 
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel("字典类型")
+@Schema(description = "字典类型")
 @Data
 public class DictTypeForm {
 
-    @ApiModelProperty("字典类型ID")
+    @Schema(description="字典类型ID")
     private Long id;
 
-    @ApiModelProperty("类型名称")
+    @Schema(description="类型名称")
     private String name;
 
-    @ApiModelProperty("类型编码")
+    @Schema(description="类型编码")
     private String code;
 
-    @ApiModelProperty("类型状态：1->启用;0->禁用")
+    @Schema(description="类型状态：1->启用;0->禁用")
     private Integer status;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/form/RoleForm.java b/src/main/java/com/youlai/system/pojo/form/RoleForm.java
index 44ed53ed..3df8202a 100644
--- a/src/main/java/com/youlai/system/pojo/form/RoleForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/RoleForm.java
@@ -1,33 +1,33 @@
 package com.youlai.system.pojo.form;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
+// import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
-@ApiModel("角色表单对象")
+@Schema(description = "角色表单对象")
 @Data
 public class RoleForm {
 
-    @ApiModelProperty("角色ID")
+    @Schema(description="角色ID")
     private Long id;
 
-    @ApiModelProperty("角色名称")
+    @Schema(description="角色名称")
     @NotBlank(message = "角色名称不能为空")
     private String name;
 
-    @ApiModelProperty("角色编码")
+    @Schema(description="角色编码")
     @NotBlank(message = "角色编码不能为空")
     private String code;
 
-    @ApiModelProperty("排序")
+    @Schema(description="排序")
     private Integer sort;
 
-    @ApiModelProperty("角色状态(1-正常；0-停用)")
+    @Schema(description="角色状态(1-正常；0-停用)")
     private Integer status;
 
-    @ApiModelProperty("数据权限")
+    @Schema(description="数据权限")
     private Integer dataScope;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java b/src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java
index be1438ba..ff773d47 100644
--- a/src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java
@@ -1,20 +1,20 @@
 package com.youlai.system.pojo.form;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
 
-@ApiModel("菜单资源表单")
+@Schema(description ="菜单资源表单")
 @Data
 public class RoleResourceForm {
 
-    @ApiModelProperty("菜单ID集合")
+    @Schema(description="菜单ID集合")
     private List<Long> menuIds;
 
-    @ApiModelProperty("权限ID集合")
+    @Schema(description="权限ID集合")
     private List<Long> permIds;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/form/UserForm.java b/src/main/java/com/youlai/system/pojo/form/UserForm.java
index bfe5889a..20996037 100644
--- a/src/main/java/com/youlai/system/pojo/form/UserForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/UserForm.java
@@ -1,12 +1,12 @@
 package com.youlai.system.pojo.form;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Pattern;
 import java.util.List;
 
 /**
@@ -15,40 +15,40 @@ import java.util.List;
  * @author haoxr
  * @date 2022/4/12 11:04
  */
-@ApiModel
+@Schema 
 @Data
 public class UserForm {
 
-    @ApiModelProperty("用户ID")
+    @Schema(description="用户ID")
     private Long id;
 
-    @ApiModelProperty("用户名")
+    @Schema(description="用户名")
     @NotBlank(message = "用户名不能为空")
     private String username;
 
-    @ApiModelProperty("昵称")
+    @Schema(description="昵称")
     @NotBlank(message = "昵称不能为空")
     private String nickname;
 
     @Pattern(regexp = "^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$", message = "{phone.valid}")
     private String mobile;
 
-    @ApiModelProperty("性别")
+    @Schema(description="性别")
     private Integer gender;
 
-    @ApiModelProperty("用户头像")
+    @Schema(description="用户头像")
     private String avatar;
 
-    @ApiModelProperty("邮箱")
+    @Schema(description="邮箱")
     private String email;
 
-    @ApiModelProperty("用户状态(1:正常;0:禁用)")
+    @Schema(description="用户状态(1:正常;0:禁用)")
     private Integer status;
 
-    @ApiModelProperty("部门ID")
+    @Schema(description="部门ID")
     private Long deptId;
 
-    @ApiModelProperty("角色ID集合")
+    @Schema(description="角色ID集合")
     @NotEmpty(message = "用户角色不能为空")
     private List<Long> roleIds;
 
diff --git a/src/main/java/com/youlai/system/pojo/query/DeptQuery.java b/src/main/java/com/youlai/system/pojo/query/DeptQuery.java
index 14c206d1..3c2a9576 100644
--- a/src/main/java/com/youlai/system/pojo/query/DeptQuery.java
+++ b/src/main/java/com/youlai/system/pojo/query/DeptQuery.java
@@ -1,7 +1,7 @@
 package com.youlai.system.pojo.query;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -10,14 +10,14 @@ import lombok.Data;
  * @author haoxr
  * @date 2022/6/11
  */
-@ApiModel("部门分页查询对象")
+@Schema(description ="部门分页查询对象")
 @Data
 public class DeptQuery {
 
-    @ApiModelProperty("关键字(部门名称)")
+    @Schema(description="关键字(部门名称)")
     private String keywords;
 
-    @ApiModelProperty("状态(1->正常；0->禁用)")
+    @Schema(description="状态(1->正常；0->禁用)")
     private Integer status;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/query/DictItemPageQuery.java b/src/main/java/com/youlai/system/pojo/query/DictItemPageQuery.java
index a43b72ec..65ef3036 100644
--- a/src/main/java/com/youlai/system/pojo/query/DictItemPageQuery.java
+++ b/src/main/java/com/youlai/system/pojo/query/DictItemPageQuery.java
@@ -2,17 +2,17 @@ package com.youlai.system.pojo.query;
 
 
 import com.youlai.system.common.base.BasePageQuery;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel("字典数据项分页查询对象")
+@Schema(description ="字典数据项分页查询对象")
 @Data
 public class DictItemPageQuery extends BasePageQuery {
 
-    @ApiModelProperty("关键字(字典项名称)")
+    @Schema(description="关键字(字典项名称)")
     private String keywords;
 
-    @ApiModelProperty("字典类型编码")
+    @Schema(description="字典类型编码")
     private String typeCode;
 }
diff --git a/src/main/java/com/youlai/system/pojo/query/DictTypePageQuery.java b/src/main/java/com/youlai/system/pojo/query/DictTypePageQuery.java
index 6e6a2973..12dab815 100644
--- a/src/main/java/com/youlai/system/pojo/query/DictTypePageQuery.java
+++ b/src/main/java/com/youlai/system/pojo/query/DictTypePageQuery.java
@@ -2,15 +2,15 @@ package com.youlai.system.pojo.query;
 
 
 import com.youlai.system.common.base.BasePageQuery;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel("字典类型分页查询对象")
+@Schema(description ="字典类型分页查询对象")
 @Data
 public class DictTypePageQuery extends BasePageQuery {
 
-    @ApiModelProperty("关键字(类型名称/类型编码)")
+    @Schema(description="关键字(类型名称/类型编码)")
     private String keywords;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/query/MenuQuery.java b/src/main/java/com/youlai/system/pojo/query/MenuQuery.java
index b75242dd..d1601b8c 100644
--- a/src/main/java/com/youlai/system/pojo/query/MenuQuery.java
+++ b/src/main/java/com/youlai/system/pojo/query/MenuQuery.java
@@ -1,7 +1,7 @@
 package com.youlai.system.pojo.query;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -10,14 +10,14 @@ import lombok.Data;
  * @author haoxr
  * @date 2022/10/28
  */
-@ApiModel("部门分页查询对象")
+@Schema(description ="部门分页查询对象")
 @Data
 public class MenuQuery {
 
-    @ApiModelProperty("关键字(菜单名称)")
+    @Schema(description="关键字(菜单名称)")
     private String keywords;
 
-    @ApiModelProperty("状态(1->显示；0->隐藏)")
+    @Schema(description="状态(1->显示；0->隐藏)")
     private Integer status;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/query/PermPageQuery.java b/src/main/java/com/youlai/system/pojo/query/PermPageQuery.java
index 4ad84f53..af735b80 100644
--- a/src/main/java/com/youlai/system/pojo/query/PermPageQuery.java
+++ b/src/main/java/com/youlai/system/pojo/query/PermPageQuery.java
@@ -1,8 +1,8 @@
 package com.youlai.system.pojo.query;
 
 import com.youlai.system.common.base.BasePageQuery;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -12,13 +12,13 @@ import lombok.Data;
  * @date 2022/1/14 22:22
  */
 @Data
-@ApiModel
+@Schema 
 public class PermPageQuery extends BasePageQuery {
 
-    @ApiModelProperty("权限名称")
+    @Schema(description="权限名称")
     private String name;
 
-    @ApiModelProperty("菜单ID")
+    @Schema(description="菜单ID")
     private Long menuId;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/query/RolePageQuery.java b/src/main/java/com/youlai/system/pojo/query/RolePageQuery.java
index 04c1edfb..5e2536c6 100644
--- a/src/main/java/com/youlai/system/pojo/query/RolePageQuery.java
+++ b/src/main/java/com/youlai/system/pojo/query/RolePageQuery.java
@@ -1,7 +1,7 @@
 package com.youlai.system.pojo.query;
 
 import com.youlai.system.common.base.BasePageQuery;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -14,6 +14,6 @@ import lombok.Data;
 @Data
 public class RolePageQuery extends BasePageQuery {
 
-    @ApiModelProperty("关键字(角色名称/角色编码)")
+    @Schema(description="关键字(角色名称/角色编码)")
     private String keywords;
 }
diff --git a/src/main/java/com/youlai/system/pojo/query/UserPageQuery.java b/src/main/java/com/youlai/system/pojo/query/UserPageQuery.java
index 3dc213c2..c283b635 100644
--- a/src/main/java/com/youlai/system/pojo/query/UserPageQuery.java
+++ b/src/main/java/com/youlai/system/pojo/query/UserPageQuery.java
@@ -1,8 +1,8 @@
 package com.youlai.system.pojo.query;
 
 import com.youlai.system.common.base.BasePageQuery;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -11,17 +11,17 @@ import lombok.Data;
  * @author haoxr
  * @date 2022/1/14
  */
-@ApiModel
+@Schema 
 @Data
 public class UserPageQuery extends BasePageQuery {
 
-    @ApiModelProperty("关键字(用户名/昵称/手机号)")
+    @Schema(description="关键字(用户名/昵称/手机号)")
     private String keywords;
 
-    @ApiModelProperty("用户状态")
+    @Schema(description="用户状态")
     private Integer status;
 
-    @ApiModelProperty("部门ID")
+    @Schema(description="部门ID")
     private Long deptId;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/dict/DictItemPageVO.java b/src/main/java/com/youlai/system/pojo/vo/dict/DictItemPageVO.java
index a404cfc2..85feda6a 100644
--- a/src/main/java/com/youlai/system/pojo/vo/dict/DictItemPageVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/dict/DictItemPageVO.java
@@ -1,24 +1,24 @@
 package com.youlai.system.pojo.vo.dict;
 
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel("字典数据项分页对象")
+@Schema(description ="字典数据项分页对象")
 @Data
 public class DictItemPageVO {
 
-    @ApiModelProperty("数据项ID")
+    @Schema(description="数据项ID")
     private Long id;
 
-    @ApiModelProperty("数据项名称")
+    @Schema(description="数据项名称")
     private String name;
 
-    @ApiModelProperty("值")
+    @Schema(description="值")
     private String value;
 
-    @ApiModelProperty("类型状态：1->启用;0->禁用")
+    @Schema(description="类型状态：1->启用;0->禁用")
     private Integer status;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/dict/DictTypePageVO.java b/src/main/java/com/youlai/system/pojo/vo/dict/DictTypePageVO.java
index 220354ad..dddf4b59 100644
--- a/src/main/java/com/youlai/system/pojo/vo/dict/DictTypePageVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/dict/DictTypePageVO.java
@@ -1,24 +1,24 @@
 package com.youlai.system.pojo.vo.dict;
 
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel("字典类型")
+@Schema(description ="字典类型")
 @Data
 public class DictTypePageVO {
 
-    @ApiModelProperty("字典类型ID")
+    @Schema(description="字典类型ID")
     private Long id;
 
-    @ApiModelProperty("类型名称")
+    @Schema(description="类型名称")
     private String name;
 
-    @ApiModelProperty("类型编码")
+    @Schema(description="类型编码")
     private String code;
 
-    @ApiModelProperty("类型状态：1->启用;0->禁用")
+    @Schema(description="类型状态：1->启用;0->禁用")
     private Integer status;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java b/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java
index b4f35cb2..cb399fac 100644
--- a/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java
@@ -2,13 +2,13 @@ package com.youlai.system.pojo.vo.menu;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.youlai.system.common.enums.MenuTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
-@ApiModel("菜单视图对象")
+@Schema(description ="菜单视图对象")
 @Data
 public class MenuVO {
 
@@ -32,10 +32,10 @@ public class MenuVO {
 
     private String redirect;
 
-    @ApiModelProperty("菜单类型")
+    @Schema(description="菜单类型")
     private MenuTypeEnum type;
 
-    @ApiModelProperty("按钮权限标识")
+    @Schema(description="按钮权限标识")
     private String perm;
 
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
diff --git a/src/main/java/com/youlai/system/pojo/vo/menu/ResourceVO.java b/src/main/java/com/youlai/system/pojo/vo/menu/ResourceVO.java
index c7c869c5..a29a1a2c 100644
--- a/src/main/java/com/youlai/system/pojo/vo/menu/ResourceVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/menu/ResourceVO.java
@@ -1,23 +1,23 @@
 package com.youlai.system.pojo.vo.menu;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
-@ApiModel("资源(菜单+权限)视图对象")
+@Schema(description ="资源(菜单+权限)视图对象")
 @Data
 public class ResourceVO {
 
-    @ApiModelProperty("选项的值")
+    @Schema(description="选项的值")
     private Long value;
 
-    @ApiModelProperty("选项的标签")
+    @Schema(description="选项的标签")
     private String label;
 
-    @ApiModelProperty("子菜单")
+    @Schema(description="子菜单")
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     private List<ResourceVO> children;
 
diff --git a/src/main/java/com/youlai/system/pojo/vo/perm/PermPageVO.java b/src/main/java/com/youlai/system/pojo/vo/perm/PermPageVO.java
index d46ec5e2..8f9a1cbf 100644
--- a/src/main/java/com/youlai/system/pojo/vo/perm/PermPageVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/perm/PermPageVO.java
@@ -1,7 +1,7 @@
 package com.youlai.system.pojo.vo.perm;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -10,26 +10,26 @@ import lombok.Data;
  * @author haoxr
  * @date 2021/10/30 10:54
  */
-@ApiModel("权限视图对象")
+@Schema(description ="权限视图对象")
 @Data
 public class PermPageVO {
 
-    @ApiModelProperty("权限ID")
+    @Schema(description="权限ID")
     private Long id;
 
-    @ApiModelProperty("权限名称")
+    @Schema(description="权限名称")
     private String name;
 
-    @ApiModelProperty("URL权限标识-服务名称")
+    @Schema(description="URL权限标识-服务名称")
     private String serviceName;
 
-    @ApiModelProperty("URL权限标识-请求标识")
+    @Schema(description="URL权限标识-请求标识")
     private String requestMethod;
 
-    @ApiModelProperty("URL权限标识-请求方式")
+    @Schema(description="URL权限标识-请求方式")
     private String requestPath;
 
-    @ApiModelProperty("按钮权限标识")
+    @Schema(description="按钮权限标识")
     private String btnPerm;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/role/RolePageVO.java b/src/main/java/com/youlai/system/pojo/vo/role/RolePageVO.java
index c5b9123f..d85414e8 100644
--- a/src/main/java/com/youlai/system/pojo/vo/role/RolePageVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/role/RolePageVO.java
@@ -1,29 +1,29 @@
 package com.youlai.system.pojo.vo.role;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@ApiModel("角色分页视图对象")
+@Schema(description ="角色分页视图对象")
 @Data
 public class RolePageVO {
 
-    @ApiModelProperty("角色ID")
+    @Schema(description="角色ID")
     private Long id;
 
-    @ApiModelProperty("角色名称")
+    @Schema(description="角色名称")
     private String name;
 
-    @ApiModelProperty("角色编码")
+    @Schema(description="角色编码")
     private String code;
 
-    @ApiModelProperty("角色状态")
+    @Schema(description="角色状态")
     private Integer status;
 
-    @ApiModelProperty("排序")
+    @Schema(description="排序")
     private Integer sort;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/youlai/system/pojo/vo/user/UserDetailVO.java b/src/main/java/com/youlai/system/pojo/vo/user/UserDetailVO.java
index b3f2ca96..f48434eb 100644
--- a/src/main/java/com/youlai/system/pojo/vo/user/UserDetailVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/user/UserDetailVO.java
@@ -1,7 +1,7 @@
 package com.youlai.system.pojo.vo.user;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -12,38 +12,38 @@ import java.util.List;
  * @author haoxr
  * @date 2022/8/25
  */
-@ApiModel
+@Schema 
 @Data
 public class UserDetailVO {
 
-    @ApiModelProperty("用户ID")
+    @Schema(description="用户ID")
     private Long id;
 
-    @ApiModelProperty("用户名")
+    @Schema(description="用户名")
     private String username;
 
-    @ApiModelProperty("昵称")
+    @Schema(description="昵称")
     private String nickname;
 
-    @ApiModelProperty("")
+    @Schema(description="")
     private String mobile;
 
-    @ApiModelProperty("性别")
+    @Schema(description="性别")
     private Integer gender;
 
-    @ApiModelProperty("用户头像")
+    @Schema(description="用户头像")
     private String avatar;
 
-    @ApiModelProperty("邮箱")
+    @Schema(description="邮箱")
     private String email;
 
-    @ApiModelProperty("用户状态(1:正常;0:禁用)")
+    @Schema(description="用户状态(1:正常;0:禁用)")
     private Integer status;
 
-    @ApiModelProperty("部门ID")
+    @Schema(description="部门ID")
     private Long deptId;
 
-    @ApiModelProperty("角色ID集合")
+    @Schema(description="角色ID集合")
     private List<Long> roleIds;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/user/UserLoginVO.java b/src/main/java/com/youlai/system/pojo/vo/user/UserLoginVO.java
index bf8d25c0..3698f074 100644
--- a/src/main/java/com/youlai/system/pojo/vo/user/UserLoginVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/user/UserLoginVO.java
@@ -1,7 +1,7 @@
 package com.youlai.system.pojo.vo.user;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -13,23 +13,23 @@ import java.util.Set;
  * @author haoxr
  * @date 2022/1/14
  */
-@ApiModel("当前登录用户视图对象")
+@Schema(description ="当前登录用户视图对象")
 @Data
 public class UserLoginVO {
 
-    @ApiModelProperty("用户ID")
+    @Schema(description="用户ID")
     private Long userId;
 
-    @ApiModelProperty("用户昵称")
+    @Schema(description="用户昵称")
     private String nickname;
 
-    @ApiModelProperty("头像地址")
+    @Schema(description="头像地址")
     private String avatar;
 
-    @ApiModelProperty("用户角色编码集合")
+    @Schema(description="用户角色编码集合")
     private Set<String> roles;
 
-    @ApiModelProperty("用户权限标识集合")
+    @Schema(description="用户权限标识集合")
     private Set<String> perms;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/user/UserVO.java b/src/main/java/com/youlai/system/pojo/vo/user/UserVO.java
index c23f8d58..c2780654 100644
--- a/src/main/java/com/youlai/system/pojo/vo/user/UserVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/user/UserVO.java
@@ -1,8 +1,8 @@
 package com.youlai.system.pojo.vo.user;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,41 +13,41 @@ import java.util.Date;
  * @author haoxr
  * @date 2022/1/15 9:41
  */
-@ApiModel("用户分页视图对象")
+@Schema(description ="用户分页视图对象")
 @Data
 public class UserVO {
 
-    @ApiModelProperty("用户ID")
+    @Schema(description="用户ID")
     private Long id;
 
-    @ApiModelProperty("用户名")
+    @Schema(description="用户名")
     private String username;
 
-    @ApiModelProperty("用户昵称")
+    @Schema(description="用户昵称")
     private String nickname;
 
-    @ApiModelProperty("手机号")
+    @Schema(description="手机号")
     private String mobile;
 
-    @ApiModelProperty("性别")
+    @Schema(description="性别")
     private String genderLabel;
 
-    @ApiModelProperty("用户头像地址")
+    @Schema(description="用户头像地址")
     private String avatar;
 
-    @ApiModelProperty("用户邮箱")
+    @Schema(description="用户邮箱")
     private String email;
 
-    @ApiModelProperty("用户状态(1:启用;0:禁用)")
+    @Schema(description="用户状态(1:启用;0:禁用)")
     private Integer status;
 
-    @ApiModelProperty("部门名称")
+    @Schema(description="部门名称")
     private String deptName;
 
-    @ApiModelProperty("角色名称，多个使用英文逗号(,)分割")
+    @Schema(description="角色名称，多个使用英文逗号(,)分割")
     private String roleNames;
 
-    @ApiModelProperty("创建时间")
+    @Schema(description="创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
diff --git a/src/main/java/com/youlai/system/security/JwtTokenManager.java b/src/main/java/com/youlai/system/security/JwtTokenManager.java
index f859a255..edd1554c 100644
--- a/src/main/java/com/youlai/system/security/JwtTokenManager.java
+++ b/src/main/java/com/youlai/system/security/JwtTokenManager.java
@@ -16,7 +16,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java
index f8a9c005..4715e4e1 100644
--- a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java
+++ b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java
@@ -6,8 +6,8 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
diff --git a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java
index 1b03f904..a7a030a7 100644
--- a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java
+++ b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java
@@ -6,9 +6,9 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
diff --git a/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java b/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java
index 0d14ad0a..fb8bd784 100644
--- a/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java
+++ b/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java
@@ -9,10 +9,10 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**