From defbb6a93b3f3f50ab08bf0549ad77d8d4deca82 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Sat, 11 Mar 2023 10:57:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=87=8D=E6=9E=84=EF=BC=8C=E4=BC=98=E5=8C=96=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E4=BB=A3=E7=A0=81=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   2 +-
 .../system/common/enums/GenderEnum.java       |   2 +
 .../youlai/system/config/SwaggerConfig.java   |  83 +++++----
 .../system/controller/FileController.java     |  11 +-
 .../system/controller/SysDeptController.java  |  21 ++-
 .../system/controller/SysDictController.java  | 134 ++++++++++++++
 .../controller/SysDictItemController.java     |  71 --------
 .../controller/SysDictTypeController.java     |  77 --------
 .../system/controller/SysMenuController.java  |  60 +++----
 .../system/controller/SysRoleController.java  |  58 +++---
 .../system/controller/SysUserController.java  |  59 ++++---
 ...tItemConverter.java => DictConverter.java} |  14 +-
 .../system/converter/MenuConverter.java       |   8 +-
 .../system/converter/RoleConverter.java       |   6 +-
 ...DictItemMapper.java => SysDictMapper.java} |   4 +-
 .../youlai/system/mapper/SysUserMapper.java   |   4 +-
 .../youlai/system/pojo/dto/LoginResult.java   |   3 +
 .../entity/{SysDictItem.java => SysDict.java} |   5 +-
 .../system/pojo/entity/SysDictType.java       |   7 +-
 .../youlai/system/pojo/entity/SysMenu.java    |  11 +-
 .../form/{DictItemForm.java => DictForm.java} |  17 +-
 .../youlai/system/pojo/form/DictTypeForm.java |   7 +-
 .../com/youlai/system/pojo/form/MenuForm.java |  44 +++++
 .../system/pojo/form/RolePermsForm.java       |  31 ----
 .../system/pojo/form/RoleResourceForm.java    |  20 ---
 .../com/youlai/system/pojo/form/UserForm.java |   2 +-
 ...tItemPageQuery.java => DictPageQuery.java} |   3 +-
 .../youlai/system/pojo/vo/DictItemPageVO.java |  24 ---
 .../com/youlai/system/pojo/vo/DictPageVO.java |  23 +++
 .../youlai/system/pojo/vo/DictTypePageVO.java |   4 +-
 .../com/youlai/system/pojo/vo/FileInfoVO.java |   4 +
 .../youlai/system/pojo/vo/MenuDetailVO.java   |  30 ----
 .../com/youlai/system/pojo/vo/MenuVO.java     |  11 ++
 .../com/youlai/system/pojo/vo/Option.java     |   1 +
 .../com/youlai/system/pojo/vo/ResourceVO.java |  24 ---
 .../com/youlai/system/pojo/vo/RolePageVO.java |   3 +-
 .../com/youlai/system/pojo/vo/RouteVO.java    |  22 ++-
 .../youlai/system/pojo/vo/UserDetailVO.java   |  49 ------
 .../com/youlai/system/pojo/vo/UserPageVO.java |   2 +-
 .../system/service/SysDictItemService.java    |  54 ------
 .../youlai/system/service/SysDictService.java |  68 +++++++
 .../system/service/SysDictTypeService.java    |   4 +-
 .../youlai/system/service/SysRoleService.java |  26 ++-
 .../youlai/system/service/SysUserService.java |   2 +-
 .../service/impl/SysDeptServiceImpl.java      |  24 +--
 .../service/impl/SysDictItemServiceImpl.java  | 142 ---------------
 .../service/impl/SysDictServiceImpl.java      | 166 ++++++++++++++++++
 .../service/impl/SysDictTypeServiceImpl.java  |  26 +--
 .../service/impl/SysRoleServiceImpl.java      |  34 ++--
 .../service/impl/SysUserServiceImpl.java      |   4 +-
 ...ysDictItemMapper.xml => SysDictMapper.xml} |   2 +-
 src/main/resources/mapper/SysUserMapper.xml   |   2 +-
 52 files changed, 739 insertions(+), 776 deletions(-)
 create mode 100644 src/main/java/com/youlai/system/controller/SysDictController.java
 delete mode 100644 src/main/java/com/youlai/system/controller/SysDictItemController.java
 delete mode 100644 src/main/java/com/youlai/system/controller/SysDictTypeController.java
 rename src/main/java/com/youlai/system/converter/{DictItemConverter.java => DictConverter.java} (50%)
 rename src/main/java/com/youlai/system/mapper/{SysDictItemMapper.java => SysDictMapper.java} (56%)
 rename src/main/java/com/youlai/system/pojo/entity/{SysDictItem.java => SysDict.java} (90%)
 rename src/main/java/com/youlai/system/pojo/form/{DictItemForm.java => DictForm.java} (51%)
 create mode 100644 src/main/java/com/youlai/system/pojo/form/MenuForm.java
 delete mode 100644 src/main/java/com/youlai/system/pojo/form/RolePermsForm.java
 delete mode 100644 src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java
 rename src/main/java/com/youlai/system/pojo/query/{DictItemPageQuery.java => DictPageQuery.java} (78%)
 delete mode 100644 src/main/java/com/youlai/system/pojo/vo/DictItemPageVO.java
 create mode 100644 src/main/java/com/youlai/system/pojo/vo/DictPageVO.java
 delete mode 100644 src/main/java/com/youlai/system/pojo/vo/MenuDetailVO.java
 delete mode 100644 src/main/java/com/youlai/system/pojo/vo/ResourceVO.java
 delete mode 100644 src/main/java/com/youlai/system/pojo/vo/UserDetailVO.java
 delete mode 100644 src/main/java/com/youlai/system/service/SysDictItemService.java
 create mode 100644 src/main/java/com/youlai/system/service/SysDictService.java
 delete mode 100644 src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java
 create mode 100644 src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
 rename src/main/resources/mapper/{SysDictItemMapper.xml => SysDictMapper.xml} (73%)

diff --git a/README.md b/README.md
index 49fbdd04..2b6fa9ee 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@
 
 |作用|示例|
 |---|---|
-|分页查询|listUserPages|
+|分页查询|getUserPage|
 |列表查询|listUsers|
 |单个查询|getUser/getUserDetail/getUserInfo ...|
 |新增|saveUser|
diff --git a/src/main/java/com/youlai/system/common/enums/GenderEnum.java b/src/main/java/com/youlai/system/common/enums/GenderEnum.java
index 0b294975..7fb31599 100644
--- a/src/main/java/com/youlai/system/common/enums/GenderEnum.java
+++ b/src/main/java/com/youlai/system/common/enums/GenderEnum.java
@@ -1,6 +1,7 @@
 package com.youlai.system.common.enums;
 
 import com.youlai.system.common.base.IBaseEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 
 /**
@@ -9,6 +10,7 @@ import lombok.Getter;
  * @author haoxr
  * @date 2022/10/14
  */
+@Schema(enumAsRef = true)
 public enum GenderEnum implements IBaseEnum<Integer> {
 
     MALE(1, "男"),
diff --git a/src/main/java/com/youlai/system/config/SwaggerConfig.java b/src/main/java/com/youlai/system/config/SwaggerConfig.java
index aa444e03..5f925405 100644
--- a/src/main/java/com/youlai/system/config/SwaggerConfig.java
+++ b/src/main/java/com/youlai/system/config/SwaggerConfig.java
@@ -1,18 +1,23 @@
 package com.youlai.system.config;
 
-import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.*;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
-import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-import org.springdoc.core.customizers.OperationCustomizer;
+import org.springdoc.core.customizers.OpenApiCustomizer;
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpHeaders;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 /**
- * 接口文档配置
+ * Swagger 配置
+ * <p>
+ * Spring Doc FAQ: https://springdoc.org/#faq
  *
  * @author haoxr
  * @date 2023/2/17
@@ -20,55 +25,47 @@ import org.springframework.http.HttpHeaders;
 @Configuration
 public class SwaggerConfig {
 
+    /**
+     * 接口信息
+     */
+    @Bean
+    public OpenAPI apiInfo() {
+        return new OpenAPI()
+                .components(new Components()
+                        .addSecuritySchemes("Authorization",
+                                new SecurityScheme().type(SecurityScheme.Type.HTTP)
+                                        .scheme("bearer").bearerFormat("JWT")
+                        )
+                )
+                .info(new Info()
+                        .title("youlai-boot 接口文档")
+                        .version("2.0.0")
+                        .description("接口文档")
+                        .license(new License().name("Apache 2.0")
+                                .url("https://www.youlai.tech"))
+                );
+    }
 
     /**
      * 接口分组-系统接口
      *
-     * @param operationCustomizer
      * @return
      */
     @Bean
-    public GroupedOpenApi systemApi(OperationCustomizer operationCustomizer) {
-        return GroupedOpenApi.builder()
-                .group("系统接口")
-                .packagesToScan("com.youlai.system.controller")
-                .pathsToMatch( "/api/**")
-                .addOperationCustomizer(operationCustomizer)
+    public GroupedOpenApi groupedOpenApi() {
+        String paths[] = {"/api/**"};
+
+        String packagesToScan[] = {"com.youlai.system.controller"};
+        return GroupedOpenApi.builder().group("系统接口")
+                .packagesToScan(packagesToScan)
+                .pathsToMatch(paths)
                 .build();
     }
 
-    /**
-     * 鉴权
-     *
-     * @return
-     */
-    @Bean
-    public OperationCustomizer operationCustomizer() {
-        return (operation, handlerMethod) -> operation.addParametersItem(
-                new Parameter()
-                        .in(SecurityScheme.In.HEADER.toString())
-                        .name(HttpHeaders.AUTHORIZATION)
-                        .required(true)
-                        .description("token 校验"));
-    }
 
 
-    /**
-     * 接口信息
-     *
-     * @return
-     */
-    @Bean
-    public OpenAPI apiInfo() {
-        return new OpenAPI().info(
-                new Info()
-                        .title("youlai-boot接口文档")
-                        .version("0.0.1")
-                        .description("youlai-boot接口文档")
-                        .license(new License().name("Apache 2.0")
-                                .url("https://www.youlai.tech")
-                        )
-        );
-    }
+
+
+
 
 }
diff --git a/src/main/java/com/youlai/system/controller/FileController.java b/src/main/java/com/youlai/system/controller/FileController.java
index c6a0fefb..08043cb1 100644
--- a/src/main/java/com/youlai/system/controller/FileController.java
+++ b/src/main/java/com/youlai/system/controller/FileController.java
@@ -4,6 +4,7 @@ import com.youlai.system.common.result.Result;
 import com.youlai.system.pojo.vo.FileInfoVO;
 import com.youlai.system.service.FileService;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation; 
 import lombok.RequiredArgsConstructor;
@@ -11,7 +12,7 @@ import lombok.SneakyThrows;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-@Tag(name = "文件接口")
+@Tag(name = "08.文件接口")
 @RestController
 @RequestMapping("/api/v1/files")
 @RequiredArgsConstructor
@@ -20,19 +21,19 @@ public class FileController {
     private final FileService fileService;
 
     @PostMapping
-    @Operation(summary = "文件上传")
+    @Operation(summary = "文件上传", security = {@SecurityRequirement(name = "Authorization")})
     public Result<FileInfoVO> uploadFile(
-            @Parameter(name ="表单文件对象") @RequestParam(value = "file") MultipartFile file
+            @Parameter(description ="表单文件对象") @RequestParam(value = "file") MultipartFile file
     ) {
         FileInfoVO fileInfoVO = fileService.uploadFile(file);
         return Result.success(fileInfoVO);
     }
 
     @DeleteMapping
-    @Operation(summary = "文件删除")
+    @Operation(summary = "文件删除", security = {@SecurityRequirement(name = "Authorization")})
     @SneakyThrows
     public Result deleteFile(
-            @Parameter(name ="文件路径") @RequestParam String filePath
+            @Parameter(description ="文件路径") @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 9706fa80..a48e0d08 100644
--- a/src/main/java/com/youlai/system/controller/SysDeptController.java
+++ b/src/main/java/com/youlai/system/controller/SysDeptController.java
@@ -7,6 +7,7 @@ import com.youlai.system.pojo.query.DeptQuery;
 import com.youlai.system.pojo.vo.DeptVO;
 import com.youlai.system.service.SysDeptService;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
@@ -22,15 +23,13 @@ import java.util.List;
  * @author haoxr
  * @date 2020/11/6
  */
-@Tag(name = "部门接口")
+@Tag(name = "05.部门接口")
 @RestController
 @RequestMapping("/api/v1/dept")
 @RequiredArgsConstructor
 public class SysDeptController {
-
     private final SysDeptService deptService;
-
-    @Operation(summary = "获取部门列表")
+    @Operation(summary = "获取部门列表", security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping
     public Result<List<DeptVO>> listDepartments(
             @ParameterObject DeptQuery queryParams
@@ -39,23 +38,23 @@ public class SysDeptController {
         return Result.success(list);
     }
 
-    @Operation(summary = "获取部门下拉选项")
+    @Operation(summary = "获取部门下拉选项", security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/options")
     public Result<List<Option>> listDeptOptions() {
         List<Option> list = deptService.listDeptOptions();
         return Result.success(list);
     }
 
-    @Operation(summary = "获取部门详情")
+    @Operation(summary = "获取部门详情", security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/{deptId}/form")
     public Result<DeptForm> getDeptForm(
-            @Parameter(name ="部门ID") @PathVariable Long deptId
+            @Parameter(description ="部门ID") @PathVariable Long deptId
     ) {
         DeptForm deptForm = deptService.getDeptForm(deptId);
         return Result.success(deptForm);
     }
 
-    @Operation(summary = "新增部门")
+    @Operation(summary = "新增部门", security = {@SecurityRequirement(name = "Authorization")})
     @PostMapping
     public Result saveDept(
             @Valid @RequestBody DeptForm formData
@@ -64,7 +63,7 @@ public class SysDeptController {
         return Result.success(id);
     }
 
-    @Operation(summary = "修改部门")
+    @Operation(summary = "修改部门", security = {@SecurityRequirement(name = "Authorization")})
     @PutMapping(value = "/{deptId}")
     public Result updateDept(
             @PathVariable Long deptId,
@@ -74,10 +73,10 @@ public class SysDeptController {
         return Result.success(deptId);
     }
 
-    @Operation(summary = "删除部门")
+    @Operation(summary = "删除部门", security = {@SecurityRequirement(name = "Authorization")})
     @DeleteMapping("/{ids}")
     public Result deleteDepartments(
-            @Parameter(name ="部门ID，多个以英文逗号(,)分割") @PathVariable("ids") String ids
+            @Parameter(description ="部门ID，多个以英文逗号(,)分割") @PathVariable("ids") String ids
     ) {
         boolean result = deptService.deleteByIds(ids);
         return Result.judge(result);
diff --git a/src/main/java/com/youlai/system/controller/SysDictController.java b/src/main/java/com/youlai/system/controller/SysDictController.java
new file mode 100644
index 00000000..fa18e0e8
--- /dev/null
+++ b/src/main/java/com/youlai/system/controller/SysDictController.java
@@ -0,0 +1,134 @@
+package com.youlai.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.system.common.result.PageResult;
+import com.youlai.system.common.result.Result;
+import com.youlai.system.pojo.form.DictForm;
+import com.youlai.system.pojo.form.DictTypeForm;
+import com.youlai.system.pojo.query.DictPageQuery;
+import com.youlai.system.pojo.query.DictTypePageQuery;
+import com.youlai.system.pojo.vo.DictPageVO;
+import com.youlai.system.pojo.vo.DictTypePageVO;
+import com.youlai.system.pojo.vo.Option;
+import com.youlai.system.service.SysDictService;
+import com.youlai.system.service.SysDictTypeService;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Tag(name = "07.字典接口")
+@RestController
+@RequestMapping("/api/v1/dict")
+@RequiredArgsConstructor
+public class SysDictController {
+
+    private final SysDictService dictService;
+
+    private final SysDictTypeService dictTypeService;
+
+    @Operation(summary = "字典分页列表", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/page")
+    public PageResult<DictPageVO> getDictPage(
+            @ParameterObject DictPageQuery queryParams
+    ) {
+        Page<DictPageVO> result = dictService.getDictPage(queryParams);
+        return PageResult.success(result);
+    }
+
+    @Operation(summary = "字典数据表单数据", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/{id}/form")
+    public Result<DictForm> getDictForm(
+            @Parameter(description ="字典ID") @PathVariable Long id
+    ) {
+        DictForm formData = dictService.getDictForm(id);
+        return Result.success(formData);
+    }
+
+    @Operation(summary = "新增字典", security = {@SecurityRequirement(name = "Authorization")})
+    @PostMapping
+    public Result saveDict(
+            @RequestBody DictForm DictForm
+    ) {
+        boolean result = dictService.saveDict(DictForm);
+        return Result.judge(result);
+    }
+
+    @Operation(summary = "修改字典", security = {@SecurityRequirement(name = "Authorization")})
+    @PutMapping("/{id}")
+    public Result updateDict(
+            @PathVariable Long id,
+            @RequestBody DictForm DictForm
+    ) {
+        boolean status = dictService.updateDict(id, DictForm);
+        return Result.judge(status);
+    }
+
+    @Operation(summary = "删除字典", security = {@SecurityRequirement(name = "Authorization")})
+    @DeleteMapping("/{ids}")
+    public Result deleteDict(
+            @Parameter(description ="字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
+    ) {
+        boolean result = dictService.deleteDict(ids);
+        return Result.judge(result);
+    }
+
+
+    @Operation(summary = "字典下拉列表", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/options")
+    public Result<List<Option>> listDictOptions(
+            @Parameter(description ="字典类型编码") @RequestParam String typeCode
+    ) {
+        List<Option> list = dictService.listDictOptions(typeCode);
+        return Result.success(list);
+    }
+
+
+    /*----------------------------------------------------*/
+    @Operation(summary = "字典类型分页列表", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/types/page")
+    public PageResult<DictTypePageVO> getDictTypePage(
+            @ParameterObject DictTypePageQuery queryParams
+    ) {
+        Page<DictTypePageVO> result = dictTypeService.getDictTypePage(queryParams);
+        return PageResult.success(result);
+    }
+
+    @Operation(summary = "字典类型表单数据", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/types/{id}/form")
+    public Result<DictTypeForm> getDictTypeForm(
+            @Parameter(description ="字典ID") @PathVariable Long id
+    ) {
+        DictTypeForm dictTypeForm = dictTypeService.getDictTypeForm(id);
+        return Result.success(dictTypeForm);
+    }
+
+    @Operation(summary = "新增字典类型", security = {@SecurityRequirement(name = "Authorization")})
+    @PostMapping("/types")
+    public Result saveDictType(@RequestBody DictTypeForm dictTypeForm) {
+        boolean result = dictTypeService.saveDictType(dictTypeForm);
+        return Result.judge(result);
+    }
+
+    @Operation(summary = "修改字典类型", security = {@SecurityRequirement(name = "Authorization")})
+    @PutMapping("/types/{id}")
+    public Result updateDictType(@PathVariable Long id, @RequestBody DictTypeForm dictTypeForm) {
+        boolean status = dictTypeService.updateDictType(id, dictTypeForm);
+        return Result.judge(status);
+    }
+
+    @Operation(summary = "删除字典类型", security = {@SecurityRequirement(name = "Authorization")})
+    @DeleteMapping("/{ids}")
+    public Result deleteDictTypes(
+            @Parameter(description ="字典类型ID，多个以英文逗号(,)分割") @PathVariable String ids
+    ) {
+        boolean result = dictTypeService.deleteDictTypes(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
deleted file mode 100644
index 808419ef..00000000
--- a/src/main/java/com/youlai/system/controller/SysDictItemController.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.youlai.system.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.common.result.PageResult;
-import com.youlai.system.common.result.Result;
-import com.youlai.system.pojo.form.DictItemForm;
-import com.youlai.system.pojo.query.DictItemPageQuery;
-import com.youlai.system.pojo.vo.DictItemPageVO;
-import com.youlai.system.service.SysDictItemService;
-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 org.springdoc.core.annotations.ParameterObject;
-import org.springframework.web.bind.annotation.*;
-
-@Tag(name = "字典数据接口")
-@RestController
-@RequestMapping("/api/v1/dict/items")
-@RequiredArgsConstructor
-public class SysDictItemController {
-
-    private final SysDictItemService dictItemService;
-
-    @Operation(summary = "字典数据分页列表")
-    @GetMapping("/pages")
-    public PageResult<DictItemPageVO> listDictItemPages(
-            @ParameterObject DictItemPageQuery queryParams
-    ) {
-        Page<DictItemPageVO> result = dictItemService.listDictItemPages(queryParams);
-        return PageResult.success(result);
-    }
-
-    @Operation(summary = "字典数据表单数据")
-    @GetMapping("/{id}/form")
-    public Result<DictItemForm> getDictItemForm(
-            @Parameter(name ="字典ID") @PathVariable Long id
-    ) {
-        DictItemForm formData = dictItemService.getDictItemForm(id);
-        return Result.success(formData);
-    }
-
-    @Operation(summary = "新增字典数据")
-    @PostMapping
-    public Result saveDictItem(
-            @RequestBody DictItemForm DictItemForm
-    ) {
-        boolean result = dictItemService.saveDictItem(DictItemForm);
-        return Result.judge(result);
-    }
-
-    @Operation(summary = "修改字典数据")
-    @PutMapping("/{id}")
-    public Result updateDictItem(
-            @PathVariable Long id,
-            @RequestBody DictItemForm DictItemForm
-    ) {
-        boolean status = dictItemService.updateDictItem(id, DictItemForm);
-        return Result.judge(status);
-    }
-
-    @Operation(summary = "删除字典")
-    @DeleteMapping("/{ids}")
-    public Result deleteDictItems(
-            @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
deleted file mode 100644
index a87a246c..00000000
--- a/src/main/java/com/youlai/system/controller/SysDictTypeController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.youlai.system.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.pojo.vo.Option;
-import com.youlai.system.common.result.PageResult;
-import com.youlai.system.common.result.Result;
-import com.youlai.system.pojo.form.DictTypeForm;
-import com.youlai.system.pojo.query.DictTypePageQuery;
-import com.youlai.system.pojo.vo.DictTypePageVO;
-import com.youlai.system.service.SysDictTypeService;
-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 org.springdoc.core.annotations.ParameterObject;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Tag(name = "字典类型接口")
-@RestController
-@RequestMapping("/api/v1/dict/types")
-@RequiredArgsConstructor
-public class SysDictTypeController {
-
-    private final SysDictTypeService dictTypeService;
-
-    @Operation(summary = "字典类型分页列表")
-    @GetMapping("/pages")
-    public PageResult<DictTypePageVO> listDictTypePages(
-            @ParameterObject DictTypePageQuery queryParams
-    ) {
-        Page<DictTypePageVO> result = dictTypeService.listDictTypePages(queryParams);
-        return PageResult.success(result);
-    }
-
-    @Operation(summary = "字典类型表单详情")
-    @GetMapping("/{id}/form")
-    public Result<DictTypeForm> getDictTypeFormData(
-            @Parameter(name ="字典ID") @PathVariable Long id
-    ) {
-        DictTypeForm dictTypeForm = dictTypeService.getDictTypeFormData(id);
-        return Result.success(dictTypeForm);
-    }
-
-    @Operation(summary = "新增字典类型")
-    @PostMapping
-    public Result saveDictType(@RequestBody DictTypeForm dictTypeForm) {
-        boolean result = dictTypeService.saveDictType(dictTypeForm);
-        return Result.judge(result);
-    }
-
-    @Operation(summary = "修改字典类型")
-    @PutMapping("/{id}")
-    public Result updateDict(@PathVariable Long id, @RequestBody DictTypeForm dictTypeForm) {
-        boolean status = dictTypeService.updateDictType(id, dictTypeForm);
-        return Result.judge(status);
-    }
-
-    @Operation(summary = "删除字典类型")
-    @DeleteMapping("/{ids}")
-    public Result deleteDictTypes(
-            @Parameter(name ="字典类型ID，多个以英文逗号(,)分割") @PathVariable String ids
-    ) {
-        boolean result = dictTypeService.deleteDictTypes(ids);
-        return Result.judge(result);
-    }
-
-    @Operation(summary = "获取字典类型的数据项")
-    @GetMapping("/{typeCode}/items")
-    public Result<List<Option>> listDictItemsByTypeCode(
-            @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 cea2622a..0581140c 100644
--- a/src/main/java/com/youlai/system/controller/SysMenuController.java
+++ b/src/main/java/com/youlai/system/controller/SysMenuController.java
@@ -1,14 +1,15 @@
 package com.youlai.system.controller;
 
+import com.youlai.system.pojo.form.MenuForm;
 import com.youlai.system.pojo.vo.Option;
 import com.youlai.system.common.result.Result;
 import com.youlai.system.pojo.entity.SysMenu;
 import com.youlai.system.pojo.query.MenuQuery;
 import com.youlai.system.pojo.vo.MenuVO;
-import com.youlai.system.pojo.vo.ResourceVO;
 import com.youlai.system.pojo.vo.RouteVO;
 import com.youlai.system.service.SysMenuService;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
@@ -26,7 +27,7 @@ import java.util.List;
  * @author haoxr
  * @date 2020/11/06
  */
-@Tag(name = "菜单接口")
+@Tag(name = "04.菜单接口")
 @RestController
 @RequestMapping("/api/v1/menus")
 @RequiredArgsConstructor
@@ -35,76 +36,69 @@ public class SysMenuController {
 
     private final SysMenuService menuService;
 
-    @Operation(summary = "资源(菜单+权限)列表")
-    @GetMapping("/resources")
-    public Result<List<ResourceVO>> listResources() {
-        List<ResourceVO> resources = menuService.listResources();
-        return Result.success(resources);
-    }
-
-    @Operation(summary = "菜单列表")
+    @Operation(summary = "菜单列表",security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping
-    public Result listMenus( @ParameterObject MenuQuery queryParams) {
+    public Result<List<MenuVO>> listMenus( @ParameterObject MenuQuery queryParams) {
         List<MenuVO> menuList = menuService.listMenus(queryParams);
         return Result.success(menuList);
     }
 
-    @Operation(summary = "菜单下拉列表")
+    @Operation(summary = "菜单下拉列表",security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/options")
     public Result listMenuOptions() {
         List<Option> menus = menuService.listMenuOptions();
         return Result.success(menus);
     }
 
-    @Operation(summary = "路由列表")
+    @Operation(summary = "路由列表",security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/routes")
-    public Result listRoutes() {
+    public Result<List<RouteVO>> listRoutes() {
         List<RouteVO> routeList = menuService.listRoutes();
         return Result.success(routeList);
     }
 
-    @Operation(summary = "菜单详情")
-    @GetMapping("/{id}")
-    public Result detail(
-            @Parameter(name =  "菜单ID") @PathVariable Long id
+    @Operation(summary = "菜单表单数据",security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/{id}/form")
+    public Result<MenuForm> getMenuForm(
+            @Parameter(description =  "菜单ID") @PathVariable Long id
     ) {
-        SysMenu menu = menuService.getById(id);
+        MenuForm menu = menuService.getMenuForm(id);
         return Result.success(menu);
     }
 
-    @Operation(summary = "新增菜单")
+    @Operation(summary = "新增菜单",security = {@SecurityRequirement(name = "Authorization")})
     @PostMapping
     @CacheEvict(cacheNames = "system", key = "'routes'")
-    public Result addMenu(@RequestBody SysMenu menu) {
-        boolean result = menuService.saveMenu(menu);
+    public Result addMenu(@RequestBody MenuForm menuForm) {
+        boolean result = menuService.saveMenu(menuForm);
         return Result.judge(result);
     }
 
-    @Operation(summary = "修改菜单")
+    @Operation(summary = "修改菜单",security = {@SecurityRequirement(name = "Authorization")})
     @PutMapping(value = "/{id}")
     @CacheEvict(cacheNames = "system", key = "'routes'")
     public Result updateMenu(
-            @RequestBody SysMenu menu
+            @RequestBody MenuForm menuForm
     ) {
-        boolean result = menuService.saveMenu(menu);
+        boolean result = menuService.saveMenu(menuForm);
         return Result.judge(result);
     }
 
-    @Operation(summary = "删除菜单")
-    @DeleteMapping("/{ids}")
+    @Operation(summary = "删除菜单",security = {@SecurityRequirement(name = "Authorization")})
+    @DeleteMapping("/{id}")
     @CacheEvict(cacheNames = "system", key = "'routes'")
-    public Result deleteMenus(
-            @Parameter(name ="菜单ID，多个以英文(,)分割") @PathVariable("ids") String ids
+    public Result deleteMenu(
+            @Parameter(description ="菜单ID，多个以英文(,)分割") @PathVariable("id") Long id
     ) {
-        boolean result = menuService.removeByIds(Arrays.asList(ids.split(",")));
+        boolean result = menuService.deleteMenu(id);
         return Result.judge(result);
     }
 
-    @Operation(summary = "修改菜单显示状态")
+    @Operation(summary = "修改菜单显示状态",security = {@SecurityRequirement(name = "Authorization")})
     @PatchMapping("/{menuId}")
     public Result updateMenuVisible(
-            @Parameter(name =  "菜单ID") @PathVariable Long menuId,
-            @Parameter(name =  "显示状态(1:显示;0:隐藏)") Integer visible
+            @Parameter(description =  "菜单ID") @PathVariable Long menuId,
+            @Parameter(description =  "显示状态(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 23ad0f55..f79a492c 100644
--- a/src/main/java/com/youlai/system/controller/SysRoleController.java
+++ b/src/main/java/com/youlai/system/controller/SysRoleController.java
@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.system.pojo.vo.Option;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
-import com.youlai.system.pojo.entity.SysRole;
 import com.youlai.system.pojo.form.RoleForm;
 import com.youlai.system.pojo.query.RolePageQuery;
 import com.youlai.system.pojo.vo.RolePageVO;
 import com.youlai.system.service.SysRoleService;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
 import java.util.List;
 
-@Tag(name = "角色接口")
+@Tag(name = "03.角色接口")
 @RestController
 @RequestMapping("/api/v1/roles")
 @RequiredArgsConstructor
@@ -27,74 +27,74 @@ public class SysRoleController {
 
     private final SysRoleService roleService;
 
-    @Operation(summary = "角色分页列表")
-    @GetMapping("/pages")
-    public PageResult<RolePageVO> listRolePages(
+    @Operation(summary = "角色分页列表",security = {@SecurityRequirement(name = "Authorization")} )
+    @GetMapping("/page")
+    public PageResult<RolePageVO> getRolePage(
             @ParameterObject RolePageQuery queryParams
     ) {
-        Page<RolePageVO> result = roleService.listRolePages(queryParams);
+        Page<RolePageVO> result = roleService.getRolePage(queryParams);
         return PageResult.success(result);
     }
 
-    @Operation(summary = "角色下拉列表")
+    @Operation(summary = "角色下拉列表",security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/options")
     public Result<List<Option>> listRoleOptions() {
         List<Option> list = roleService.listRoleOptions();
         return Result.success(list);
     }
-
-    @Operation(summary = "角色详情")
-    @GetMapping("/{roleId}")
-    public Result getRoleDetail(
-            @Parameter(name ="角色ID") @PathVariable Long roleId
-    ) {
-        SysRole role = roleService.getById(roleId);
-        return Result.success(role);
-    }
-
-    @Operation(summary = "新增角色")
+ 
+    @Operation(summary = "新增角色",security = {@SecurityRequirement(name = "Authorization")})
     @PostMapping
     public Result addRole(@Valid @RequestBody RoleForm roleForm) {
         boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);
     }
 
-    @Operation(summary = "修改角色")
+    @Operation(summary = "角色表单数据",security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/{roleId}/form")
+    public Result<RoleForm> getRoleForm(
+            @Parameter(description ="角色ID") @PathVariable Long roleId
+    ) {
+        RoleForm roleForm = roleService.getRoleForm(roleId);
+        return Result.success(roleForm);
+    }
+
+    @Operation(summary = "修改角色",security = {@SecurityRequirement(name = "Authorization")})
     @PutMapping(value = "/{id}")
     public Result updateRole(@Valid @RequestBody RoleForm roleForm) {
         boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);
     }
 
-    @Operation(summary = "删除角色")
+    @Operation(summary = "删除角色",security = {@SecurityRequirement(name = "Authorization")})
     @DeleteMapping("/{ids}")
     public Result deleteRoles(
-            @Parameter(name ="删除角色，多个以英文逗号(,)分割") @PathVariable String ids
+            @Parameter(description ="删除角色，多个以英文逗号(,)分割") @PathVariable String ids
     ) {
         boolean result = roleService.deleteRoles(ids);
         return Result.judge(result);
     }
 
-    @Operation(summary = "修改角色状态")
+    @Operation(summary = "修改角色状态",security = {@SecurityRequirement(name = "Authorization")})
     @PutMapping(value = "/{roleId}/status")
     public Result updateRoleStatus(
-            @Parameter(name ="角色ID") @PathVariable Long roleId,
-            @Parameter(name ="角色状态:1-启用；0-禁用") @RequestParam Integer status
+            @Parameter(description ="角色ID") @PathVariable Long roleId,
+            @Parameter(description ="状态(1:启用;0:禁用)") @RequestParam Integer status
     ) {
         boolean result = roleService.updateRoleStatus(roleId, status);
         return Result.judge(result);
     }
 
-    @Operation(summary = "获取角色的菜单ID集合")
+    @Operation(summary = "获取角色的菜单ID集合",security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/{roleId}/menuIds")
     public Result<List<Long>> getRoleMenuIds(
-            @Parameter(name ="角色ID") @PathVariable Long roleId
+            @Parameter(description ="角色ID") @PathVariable Long roleId
     ) {
-        List<Long> resourceIds = roleService.getRoleMenuIds(roleId);
-        return Result.success(resourceIds);
+        List<Long> menuIds = roleService.getRoleMenuIds(roleId);
+        return Result.success(menuIds);
     }
 
-    @Operation(summary = "分配角色的资源权限")
+    @Operation(summary = "分配菜单权限给角色",security = {@SecurityRequirement(name = "Authorization")})
     @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 d8abb02d..566a4b6e 100644
--- a/src/main/java/com/youlai/system/controller/SysUserController.java
+++ b/src/main/java/com/youlai/system/controller/SysUserController.java
@@ -17,6 +17,7 @@ import com.youlai.system.pojo.vo.UserInfoVO;
 import com.youlai.system.pojo.vo.UserPageVO;
 import com.youlai.system.service.SysUserService;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
@@ -42,7 +43,7 @@ import java.util.List;
  * @author haoxr
  * @date 2022/10/16
  */
-@Tag(name = "用户接口")
+@Tag(name = "02.用户接口")
 @RestController
 @RequestMapping("/api/v1/users")
 @RequiredArgsConstructor
@@ -50,25 +51,16 @@ public class SysUserController {
 
     private final SysUserService userService;
 
-    @Operation(summary = "用户分页列表")
-    @GetMapping("/pages")
-    public PageResult<UserPageVO> listUserPages(
+    @Operation(summary = "用户分页列表", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/page")
+    public PageResult<UserPageVO> getUserPage(
             @ParameterObject UserPageQuery queryParams
     ) {
-        IPage<UserPageVO> result = userService.listUserPages(queryParams);
+        IPage<UserPageVO> result = userService.getUserPage(queryParams);
         return PageResult.success(result);
     }
 
-    @Operation(summary = "用户表单数据")
-    @GetMapping("/{userId}/form")
-    public Result<UserForm> getUserForm(
-            @Parameter(name = "用户ID") @PathVariable Long userId
-    ) {
-        UserForm formData = userService.getUserFormData(userId);
-        return Result.success(formData);
-    }
-
-    @Operation(summary = "新增用户")
+    @Operation(summary = "新增用户", security = {@SecurityRequirement(name = "Authorization")})
     @PostMapping
     @PreAuthorize("@pms.hasPermission('sys:user:add')")
     public Result saveUser(
@@ -78,41 +70,50 @@ public class SysUserController {
         return Result.judge(result);
     }
 
-    @Operation(summary = "修改用户")
+    @Operation(summary = "用户表单数据", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/{userId}/form")
+    public Result<UserForm> getUserForm(
+            @Parameter(description = "用户ID") @PathVariable Long userId
+    ) {
+        UserForm formData = userService.getUserFormData(userId);
+        return Result.success(formData);
+    }
+
+    @Operation(summary = "修改用户", security = {@SecurityRequirement(name = "Authorization")})
     @PutMapping(value = "/{userId}")
     @PreAuthorize("@pms.hasPermission('sys:user:edit')")
     public Result updateUser(
-            @Parameter(name = "用户ID") @PathVariable Long userId,
+            @Parameter(description = "用户ID") @PathVariable Long userId,
             @RequestBody @Validated UserForm userForm) {
         boolean result = userService.updateUser(userId, userForm);
         return Result.judge(result);
     }
 
-    @Operation(summary = "删除用户")
+    @Operation(summary = "删除用户", security = {@SecurityRequirement(name = "Authorization")})
     @DeleteMapping("/{ids}")
     @PreAuthorize("@pms.hasPermission('sys:user:delete')")
     public Result deleteUsers(
-            @Parameter(name = "用户ID，多个以英文逗号(,)分割") @PathVariable String ids
+            @Parameter(description = "用户ID，多个以英文逗号(,)分割") @PathVariable String ids
     ) {
         boolean result = userService.deleteUsers(ids);
         return Result.judge(result);
     }
 
-    @Operation(summary = "修改用户密码")
+    @Operation(summary = "修改用户密码", security = {@SecurityRequirement(name = "Authorization")})
     @PatchMapping(value = "/{userId}/password")
     public Result updatePassword(
-            @Parameter(name = "用户ID") @PathVariable Long userId,
+            @Parameter(description = "用户ID") @PathVariable Long userId,
             @RequestParam String password
     ) {
         boolean result = userService.updatePassword(userId, password);
         return Result.judge(result);
     }
 
-    @Operation(summary = "修改用户状态")
+    @Operation(summary = "修改用户状态", security = {@SecurityRequirement(name = "Authorization")})
     @PatchMapping(value = "/{userId}/status")
     public Result updatePassword(
-            @Parameter(name = "用户ID") @PathVariable Long userId,
-            @Parameter(name = "用户状态(1:启用;0:禁用)") @RequestParam Integer status
+            @Parameter(description = "用户ID") @PathVariable Long userId,
+            @Parameter(description = "用户状态(1:启用;0:禁用)") @RequestParam Integer status
     ) {
         boolean result = userService.update(new LambdaUpdateWrapper<SysUser>()
                 .eq(SysUser::getId, userId)
@@ -121,14 +122,14 @@ public class SysUserController {
         return Result.judge(result);
     }
 
-    @Operation(summary = "获取当前登录用户信息")
+    @Operation(summary = "获取当前登录用户信息", security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/me")
     public Result<UserInfoVO> getUserLoginInfo() {
         UserInfoVO userInfoVO = userService.getUserLoginInfo();
         return Result.success(userInfoVO);
     }
 
-    @Operation(summary = "用户导入模板下载")
+    @Operation(summary = "用户导入模板下载", security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/template")
     public void downloadTemplate(HttpServletResponse response) throws IOException {
         String fileName = "用户导入模板.xlsx";
@@ -144,15 +145,15 @@ public class SysUserController {
         excelWriter.finish();
     }
 
-    @Operation(summary = "导入用户")
+    @Operation(summary = "导入用户", security = {@SecurityRequirement(name = "Authorization")})
     @PostMapping("/_import")
-    public Result importUsers(@Parameter(name = "部门ID") Long deptId, MultipartFile file) throws IOException {
+    public Result importUsers(@Parameter(description = "部门ID") Long deptId, MultipartFile file) throws IOException {
         UserImportListener listener = new UserImportListener(deptId);
         String msg = ExcelUtils.importExcel(file.getInputStream(), UserImportVO.class, listener);
         return Result.success(msg);
     }
 
-    @Operation(summary = "导出用户")
+    @Operation(summary = "导出用户", security = {@SecurityRequirement(name = "Authorization")})
     @GetMapping("/_export")
     public void exportUsers(UserPageQuery queryParams, HttpServletResponse response) throws IOException {
         String fileName = "用户列表.xlsx";
diff --git a/src/main/java/com/youlai/system/converter/DictItemConverter.java b/src/main/java/com/youlai/system/converter/DictConverter.java
similarity index 50%
rename from src/main/java/com/youlai/system/converter/DictItemConverter.java
rename to src/main/java/com/youlai/system/converter/DictConverter.java
index 01b2df63..235c6eca 100644
--- a/src/main/java/com/youlai/system/converter/DictItemConverter.java
+++ b/src/main/java/com/youlai/system/converter/DictConverter.java
@@ -1,9 +1,9 @@
 package com.youlai.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.pojo.entity.SysDictItem;
-import com.youlai.system.pojo.form.DictItemForm;
-import com.youlai.system.pojo.vo.DictItemPageVO;
+import com.youlai.system.pojo.entity.SysDict;
+import com.youlai.system.pojo.form.DictForm;
+import com.youlai.system.pojo.vo.DictPageVO;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 
@@ -14,12 +14,12 @@ import org.mapstruct.Mapper;
  * @date 2022/6/8
  */
 @Mapper(componentModel = "spring")
-public interface DictItemConverter {
+public interface DictConverter {
 
-    Page<DictItemPageVO> entity2Page(Page<SysDictItem> page);
+    Page<DictPageVO> entity2Page(Page<SysDict> page);
 
-    DictItemForm entity2Form(SysDictItem entity);
+    DictForm entity2Form(SysDict entity);
 
     @InheritInverseConfiguration(name="entity2Form")
-    SysDictItem form2Entity(DictItemForm entity);
+    SysDict form2Entity(DictForm entity);
 }
diff --git a/src/main/java/com/youlai/system/converter/MenuConverter.java b/src/main/java/com/youlai/system/converter/MenuConverter.java
index a74c737d..b8ca47e5 100644
--- a/src/main/java/com/youlai/system/converter/MenuConverter.java
+++ b/src/main/java/com/youlai/system/converter/MenuConverter.java
@@ -1,6 +1,7 @@
 package com.youlai.system.converter;
 
 import com.youlai.system.pojo.entity.SysMenu;
+import com.youlai.system.pojo.form.MenuForm;
 import com.youlai.system.pojo.vo.MenuVO;
 import org.mapstruct.Mapper;
 
@@ -13,6 +14,11 @@ import org.mapstruct.Mapper;
 @Mapper(componentModel = "spring")
 public interface MenuConverter {
 
-    MenuVO entity2VO(SysMenu entity);
+    MenuVO entity2Vo(SysMenu entity);
+
+
+    MenuForm entity2Form(SysMenu entity);
+
+    SysMenu form2Entity(MenuForm menuForm);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/system/converter/RoleConverter.java b/src/main/java/com/youlai/system/converter/RoleConverter.java
index ef1a9742..262fd6d0 100644
--- a/src/main/java/com/youlai/system/converter/RoleConverter.java
+++ b/src/main/java/com/youlai/system/converter/RoleConverter.java
@@ -26,10 +26,12 @@ public interface RoleConverter {
             @Mapping(target = "value", source = "id"),
             @Mapping(target = "label", source = "name")
     })
-    Option role2Option(SysRole role);
+    Option entity2Option(SysRole role);
 
 
-    List<Option> roles2Options(List<SysRole> roles);
+    List<Option> entities2Options(List<SysRole> roles);
 
     SysRole form2Entity(RoleForm roleForm);
+
+    RoleForm entity2Form(SysRole entity);
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/system/mapper/SysDictItemMapper.java b/src/main/java/com/youlai/system/mapper/SysDictMapper.java
similarity index 56%
rename from src/main/java/com/youlai/system/mapper/SysDictItemMapper.java
rename to src/main/java/com/youlai/system/mapper/SysDictMapper.java
index bfa9df2f..888546fe 100644
--- a/src/main/java/com/youlai/system/mapper/SysDictItemMapper.java
+++ b/src/main/java/com/youlai/system/mapper/SysDictMapper.java
@@ -1,11 +1,11 @@
 package com.youlai.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.system.pojo.entity.SysDictItem;
+import com.youlai.system.pojo.entity.SysDict;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
+public interface SysDictMapper extends BaseMapper<SysDict> {
 
 }
 
diff --git a/src/main/java/com/youlai/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/system/mapper/SysUserMapper.java
index 5054f764..619b1e1e 100644
--- a/src/main/java/com/youlai/system/mapper/SysUserMapper.java
+++ b/src/main/java/com/youlai/system/mapper/SysUserMapper.java
@@ -2,7 +2,7 @@ package com.youlai.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.common.annotation.DataPermission;
+import com.youlai.system.framework.mybatisplus.DataPermission;
 import com.youlai.system.pojo.bo.UserBO;
 import com.youlai.system.pojo.entity.SysUser;
 import com.youlai.system.pojo.bo.UserAuthInfo;
@@ -30,7 +30,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     @DataPermission(deptAlias = "u")
-    Page<UserBO> listUserPages(Page<UserBO> page, UserPageQuery queryParams);
+    Page<UserBO> getUserPage(Page<UserBO> page, UserPageQuery queryParams);
 
     /**
      * 获取用户表单详情
diff --git a/src/main/java/com/youlai/system/pojo/dto/LoginResult.java b/src/main/java/com/youlai/system/pojo/dto/LoginResult.java
index 22f374e9..b308d1e4 100644
--- a/src/main/java/com/youlai/system/pojo/dto/LoginResult.java
+++ b/src/main/java/com/youlai/system/pojo/dto/LoginResult.java
@@ -12,6 +12,9 @@ public class LoginResult {
     @Schema(description = "访问token")
     private String accessToken;
 
+    @Schema(description = "token 类型",example = "Bearer")
+    private String tokenType;
+
     @Schema(description = "刷新token")
     private String refreshToken;
 
diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java b/src/main/java/com/youlai/system/pojo/entity/SysDict.java
similarity index 90%
rename from src/main/java/com/youlai/system/pojo/entity/SysDictItem.java
rename to src/main/java/com/youlai/system/pojo/entity/SysDict.java
index 6e5bb20d..17a0e919 100644
--- a/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java
+++ b/src/main/java/com/youlai/system/pojo/entity/SysDict.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Data;
 
 /**
@@ -14,9 +14,8 @@ import lombok.Data;
  * @author haoxr
  * @date 2022/12/17
  */
-@TableName(value ="sys_dict_item")
 @Data
-public class SysDictItem implements Serializable {
+public class SysDict implements Serializable {
     /**
      * 主键
      */
diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDictType.java b/src/main/java/com/youlai/system/pojo/entity/SysDictType.java
index 5f582183..d3ae1d4d 100644
--- a/src/main/java/com/youlai/system/pojo/entity/SysDictType.java
+++ b/src/main/java/com/youlai/system/pojo/entity/SysDictType.java
@@ -1,17 +1,12 @@
 package com.youlai.system.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import com.youlai.system.common.base.BaseEntity;
 import lombok.Data;
 
 /**
- * 字典类型表
+ * 字典类型实体
  *
  * @author haoxr
  * @date 2022/12/17
diff --git a/src/main/java/com/youlai/system/pojo/entity/SysMenu.java b/src/main/java/com/youlai/system/pojo/entity/SysMenu.java
index 3b49ab86..709c815f 100644
--- a/src/main/java/com/youlai/system/pojo/entity/SysMenu.java
+++ b/src/main/java/com/youlai/system/pojo/entity/SysMenu.java
@@ -9,13 +9,16 @@ import com.youlai.system.common.enums.MenuTypeEnum;
 import lombok.Data;
 
 /**
- * 菜单表实体
+ * 菜单实体对象
+ *
+ * @author haoxr
+ * @date 2023/3/6
  */
 @TableName(value ="sys_menu")
 @Data
 public class SysMenu extends BaseEntity {
     /**
-     * 
+     * 菜单ID
      */
     @TableId(type = IdType.AUTO)
     private Long id;
@@ -66,8 +69,8 @@ public class SysMenu extends BaseEntity {
     private String icon;
 
     /**
-     * 外链路径
+     * 跳转路径
      */
-    private String redirectUrl;
+    private String redirect;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/system/pojo/form/DictItemForm.java b/src/main/java/com/youlai/system/pojo/form/DictForm.java
similarity index 51%
rename from src/main/java/com/youlai/system/pojo/form/DictItemForm.java
rename to src/main/java/com/youlai/system/pojo/form/DictForm.java
index 908a0c73..46178647 100644
--- a/src/main/java/com/youlai/system/pojo/form/DictItemForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/DictForm.java
@@ -1,31 +1,32 @@
 package com.youlai.system.pojo.form;
 
 
-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;
 
-@Schema(description = "字典数据项")
+@Schema(description = "字典表单对象")
 @Data
-public class DictItemForm {
+public class DictForm {
 
-    @Schema(description="数据项ID")
+    @Schema(description="字典ID")
     private Long id;
 
     @Schema(description="类型编码")
     private String typeCode;
 
-    @Schema(description="数据项名称")
+    @Schema(description="字典名称")
     private String name;
 
-    @Schema(description="值")
+    @Schema(description="字典值")
     private String value;
 
-    @Schema(description="状态：1->启用;0->禁用")
+    @Schema(description="状态(1:启用;0:禁用)")
     private Integer status;
 
     @Schema(description="排序")
     private Integer sort;
 
+    @Schema(description = "字典备注")
+    private String remark;
+
 }
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 0eac83aa..98293c69 100644
--- a/src/main/java/com/youlai/system/pojo/form/DictTypeForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/DictTypeForm.java
@@ -1,8 +1,6 @@
 package com.youlai.system.pojo.form;
 
 
-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;
 
@@ -19,7 +17,10 @@ public class DictTypeForm {
     @Schema(description="类型编码")
     private String code;
 
-    @Schema(description="类型状态：1->启用;0->禁用")
+    @Schema(description="类型状态(1:启用;0:禁用)")
     private Integer status;
 
+    @Schema(description = "备注")
+    private String remark;
+
 }
diff --git a/src/main/java/com/youlai/system/pojo/form/MenuForm.java b/src/main/java/com/youlai/system/pojo/form/MenuForm.java
new file mode 100644
index 00000000..a2a23b51
--- /dev/null
+++ b/src/main/java/com/youlai/system/pojo/form/MenuForm.java
@@ -0,0 +1,44 @@
+package com.youlai.system.pojo.form;
+
+import com.youlai.system.common.enums.MenuTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "菜单表单对象")
+@Data
+public class MenuForm {
+
+    @Schema(description = "菜单ID")
+    private Long id;
+
+    @Schema(description = "父菜单ID")
+    private Long parentId;
+
+    @Schema(description = "菜单名称")
+    private String name;
+
+    @Schema(description = "菜单类型(1-菜单；2-目录；3-外链；4-按钮权限)")
+    private MenuTypeEnum type;
+
+    @Schema(description = "路由路径")
+    private String path;
+
+    @Schema(description = "组件路径(vue页面完整路径，省略.vue后缀)")
+    private String component;
+
+    @Schema(description = "权限标识")
+    private String perm;
+
+    @Schema(description = "显示状态(1:显示;0:隐藏)")
+    private Integer visible;
+
+    @Schema(description = "排序(数字越小排名越靠前)")
+    private Integer sort;
+
+    @Schema(description = "菜单图标")
+    private String icon;
+
+    @Schema(description = "跳转路径")
+    private String redirect;
+
+}
diff --git a/src/main/java/com/youlai/system/pojo/form/RolePermsForm.java b/src/main/java/com/youlai/system/pojo/form/RolePermsForm.java
deleted file mode 100644
index e259da1f..00000000
--- a/src/main/java/com/youlai/system/pojo/form/RolePermsForm.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.youlai.system.pojo.form;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 角色权限传输层对象
- *
- * @author haoxr
- * @date 2021/12/19 11:46
- */
-@Data
-public class RolePermsForm {
-
-    /**
-     * 菜单ID
-     */
-    private Long menuId;
-
-    /**
-     * 角色ID
-     */
-    private Long roleId;
-
-    /**
-     * 权限ID集合
-     */
-    private List<Long> permIds;
-
-}
diff --git a/src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java b/src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java
deleted file mode 100644
index ff773d47..00000000
--- a/src/main/java/com/youlai/system/pojo/form/RoleResourceForm.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.youlai.system.pojo.form;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-
-@Schema(description ="菜单资源表单")
-@Data
-public class RoleResourceForm {
-
-    @Schema(description="菜单ID集合")
-    private List<Long> menuIds;
-
-    @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 25d733ad..f2ea1cb2 100644
--- a/src/main/java/com/youlai/system/pojo/form/UserForm.java
+++ b/src/main/java/com/youlai/system/pojo/form/UserForm.java
@@ -14,7 +14,7 @@ import java.util.List;
  * @author haoxr
  * @date 2022/4/12 11:04
  */
-@Schema 
+@Schema(description = "用户表单对象")
 @Data
 public class UserForm {
 
diff --git a/src/main/java/com/youlai/system/pojo/query/DictItemPageQuery.java b/src/main/java/com/youlai/system/pojo/query/DictPageQuery.java
similarity index 78%
rename from src/main/java/com/youlai/system/pojo/query/DictItemPageQuery.java
rename to src/main/java/com/youlai/system/pojo/query/DictPageQuery.java
index 65ef3036..32e4601a 100644
--- a/src/main/java/com/youlai/system/pojo/query/DictItemPageQuery.java
+++ b/src/main/java/com/youlai/system/pojo/query/DictPageQuery.java
@@ -3,12 +3,11 @@ package com.youlai.system.pojo.query;
 
 import com.youlai.system.common.base.BasePageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Schema(description ="字典数据项分页查询对象")
 @Data
-public class DictItemPageQuery extends BasePageQuery {
+public class DictPageQuery extends BasePageQuery {
 
     @Schema(description="关键字(字典项名称)")
     private String keywords;
diff --git a/src/main/java/com/youlai/system/pojo/vo/DictItemPageVO.java b/src/main/java/com/youlai/system/pojo/vo/DictItemPageVO.java
deleted file mode 100644
index fa82229e..00000000
--- a/src/main/java/com/youlai/system/pojo/vo/DictItemPageVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.youlai.system.pojo.vo;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description ="字典数据项分页对象")
-@Data
-public class DictItemPageVO {
-
-    @Schema(description="数据项ID")
-    private Long id;
-
-    @Schema(description="数据项名称")
-    private String name;
-
-    @Schema(description="值")
-    private String value;
-
-    @Schema(description="类型状态：1->启用;0->禁用")
-    private Integer status;
-
-}
diff --git a/src/main/java/com/youlai/system/pojo/vo/DictPageVO.java b/src/main/java/com/youlai/system/pojo/vo/DictPageVO.java
new file mode 100644
index 00000000..f1b94253
--- /dev/null
+++ b/src/main/java/com/youlai/system/pojo/vo/DictPageVO.java
@@ -0,0 +1,23 @@
+package com.youlai.system.pojo.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description ="字典分页对象")
+@Data
+public class DictPageVO {
+
+    @Schema(description="字典ID")
+    private Long id;
+
+    @Schema(description="字典名称")
+    private String name;
+
+    @Schema(description="字典值")
+    private String value;
+
+    @Schema(description="状态(1:启用;0:禁用)")
+    private Integer status;
+
+}
diff --git a/src/main/java/com/youlai/system/pojo/vo/DictTypePageVO.java b/src/main/java/com/youlai/system/pojo/vo/DictTypePageVO.java
index 2256ef5b..77945f0b 100644
--- a/src/main/java/com/youlai/system/pojo/vo/DictTypePageVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/DictTypePageVO.java
@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description ="字典类型")
+@Schema(description ="字典类型分页对象")
 @Data
 public class DictTypePageVO {
 
@@ -18,7 +18,7 @@ public class DictTypePageVO {
     @Schema(description="类型编码")
     private String code;
 
-    @Schema(description="类型状态：1->启用;0->禁用")
+    @Schema(description="状态：1:启用;0:禁用")
     private Integer status;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/FileInfoVO.java b/src/main/java/com/youlai/system/pojo/vo/FileInfoVO.java
index 3aa01f58..32296b74 100644
--- a/src/main/java/com/youlai/system/pojo/vo/FileInfoVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/FileInfoVO.java
@@ -1,12 +1,16 @@
 package com.youlai.system.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+@Schema(description = "文件对象")
 @Data
 public class FileInfoVO {
 
+    @Schema(description = "文件名称")
     private String name;
 
+    @Schema(description = "文件URL")
     private String url;
 
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/MenuDetailVO.java b/src/main/java/com/youlai/system/pojo/vo/MenuDetailVO.java
deleted file mode 100644
index 407cd97c..00000000
--- a/src/main/java/com/youlai/system/pojo/vo/MenuDetailVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.youlai.system.pojo.vo;
-
-import lombok.Data;
-
-@Data
-public class MenuDetailVO {
-
-    private Long id;
-
-    private Long parentId;
-
-    private String name;
-
-    private String icon;
-
-    private String routeName;
-
-    private String routePath;
-
-    private String component;
-
-    private Integer sort;
-
-    private Integer visible;
-
-    private String redirect;
-
-    private Integer type;
-
-}
diff --git a/src/main/java/com/youlai/system/pojo/vo/MenuVO.java b/src/main/java/com/youlai/system/pojo/vo/MenuVO.java
index 3c52414d..5c20608a 100644
--- a/src/main/java/com/youlai/system/pojo/vo/MenuVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/MenuVO.java
@@ -11,24 +11,34 @@ import java.util.List;
 @Data
 public class MenuVO {
 
+    @Schema(description = "菜单ID")
     private Long id;
 
+    @Schema(description = "父菜单ID")
     private Long parentId;
 
+    @Schema(description = "菜单名称")
     private String name;
 
+    @Schema(description = "ICON")
     private String icon;
 
+    @Schema(description = "路由名称")
     private String routeName;
 
+    @Schema(description = "路由相对路径")
     private String routePath;
 
+    @Schema(description = "组件路径")
     private String component;
 
+    @Schema(description = "菜单排序(数字越小排名越靠前)")
     private Integer sort;
 
+    @Schema(description = "菜单是否可见(1:显示;0:隐藏)")
     private Integer visible;
 
+    @Schema(description = "跳转路径")
     private String redirect;
 
     @Schema(description="菜单类型")
@@ -37,6 +47,7 @@ public class MenuVO {
     @Schema(description="按钮权限标识")
     private String perm;
 
+    @Schema(description = "子菜单")
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
     private List<MenuVO> children;
 
diff --git a/src/main/java/com/youlai/system/pojo/vo/Option.java b/src/main/java/com/youlai/system/pojo/vo/Option.java
index c5314167..f3c325d7 100644
--- a/src/main/java/com/youlai/system/pojo/vo/Option.java
+++ b/src/main/java/com/youlai/system/pojo/vo/Option.java
@@ -35,6 +35,7 @@ public class Option<T> {
     @Schema(description="选项的标签")
     private String label;
 
+    @Schema(description="子选项列表")
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     private List<Option> children;
 
diff --git a/src/main/java/com/youlai/system/pojo/vo/ResourceVO.java b/src/main/java/com/youlai/system/pojo/vo/ResourceVO.java
deleted file mode 100644
index 626b9f7f..00000000
--- a/src/main/java/com/youlai/system/pojo/vo/ResourceVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.youlai.system.pojo.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description ="资源(菜单+权限)视图对象")
-@Data
-public class ResourceVO {
-
-    @Schema(description="选项的值")
-    private Long value;
-
-    @Schema(description="选项的标签")
-    private String label;
-
-    @Schema(description="子菜单")
-    @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
-    private List<ResourceVO> children;
-
-
-}
diff --git a/src/main/java/com/youlai/system/pojo/vo/RolePageVO.java b/src/main/java/com/youlai/system/pojo/vo/RolePageVO.java
index b028d84e..6947be58 100644
--- a/src/main/java/com/youlai/system/pojo/vo/RolePageVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/RolePageVO.java
@@ -2,12 +2,11 @@ package com.youlai.system.pojo.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@Schema(description ="角色分页视图对象")
+@Schema(description ="角色分页对象")
 @Data
 public class RolePageVO {
 
diff --git a/src/main/java/com/youlai/system/pojo/vo/RouteVO.java b/src/main/java/com/youlai/system/pojo/vo/RouteVO.java
index 0f7166a5..d7956f98 100644
--- a/src/main/java/com/youlai/system/pojo/vo/RouteVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/RouteVO.java
@@ -1,6 +1,7 @@
 package com.youlai.system.pojo.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -11,41 +12,46 @@ import java.util.List;
  * @author haoxr
  * @date 2020/11/28
  */
+@Schema(description = "路由对象")
 @Data
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class RouteVO {
 
+    @Schema(description = "路由路径", example = "user")
     private String path;
 
+    @Schema(description = "组件路径", example = "system/user/index")
     private String component;
 
+    @Schema(description = "跳转链接", example = "https://www.youlai.tech")
     private String redirect;
 
+    @Schema(description = "路由名称")
     private String name;
 
+    @Schema(description = "路由属性")
     private Meta meta;
 
+    @Schema(description = "路由属性类型")
     @Data
     public static class Meta {
 
+        @Schema(description = "路由title")
         private String title;
 
+        @Schema(description = "ICON")
         private String icon;
 
+        @Schema(description = "是否隐藏", example = "true")
         private Boolean hidden;
 
-        /**
-         * 如果设置为 true，目录没有子节点也会显示
-         */
-        private Boolean alwaysShow;
-
+        @Schema(description = "拥有路由权限的角色编码", example = "['ADMIN','ROOT']")
         private List<String> roles;
 
-        /**
-         * 页面缓存开启状态
-         */
+        @Schema(description = "是否开启缓存", example = "true")
         private Boolean keepAlive;
     }
 
+    @Schema(description = "子路由列表")
     private List<RouteVO> children;
 }
diff --git a/src/main/java/com/youlai/system/pojo/vo/UserDetailVO.java b/src/main/java/com/youlai/system/pojo/vo/UserDetailVO.java
deleted file mode 100644
index 612d4ff1..00000000
--- a/src/main/java/com/youlai/system/pojo/vo/UserDetailVO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.youlai.system.pojo.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 用户表详情视图对象
- *
- * @author haoxr
- * @date 2022/8/25
- */
-@Schema 
-@Data
-public class UserDetailVO {
-
-    @Schema(description="用户ID")
-    private Long id;
-
-    @Schema(description="用户名")
-    private String username;
-
-    @Schema(description="昵称")
-    private String nickname;
-
-    @Schema(description="")
-    private String mobile;
-
-    @Schema(description="性别")
-    private Integer gender;
-
-    @Schema(description="用户头像")
-    private String avatar;
-
-    @Schema(description="邮箱")
-    private String email;
-
-    @Schema(description="用户状态(1:正常;0:禁用)")
-    private Integer status;
-
-    @Schema(description="部门ID")
-    private Long deptId;
-
-    @Schema(description="角色ID集合")
-    private List<Long> roleIds;
-
-}
diff --git a/src/main/java/com/youlai/system/pojo/vo/UserPageVO.java b/src/main/java/com/youlai/system/pojo/vo/UserPageVO.java
index 7c57ef3e..6acb9f57 100644
--- a/src/main/java/com/youlai/system/pojo/vo/UserPageVO.java
+++ b/src/main/java/com/youlai/system/pojo/vo/UserPageVO.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * @author haoxr
  * @date 2022/1/15 9:41
  */
-@Schema(description ="用户分页视图对象")
+@Schema(description ="用户分页对象")
 @Data
 public class UserPageVO {
 
diff --git a/src/main/java/com/youlai/system/service/SysDictItemService.java b/src/main/java/com/youlai/system/service/SysDictItemService.java
deleted file mode 100644
index 55fe18b8..00000000
--- a/src/main/java/com/youlai/system/service/SysDictItemService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.youlai.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.system.pojo.entity.SysDictItem;
-import com.youlai.system.pojo.form.DictItemForm;
-import com.youlai.system.pojo.query.DictItemPageQuery;
-import com.youlai.system.pojo.vo.DictItemPageVO;
-
-/**
- *
- */
-public interface SysDictItemService extends IService<SysDictItem> {
-    /**
-     * 字典数据项分页列表
-     *
-     * @param queryParams
-     * @return
-     */
-    Page<DictItemPageVO> listDictItemPages(DictItemPageQuery queryParams);
-
-    /**
-     * 字典数据项表单详情
-     *
-     * @param id 字典数据项ID
-     * @return
-     */
-    DictItemForm getDictItemForm(Long id);
-
-    /**
-     * 新增字典数据项
-     *
-     * @param dictItemForm 字典数据项表单
-     * @return
-     */
-    boolean saveDictItem(DictItemForm dictItemForm);
-
-    /**
-     * 修改字典数据项
-     *
-     * @param id           字典数据项ID
-     * @param dictItemForm 字典数据项表单
-     * @return
-     */
-    boolean updateDictItem(Long id, DictItemForm dictItemForm);
-
-    /**
-     * 删除字典数据项
-     *
-     * @param idsStr 字典数据项ID，多个以英文逗号(,)分割
-     * @return
-     */
-    boolean deleteDictItems(String idsStr);
-}
diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/system/service/SysDictService.java
new file mode 100644
index 00000000..22bb7109
--- /dev/null
+++ b/src/main/java/com/youlai/system/service/SysDictService.java
@@ -0,0 +1,68 @@
+package com.youlai.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.youlai.system.pojo.entity.SysDict;
+import com.youlai.system.pojo.form.DictForm;
+import com.youlai.system.pojo.query.DictPageQuery;
+import com.youlai.system.pojo.vo.DictPageVO;
+import com.youlai.system.pojo.vo.Option;
+
+import java.util.List;
+
+/**
+ * 字典接口
+ *
+ * @author haoxr
+ * @date 2023/3/4
+ */
+public interface SysDictService extends IService<SysDict> {
+    /**
+     * 字典数据项分页列表
+     *
+     * @param queryParams
+     * @return
+     */
+    Page<DictPageVO> getDictPage(DictPageQuery queryParams);
+
+    /**
+     * 字典数据项表单
+     *
+     * @param id 字典数据项ID
+     * @return
+     */
+    DictForm getDictForm(Long id);
+
+    /**
+     * 新增字典数据项
+     *
+     * @param dictForm 字典数据项表单
+     * @return
+     */
+    boolean saveDict(DictForm dictForm);
+
+    /**
+     * 修改字典数据项
+     *
+     * @param id       字典数据项ID
+     * @param dictForm 字典数据项表单
+     * @return
+     */
+    boolean updateDict(Long id, DictForm dictForm);
+
+    /**
+     * 删除字典数据项
+     *
+     * @param idsStr 字典数据项ID，多个以英文逗号(,)分割
+     * @return
+     */
+    boolean deleteDict(String idsStr);
+
+    /**
+     * 获取字典下拉列表
+     *
+     * @param typeCode
+     * @return
+     */
+    List<Option> listDictOptions(String typeCode);
+}
diff --git a/src/main/java/com/youlai/system/service/SysDictTypeService.java b/src/main/java/com/youlai/system/service/SysDictTypeService.java
index fd37580c..766cbc69 100644
--- a/src/main/java/com/youlai/system/service/SysDictTypeService.java
+++ b/src/main/java/com/youlai/system/service/SysDictTypeService.java
@@ -24,7 +24,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
      * @param queryParams 分页查询对象
      * @return
      */
-    Page<DictTypePageVO> listDictTypePages(DictTypePageQuery queryParams);
+    Page<DictTypePageVO> getDictTypePage(DictTypePageQuery queryParams);
 
 
     /**
@@ -33,7 +33,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
      * @param id 字典类型ID
      * @return
      */
-    DictTypeForm getDictTypeFormData(Long id);
+    DictTypeForm getDictTypeForm(Long id);
 
 
     /**
diff --git a/src/main/java/com/youlai/system/service/SysRoleService.java b/src/main/java/com/youlai/system/service/SysRoleService.java
index 7cd8a423..5e410594 100644
--- a/src/main/java/com/youlai/system/service/SysRoleService.java
+++ b/src/main/java/com/youlai/system/service/SysRoleService.java
@@ -26,7 +26,7 @@ public interface SysRoleService extends IService<SysRole> {
      * @param queryParams
      * @return
      */
-    Page<RolePageVO> listRolePages(RolePageQuery queryParams);
+    Page<RolePageVO> getRolePage(RolePageQuery queryParams);
 
 
     /**
@@ -43,29 +43,37 @@ public interface SysRoleService extends IService<SysRole> {
      */
     boolean saveRole(RoleForm roleForm);
 
+    /**
+     * 获取角色表单数据
+     *
+     * @param roleId 角色ID
+     * @return  {@link RoleForm} – 角色表单数据
+     */
+    RoleForm getRoleForm(Long roleId);
+
     /**
      * 修改角色状态
      *
-     * @param roleId
-     * @param status
-     * @return
+     * @param roleId 角色ID
+     * @param status 角色状态(1:启用；0:禁用)
+     * @return {@link Boolean}
      */
     boolean updateRoleStatus(Long roleId, Integer status);
 
     /**
      * 批量删除角色
      *
-     * @param ids
+     * @param ids 角色ID，多个使用英文逗号(,)分割
      * @return
      */
     boolean deleteRoles(String ids);
 
 
     /**
-     * 获取角色的资源ID集合,资源包括菜单和权限
+     * 获取角色的菜单ID集合
      *
-     * @param roleId
-     * @return
+     * @param roleId 角色ID
+     * @return 菜单ID集合(包括按钮权限ID)
      */
     List<Long> getRoleMenuIds(Long roleId);
 
@@ -86,4 +94,6 @@ public interface SysRoleService extends IService<SysRole> {
      * @return
      */
     Integer getMaximumDataScope(Set<String> roles);
+
+
 }
diff --git a/src/main/java/com/youlai/system/service/SysUserService.java b/src/main/java/com/youlai/system/service/SysUserService.java
index 93b379de..5731d3b2 100644
--- a/src/main/java/com/youlai/system/service/SysUserService.java
+++ b/src/main/java/com/youlai/system/service/SysUserService.java
@@ -28,7 +28,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return
      */
-    IPage<UserPageVO> listUserPages(UserPageQuery queryParams);
+    IPage<UserPageVO> getUserPage(UserPageQuery queryParams);
 
 
     /**
diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
index 61dc42d9..4d075edf 100644
--- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
@@ -65,7 +65,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                 Long parentId = dept.getParentId();
                 // 不在缓存ID列表的parentId是顶级节点ID，以此作为递归开始
                 if (cacheDeptIds.contains(parentId) == false) {
-                    list.addAll(recurDepartments(parentId, deptList));
+                    list.addAll(recurDeptList(parentId, deptList));
                     cacheDeptIds.add(parentId); // 避免重复递归
                 }
             }
@@ -85,18 +85,18 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
     /**
-     * 递归生成部门层级列表
+     * 递归生成部门树形列表
      *
      * @param parentId
      * @param deptList
      * @return
      */
-    public List<DeptVO> recurDepartments(Long parentId, List<SysDept> deptList) {
+    public List<DeptVO> recurDeptList(Long parentId, List<SysDept> deptList) {
         List<DeptVO> list = deptList.stream()
                 .filter(dept -> dept.getParentId().equals(parentId))
                 .map(dept -> {
                     DeptVO deptVO = deptConverter.entity2Vo(dept);
-                    List<DeptVO> children = recurDepartments(dept.getId(), deptList);
+                    List<DeptVO> children = recurDeptList(dept.getId(), deptList);
                     deptVO.setChildren(children);
                     return deptVO;
                 }).collect(Collectors.toList());
@@ -181,13 +181,15 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     @Override
     public boolean deleteByIds(String ids) {
         // 删除部门及子部门
-        Optional.ofNullable(Arrays.stream(ids.split(",")))
-                .ifPresent(deptIds -> deptIds.forEach(deptId ->
-                        this.remove(new LambdaQueryWrapper<SysDept>()
-                                .eq(SysDept::getId, deptId)
-                                .or()
-                                .apply("concat (',',tree_path,',') like concat('%,',{0},',%')", deptId))
-                ));
+        if (StrUtil.isNotBlank(ids)) {
+            String[] menuIds = ids.split(",");
+            for (String deptId : menuIds) {
+                this.remove(new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getId, deptId)
+                        .or()
+                        .apply("CONCAT (',',tree_path,',') LIKE CONCAT('%,',{0},',%')", deptId));
+            }
+        }
         return true;
     }
 
diff --git a/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java
deleted file mode 100644
index 328417b1..00000000
--- a/src/main/java/com/youlai/system/service/impl/SysDictItemServiceImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.youlai.system.service.impl;
-
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.system.converter.DictItemConverter;
-import com.youlai.system.mapper.SysDictItemMapper;
-import com.youlai.system.pojo.entity.SysDictItem;
-import com.youlai.system.pojo.form.DictItemForm;
-import com.youlai.system.pojo.query.DictItemPageQuery;
-import com.youlai.system.pojo.vo.DictItemPageVO;
-import com.youlai.system.service.SysDictItemService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 数据字典项业务实现类
- *
- * @author haoxr
- * @date 2022/10/12
- */
-@Service
-@RequiredArgsConstructor
-public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements SysDictItemService {
-
-    private final DictItemConverter dictItemConverter;
-
-    /**
-     * 字典数据项分页列表
-     *
-     * @param queryParams
-     * @return
-     */
-    @Override
-    public Page<DictItemPageVO> listDictItemPages(DictItemPageQuery queryParams) {
-        // 查询参数
-        int pageNum = queryParams.getPageNum();
-        int pageSize = queryParams.getPageSize();
-        String keywords = queryParams.getKeywords();
-        String typeCode = queryParams.getTypeCode();
-
-        // 查询数据
-        Page<SysDictItem> dictItemPage = this.page(
-                new Page<>(pageNum, pageSize),
-                new LambdaQueryWrapper<SysDictItem>()
-                        .like(StrUtil.isNotBlank(keywords), SysDictItem::getName, keywords)
-                        .eq(StrUtil.isNotBlank(typeCode), SysDictItem::getTypeCode, typeCode)
-                        .select(SysDictItem::getId, SysDictItem::getName, SysDictItem::getValue, SysDictItem::getStatus)
-        );
-
-        // 实体转换
-        Page<DictItemPageVO> pageResult = dictItemConverter.entity2Page(dictItemPage);
-        return pageResult;
-    }
-
-    /**
-     * 字典数据项表单详情
-     *
-     * @param id 字典数据项ID
-     * @return
-     */
-    @Override
-    public DictItemForm getDictItemForm(Long id) {
-        // 获取entity
-        SysDictItem entity = this.getOne(new LambdaQueryWrapper<SysDictItem>()
-                .eq(SysDictItem::getId, id)
-                .select(
-                        SysDictItem::getId,
-                        SysDictItem::getTypeCode,
-                        SysDictItem::getName,
-                        SysDictItem::getValue,
-                        SysDictItem::getStatus,
-                        SysDictItem::getSort,
-                        SysDictItem::getRemark
-                ));
-        Assert.isTrue(entity != null, "字典数据项不存在");
-
-        // 实体转换
-        DictItemForm dictItemForm = dictItemConverter.entity2Form(entity);
-        return dictItemForm;
-    }
-
-    /**
-     * 新增字典数据项
-     *
-     * @param dictItemForm 字典数据项表单
-     * @return
-     */
-    @Override
-    public boolean saveDictItem(DictItemForm dictItemForm) {
-        // 实体对象转换 form->entity
-        SysDictItem entity = dictItemConverter.form2Entity(dictItemForm);
-        // 持久化
-        boolean result = this.save(entity);
-        return result;
-    }
-
-    /**
-     * 修改字典数据项
-     *
-     * @param id           字典数据项ID
-     * @param dictItemForm 字典数据项表单
-     * @return
-     */
-    @Override
-    public boolean updateDictItem(Long id, DictItemForm dictItemForm) {
-        SysDictItem entity = dictItemConverter.form2Entity(dictItemForm);
-        boolean result = this.updateById(entity);
-        return result;
-    }
-
-    /**
-     * 删除字典数据项
-     *
-     * @param idsStr 字典数据项ID，多个以英文逗号(,)分割
-     * @return
-     */
-    @Override
-    public boolean deleteDictItems(String idsStr) {
-        Assert.isTrue(StrUtil.isNotBlank(idsStr), "删除数据为空");
-        //
-        List<Long> ids = Arrays.asList(idsStr.split(","))
-                .stream()
-                .map(id -> Long.parseLong(id))
-                .collect(Collectors.toList());
-
-        // 删除字典数据项
-        boolean result = this.removeByIds(ids);
-        return result;
-    }
-
-}
-
-
-
-
diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
new file mode 100644
index 00000000..1627febb
--- /dev/null
+++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
@@ -0,0 +1,166 @@
+package com.youlai.system.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.youlai.system.converter.DictConverter;
+import com.youlai.system.mapper.SysDictMapper;
+import com.youlai.system.pojo.entity.SysDict;
+import com.youlai.system.pojo.form.DictForm;
+import com.youlai.system.pojo.query.DictPageQuery;
+import com.youlai.system.pojo.vo.DictPageVO;
+import com.youlai.system.pojo.vo.Option;
+import com.youlai.system.service.SysDictService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 数据字典项业务实现类
+ *
+ * @author haoxr
+ * @date 2022/10/12
+ */
+@Service
+@RequiredArgsConstructor
+public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements SysDictService {
+
+    private final DictConverter dictConverter;
+
+    /**
+     * 字典数据项分页列表
+     *
+     * @param queryParams
+     * @return
+     */
+    @Override
+    public Page<DictPageVO> getDictPage(DictPageQuery queryParams) {
+        // 查询参数
+        int pageNum = queryParams.getPageNum();
+        int pageSize = queryParams.getPageSize();
+        String keywords = queryParams.getKeywords();
+        String typeCode = queryParams.getTypeCode();
+
+        // 查询数据
+        Page<SysDict> dictItemPage = this.page(
+                new Page<>(pageNum, pageSize),
+                new LambdaQueryWrapper<SysDict>()
+                        .like(StrUtil.isNotBlank(keywords), SysDict::getName, keywords)
+                        .eq(StrUtil.isNotBlank(typeCode), SysDict::getTypeCode, typeCode)
+                        .select(SysDict::getId, SysDict::getName, SysDict::getValue, SysDict::getStatus)
+        );
+
+        // 实体转换
+        Page<DictPageVO> pageResult = dictConverter.entity2Page(dictItemPage);
+        return pageResult;
+    }
+
+    /**
+     * 字典数据项表单详情
+     *
+     * @param id 字典数据项ID
+     * @return
+     */
+    @Override
+    public DictForm getDictForm(Long id) {
+        // 获取entity
+        SysDict entity = this.getOne(new LambdaQueryWrapper<SysDict>()
+                .eq(SysDict::getId, id)
+                .select(
+                        SysDict::getId,
+                        SysDict::getTypeCode,
+                        SysDict::getName,
+                        SysDict::getValue,
+                        SysDict::getStatus,
+                        SysDict::getSort,
+                        SysDict::getRemark
+                ));
+        Assert.isTrue(entity != null, "字典数据项不存在");
+
+        // 实体转换
+        DictForm dictForm = dictConverter.entity2Form(entity);
+        return dictForm;
+    }
+
+    /**
+     * 新增字典数据项
+     *
+     * @param dictForm 字典数据项表单
+     * @return
+     */
+    @Override
+    public boolean saveDict(DictForm dictForm) {
+        // 实体对象转换 form->entity
+        SysDict entity = dictConverter.form2Entity(dictForm);
+        // 持久化
+        boolean result = this.save(entity);
+        return result;
+    }
+
+    /**
+     * 修改字典数据项
+     *
+     * @param id           字典数据项ID
+     * @param dictForm 字典数据项表单
+     * @return
+     */
+    @Override
+    public boolean updateDict(Long id, DictForm dictForm) {
+        SysDict entity = dictConverter.form2Entity(dictForm);
+        boolean result = this.updateById(entity);
+        return result;
+    }
+
+    /**
+     * 删除字典数据项
+     *
+     * @param idsStr 字典数据项ID，多个以英文逗号(,)分割
+     * @return
+     */
+    @Override
+    public boolean deleteDict(String idsStr) {
+        Assert.isTrue(StrUtil.isNotBlank(idsStr), "删除数据为空");
+        //
+        List<Long> ids = Arrays.asList(idsStr.split(","))
+                .stream()
+                .map(id -> Long.parseLong(id))
+                .collect(Collectors.toList());
+
+        // 删除字典数据项
+        boolean result = this.removeByIds(ids);
+        return result;
+    }
+
+    /**
+     * 获取字典下拉列表
+     *
+     * @param typeCode
+     * @return
+     */
+    @Override
+    public List<Option> listDictOptions(String typeCode) {
+        // 数据字典项
+        List<SysDict> dictList = this.list(new LambdaQueryWrapper<SysDict>()
+                .eq(SysDict::getTypeCode, typeCode)
+                .select(SysDict::getValue, SysDict::getName)
+        );
+
+        // 转换下拉数据
+        List<Option> options = CollectionUtil.emptyIfNull(dictList)
+                .stream()
+                .map(dictItem -> new Option(dictItem.getValue(), dictItem.getName()))
+                .collect(Collectors.toList());
+        return options;
+    }
+
+}
+
+
+
+
diff --git a/src/main/java/com/youlai/system/service/impl/SysDictTypeServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictTypeServiceImpl.java
index 6cf3e1ba..a559f024 100644
--- a/src/main/java/com/youlai/system/service/impl/SysDictTypeServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysDictTypeServiceImpl.java
@@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.youlai.system.pojo.entity.SysDict;
 import com.youlai.system.pojo.vo.Option;
 import com.youlai.system.converter.DictTypeConverter;
 import com.youlai.system.mapper.SysDictTypeMapper;
-import com.youlai.system.pojo.entity.SysDictItem;
 import com.youlai.system.pojo.entity.SysDictType;
 import com.youlai.system.pojo.form.DictTypeForm;
 import com.youlai.system.pojo.query.DictTypePageQuery;
 import com.youlai.system.pojo.vo.DictTypePageVO;
-import com.youlai.system.service.SysDictItemService;
+import com.youlai.system.service.SysDictService;
 import com.youlai.system.service.SysDictTypeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements SysDictTypeService {
 
 
-    private final SysDictItemService dictItemService;
+    private final SysDictService dictItemService;
     private final DictTypeConverter dictTypeConverter;
 
     /**
@@ -46,7 +46,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return
      */
     @Override
-    public Page<DictTypePageVO> listDictTypePages(DictTypePageQuery queryParams) {
+    public Page<DictTypePageVO> getDictTypePage(DictTypePageQuery queryParams) {
         // 查询参数
         int pageNum = queryParams.getPageNum();
         int pageSize = queryParams.getPageSize();
@@ -74,7 +74,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return
      */
     @Override
-    public DictTypeForm getDictTypeFormData(Long id) {
+    public DictTypeForm getDictTypeForm(Long id) {
         // 获取entity
         SysDictType entity = this.getOne(new LambdaQueryWrapper<SysDictType>()
                 .eq(SysDictType::getId, id)
@@ -128,9 +128,9 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
             String oldCode = sysDictType.getCode();
             String newCode = dictTypeForm.getCode();
             if (!StrUtil.equals(oldCode, newCode)) {
-                dictItemService.update(new LambdaUpdateWrapper<SysDictItem>()
-                        .eq(SysDictItem::getTypeCode, oldCode)
-                        .set(SysDictItem::getTypeCode, newCode)
+                dictItemService.update(new LambdaUpdateWrapper<SysDict>()
+                        .eq(SysDict::getTypeCode, oldCode)
+                        .set(SysDict::getTypeCode, newCode)
                 );
             }
         }
@@ -162,8 +162,8 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
                 .collect(Collectors.toList()
                 );
         if (CollectionUtil.isNotEmpty(dictTypeCodes)) {
-            dictItemService.remove(new LambdaQueryWrapper<SysDictItem>()
-                    .in(SysDictItem::getTypeCode, dictTypeCodes));
+            dictItemService.remove(new LambdaQueryWrapper<SysDict>()
+                    .in(SysDict::getTypeCode, dictTypeCodes));
         }
         // 删除字典类型
         boolean result = this.removeByIds(ids);
@@ -179,9 +179,9 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
     @Override
     public List<Option> listDictItemsByTypeCode(String typeCode) {
         // 数据字典项
-        List<SysDictItem> dictItems = dictItemService.list(new LambdaQueryWrapper<SysDictItem>()
-                .eq(SysDictItem::getTypeCode, typeCode)
-                .select(SysDictItem::getValue, SysDictItem::getName)
+        List<SysDict> dictItems = dictItemService.list(new LambdaQueryWrapper<SysDict>()
+                .eq(SysDict::getTypeCode, typeCode)
+                .select(SysDict::getValue, SysDict::getName)
         );
 
         // 转换下拉数据
diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
index 56073db9..2e51da2f 100644
--- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
@@ -50,7 +50,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
      * @return
      */
     @Override
-    public Page<RolePageVO> listRolePages(RolePageQuery queryParams) {
+    public Page<RolePageVO> getRolePage(RolePageQuery queryParams) {
         // 查询参数
         int pageNum = queryParams.getPageNum();
         int pageSize = queryParams.getPageSize();
@@ -88,11 +88,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         );
 
         // 实体转换
-        List<Option> list = roleConverter.roles2Options(roleList);
+        List<Option> list = roleConverter.entities2Options(roleList);
         return list;
     }
 
     /**
+     * 保存角色
+     *
      * @param roleForm
      * @return
      */
@@ -116,12 +118,25 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return result;
     }
 
+    /**
+     * 获取角色表单数据
+     *
+     * @param roleId 角色ID
+     * @return  {@link RoleForm} – 角色表单数据
+     */
+    @Override
+    public RoleForm getRoleForm(Long roleId) {
+        SysRole entity = this.getById(roleId);
+        RoleForm roleForm = roleConverter.entity2Form(entity);
+        return roleForm;
+    }
+
     /**
      * 修改角色状态
      *
-     * @param roleId
-     * @param status
-     * @return
+     * @param roleId 角色ID
+     * @param status 角色状态(1:启用；0:禁用)
+     * @return {@link Boolean}
      */
     @Override
     public boolean updateRoleStatus(Long roleId, Integer status) {
@@ -134,7 +149,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     /**
      * 批量删除角色
      *
-     * @param ids
+     * @param ids 角色ID，多个使用英文逗号(,)分割
      * @return
      */
     @Override
@@ -154,14 +169,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     /**
-     * 获取角色的资源ID集合,资源包括菜单和权限
+     * 获取角色的菜单ID集合
      *
-     * @param roleId
-     * @return
+     * @param roleId 角色ID
+     * @return 菜单ID集合(包括按钮权限ID)
      */
     @Override
     public List<Long> getRoleMenuIds(Long roleId) {
-        // 获取角色拥有的菜单ID集合
         List<Long> menuIds = sysRoleMenuService.listMenuIdsByRoleId(roleId);
         return menuIds;
     }
diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
index 511506cc..6276c35c 100644
--- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
@@ -65,7 +65,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @return
      */
     @Override
-    public IPage<UserPageVO> listUserPages(UserPageQuery queryParams) {
+    public IPage<UserPageVO> getUserPage(UserPageQuery queryParams) {
 
         // 参数构建
         int pageNum = queryParams.getPageNum();
@@ -73,7 +73,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         Page<UserBO> page = new Page<>(pageNum, pageSize);
 
         // 查询数据
-        Page<UserBO> userBoPage = this.baseMapper.listUserPages(page, queryParams);
+        Page<UserBO> userBoPage = this.baseMapper.getUserPage(page, queryParams);
 
         // 实体转换
         Page<UserPageVO> userVoPage = userConverter.bo2Vo(userBoPage);
diff --git a/src/main/resources/mapper/SysDictItemMapper.xml b/src/main/resources/mapper/SysDictMapper.xml
similarity index 73%
rename from src/main/resources/mapper/SysDictItemMapper.xml
rename to src/main/resources/mapper/SysDictMapper.xml
index d20ef69b..cd423a39 100644
--- a/src/main/resources/mapper/SysDictItemMapper.xml
+++ b/src/main/resources/mapper/SysDictMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.youlai.system.mapper.SysDictItemMapper">
+<mapper namespace="com.youlai.system.mapper.SysDictMapper">
 
 </mapper>
diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml
index 15d77d1f..2f8d41fe 100644
--- a/src/main/resources/mapper/SysUserMapper.xml
+++ b/src/main/resources/mapper/SysUserMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.youlai.system.mapper.SysUserMapper">
 
     <!-- 用户分页列表 -->
-    <select id="listUserPages" resultType="com.youlai.system.pojo.bo.UserBO">
+    <select id="getUserPage" resultType="com.youlai.system.pojo.bo.UserBO">
         SELECT
             u.id,
             u.username,