From 2d2a7e7c8e31763ac3ea514d8a92c3938376dd3a Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 9 Apr 2023 00:40:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Spring MVC 对于对象型参数的属性赋值，如果属性值为 null 则不会调用其对应 set 方法，所以在 set 方法中添加默认处理逻辑无效 --- .../cnadmin/common/model/query/PageQuery.java | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java index 2fc8f17d..a56b8aa6 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java @@ -47,30 +47,24 @@ import cn.hutool.core.util.StrUtil; public class PageQuery extends SortQuery { private static final long serialVersionUID = 1L; + /** 默认页码：1 */ + private static final int DEFAULT_PAGE = 1; + /** 默认每页条数：10 */ + private static final int DEFAULT_SIZE = 10; /** * 页码 */ @Schema(description = "页码") @Min(value = 1, message = "页码最小值为 {value}") - private Integer page; + private Integer page = DEFAULT_PAGE; /** * 每页条数 */ @Schema(description = "每页条数") @Range(min = 1, max = 1000, message = "每页条数（取值范围 {min}-{max}）") - private Integer size; - - /** 默认页码：1 */ - private static final int DEFAULT_PAGE = 1; - /** 默认每页条数：10 */ - private static final int DEFAULT_SIZE = 10; - - public PageQuery(Integer page, Integer size) { - this.setPage(page); - this.setSize(size); - } + private Integer size = DEFAULT_SIZE; /** * 基于分页查询条件转换为 MyBatis Plus 分页条件 @@ -92,12 +86,4 @@ public class PageQuery extends SortQuery { } return mybatisPage; } - - public void setPage(Integer page) { - this.page = page == null ? DEFAULT_PAGE : page; - } - - public void setSize(Integer size) { - this.size = size == null ? DEFAULT_SIZE : size; - } } From ae8d294705536e99d6c30a9ff5257fdb3ee5b35f Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 9 Apr 2023 01:13:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20springdoc-?= =?UTF-8?q?openapi=20=E5=AF=B9=E8=B1=A1=E5=9E=8B=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.使用 default-flat-param-object 全局设置对象型参数展示形式。此设置是在 springdoc-openapi v1.6.11 版本开始添加的新特性（详情请参阅：https://github.com/springdoc/springdoc-openapi/pull/1805），在此之前，只能在所有需要处理的对象型参数类上使用 @ParameterObject，工作量较大。 2.作者在使用上方这个配置时还遇到了一个 Bug，那就是只要在对象型参数前使用了注解，例如：@Validated PageQuery pageQuery，这个配置就不会生效了。此问题已在 GitHub 提交了相应 issue（详情请参阅：https://github.com/springdoc/springdoc-openapi/issues/2181），并且 springdoc-openapi 社区某个小伙伴儿已在当前最新发布的 v2.1.0 和 v1.7.0 中修复。 注意：由于当前使用的 Knife4j 版本其内部引入的 springdoc-openapi 相关依赖非最新版本，所以为了解决配置不生效问题，暂时将部分对象型参数移除了 @Validated 注解（除了 PageQuery，其他类当前也未实际添加校验，所以直接移除了）。当然如果不想移除的话，也可以从依赖上功夫，即移除 Knife4j 内引入的 springdoc-openapi 相关依赖，然后自行添加 springdoc-openapi 相关依赖并指定最新版本即可。 --- .../cnadmin/common/base/BaseController.java | 8 ++++---- .../cnadmin/common/model/query/SortQuery.java | 2 -- .../monitor/model/query/LoginLogQuery.java | 2 -- .../monitor/model/query/OperationLogQuery.java | 2 -- .../monitor/model/query/SystemLogQuery.java | 2 -- .../auth/model/query/OnlineUserQuery.java | 2 -- .../cnadmin/system/model/query/DeptQuery.java | 3 --- .../cnadmin/system/model/query/MenuQuery.java | 3 --- .../cnadmin/system/model/query/RoleQuery.java | 3 --- .../cnadmin/system/model/query/UserQuery.java | 2 -- .../controller/common/CommonController.java | 16 +++++++++++----- .../webapi/controller/monitor/LogController.java | 6 +++--- .../controller/monitor/OnlineUserController.java | 2 +- .../src/main/resources/application.yml | 3 +++ 14 files changed, 22 insertions(+), 34 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java index 08de753c..60ae1e3b 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java @@ -75,7 +75,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "分页查询列表") @ResponseBody @GetMapping - public R> page(@Validated Q query, @Validated PageQuery pageQuery) { + public R> page(Q query, @Validated PageQuery pageQuery) { this.checkPermission("list"); PageDataVO pageDataVO = baseService.page(query, pageQuery); return R.ok(pageDataVO); @@ -93,7 +93,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "查询树列表") @ResponseBody @GetMapping("/tree") - public R>> tree(@Validated Q query, @Validated SortQuery sortQuery) { + public R>> tree(Q query, SortQuery sortQuery) { this.checkPermission("list"); List> list = baseService.tree(query, sortQuery, false); return R.ok(list); @@ -111,7 +111,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "查询列表") @ResponseBody @GetMapping("/list") - public R> list(@Validated Q query, @Validated SortQuery sortQuery) { + public R> list(Q query, SortQuery sortQuery) { this.checkPermission("list"); List list = baseService.list(query, sortQuery); return R.ok(list); @@ -197,7 +197,7 @@ public abstract class BaseController, V, D, Q, */ @Operation(summary = "导出数据") @GetMapping("/export") - public void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) { + public void export(Q query, SortQuery sortQuery, HttpServletResponse response) { this.checkPermission("export"); baseService.export(query, sortQuery, response); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java index f1e98f11..1cc23297 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.data.domain.Sort; import cn.hutool.core.util.ArrayUtil; @@ -39,7 +38,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/2/12 21:30 */ @Data -@ParameterObject @Schema(description = "排序查询条件") public class SortQuery implements Serializable { diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java index c3b001a6..008a6c6a 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; @@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/1/16 23:25 */ @Data -@ParameterObject @Schema(description = "登录日志查询条件") public class LoginLogQuery implements Serializable { diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java index ea7261d0..ba3c28e0 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; @@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/1/15 11:43 */ @Data -@ParameterObject @Schema(description = "操作日志查询条件") public class OperationLogQuery implements Serializable { diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java index afb52733..d6930483 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; @@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/1/17 23:31 */ @Data -@ParameterObject @Schema(description = "系统日志查询条件") public class SystemLogQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java index bd2a9a37..6e506ab0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.constant.StringConsts; @@ -36,7 +35,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/1/20 23:07 */ @Data -@ParameterObject @Schema(description = "在线用户查询条件") public class OnlineUserQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java index 3e9d175b..db21b369 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java @@ -22,8 +22,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; - import top.charles7c.cnadmin.common.annotation.Query; /** @@ -33,7 +31,6 @@ import top.charles7c.cnadmin.common.annotation.Query; * @since 2023/1/22 17:52 */ @Data -@ParameterObject @Schema(description = "部门查询条件") public class DeptQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java index dee81cf0..b324c4f4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java @@ -22,8 +22,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; - import top.charles7c.cnadmin.common.annotation.Query; /** @@ -33,7 +31,6 @@ import top.charles7c.cnadmin.common.annotation.Query; * @since 2023/2/15 20:21 */ @Data -@ParameterObject @Schema(description = "菜单查询条件") public class MenuQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java index 24aa35b9..68e4d6f0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java @@ -22,8 +22,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; - import top.charles7c.cnadmin.common.annotation.Query; /** @@ -33,7 +31,6 @@ import top.charles7c.cnadmin.common.annotation.Query; * @since 2023/2/8 23:04 */ @Data -@ParameterObject @Schema(description = "角色查询条件") public class RoleQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java index 77a21701..2f7352eb 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; @@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/2/20 21:01 */ @Data -@ParameterObject @Schema(description = "用户查询条件") public class UserQuery implements Serializable { diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java index 23ee0d26..bf4d4fb0 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java @@ -16,7 +16,10 @@ package top.charles7c.cnadmin.webapi.controller.common; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -25,7 +28,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ClassUtil; @@ -65,21 +71,21 @@ public class CommonController { @Operation(summary = "查询部门树", description = "查询树结构的部门列表") @GetMapping("/tree/dept") - public R>> listDeptTree(@Validated DeptQuery query, @Validated SortQuery sortQuery) { + public R>> listDeptTree(DeptQuery query, SortQuery sortQuery) { List> treeList = deptService.tree(query, sortQuery, true); return R.ok(treeList); } @Operation(summary = "查询菜单树", description = "查询树结构的菜单列表") @GetMapping("/tree/menu") - public R>> listMenuTree(@Validated MenuQuery query, @Validated SortQuery sortQuery) { + public R>> listMenuTree(MenuQuery query, SortQuery sortQuery) { List> treeList = menuService.tree(query, sortQuery, true); return R.ok(treeList); } @Operation(summary = "查询角色字典", description = "查询角色字典列表") @GetMapping("/dict/role") - public R>> listRoleDict(@Validated RoleQuery query, @Validated SortQuery sortQuery) { + public R>> listRoleDict(RoleQuery query, SortQuery sortQuery) { List list = roleService.list(query, sortQuery); List> labelValueVOList = roleService.buildDict(list); return R.ok(labelValueVOList); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java index 9ccb4b9d..0314a171 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java @@ -57,7 +57,7 @@ public class LogController { @Log(module = "登录日志") @Operation(summary = "分页查询登录日志列表") @GetMapping("/login") - public R> page(@Validated LoginLogQuery query, @Validated PageQuery pageQuery) { + public R> page(LoginLogQuery query, @Validated PageQuery pageQuery) { PageDataVO pageDataVO = logService.page(query, pageQuery); return R.ok(pageDataVO); } @@ -65,7 +65,7 @@ public class LogController { @Log(module = "操作日志") @Operation(summary = "分页查询操作日志列表") @GetMapping("/operation") - public R> page(@Validated OperationLogQuery query, @Validated PageQuery pageQuery) { + public R> page(OperationLogQuery query, @Validated PageQuery pageQuery) { PageDataVO pageDataVO = logService.page(query, pageQuery); return R.ok(pageDataVO); } @@ -73,7 +73,7 @@ public class LogController { @Log(module = "系统日志") @Operation(summary = "分页查询系统日志列表") @GetMapping("/system") - public R> page(@Validated SystemLogQuery query, @Validated PageQuery pageQuery) { + public R> page(SystemLogQuery query, @Validated PageQuery pageQuery) { PageDataVO pageDataVO = logService.page(query, pageQuery); return R.ok(pageDataVO); } diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java index 07acb570..30fde9ac 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java @@ -52,7 +52,7 @@ public class OnlineUserController { @Operation(summary = "分页查询列表") @SaCheckPermission("monitor:online:user:list") @GetMapping - public R> page(@Validated OnlineUserQuery query, @Validated PageQuery pageQuery) { + public R> page(OnlineUserQuery query, @Validated PageQuery pageQuery) { return R.ok(onlineUserService.page(query, pageQuery)); } diff --git a/continew-admin-webapi/src/main/resources/application.yml b/continew-admin-webapi/src/main/resources/application.yml index 4beec919..49a1fdc2 100644 --- a/continew-admin-webapi/src/main/resources/application.yml +++ b/continew-admin-webapi/src/main/resources/application.yml @@ -47,6 +47,9 @@ logging: --- ### 接口文档配置 springdoc: + # 设置对象型参数的展示形式（设为 true 表示将对象型参数平展开，即对象内的属性直接作为参数展示而不是嵌套在对象内，默认为 false） + # 如果不添加该全局配置，可以在需要如此处理的对象参数类上使用 @ParameterObject + default-flat-param-object: true swagger-ui: path: /swagger-ui.html tags-sorter: alpha From f3fabea7dd736d94badecbc08091eec6274f5fb7 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 13 Apr 2023 20:51:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=BB=93=E6=9E=84=E4=B8=AD=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=9E=8B=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../changelog/v1.0.0/continew-admin_table.sql | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql b/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql index 6d1ab7de..90e631ce 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql @@ -3,11 +3,11 @@ -- changeset Charles7c:1 CREATE TABLE IF NOT EXISTS `sys_menu` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `title` varchar(255) NOT NULL COMMENT '菜单标题', + `title` varchar(50) NOT NULL COMMENT '菜单标题', `parent_id` bigint(20) UNSIGNED DEFAULT 0 COMMENT '上级菜单ID', `type` tinyint(1) UNSIGNED DEFAULT 1 COMMENT '菜单类型（1：目录，2：菜单，3：按钮）', `path` varchar(512) DEFAULT NULL COMMENT '路由地址', - `name` varchar(255) DEFAULT NULL COMMENT '组件名称', + `name` varchar(50) DEFAULT NULL COMMENT '组件名称', `component` varchar(255) DEFAULT NULL COMMENT '组件路径', `icon` varchar(255) DEFAULT NULL COMMENT '菜单图标', `is_external` bit(1) DEFAULT b'0' COMMENT '是否外链', @@ -28,7 +28,7 @@ CREATE TABLE IF NOT EXISTS `sys_menu` ( CREATE TABLE IF NOT EXISTS `sys_dept` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `name` varchar(255) NOT NULL COMMENT '部门名称', + `name` varchar(50) NOT NULL COMMENT '部门名称', `parent_id` bigint(20) UNSIGNED DEFAULT 0 COMMENT '上级部门ID', `ancestors` varchar(512) DEFAULT '' COMMENT '祖级列表', `description` varchar(512) DEFAULT NULL COMMENT '描述', @@ -47,8 +47,8 @@ CREATE TABLE IF NOT EXISTS `sys_dept` ( CREATE TABLE IF NOT EXISTS `sys_role` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `name` varchar(255) NOT NULL COMMENT '角色名称', - `code` varchar(255) NOT NULL COMMENT '角色编码', + `name` varchar(50) NOT NULL COMMENT '角色名称', + `code` varchar(50) NOT NULL COMMENT '角色编码', `data_scope` tinyint(1) DEFAULT 4 COMMENT '数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限）', `description` varchar(512) DEFAULT NULL COMMENT '描述', `sort` int(11) UNSIGNED DEFAULT 999 COMMENT '角色排序', @@ -77,12 +77,12 @@ CREATE TABLE IF NOT EXISTS `sys_role_dept` ( CREATE TABLE IF NOT EXISTS `sys_user` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `username` varchar(255) NOT NULL COMMENT '用户名', - `nickname` varchar(255) DEFAULT NULL COMMENT '昵称', + `username` varchar(50) NOT NULL COMMENT '用户名', + `nickname` varchar(50) DEFAULT NULL COMMENT '昵称', `password` varchar(255) DEFAULT NULL COMMENT '密码', `gender` tinyint(1) UNSIGNED DEFAULT 0 COMMENT '性别（0：未知，1：男，2：女）', - `email` varchar(255) DEFAULT NULL COMMENT '邮箱', - `phone` varchar(255) DEFAULT NULL COMMENT '手机号码', + `email` varchar(100) DEFAULT NULL COMMENT '邮箱', + `phone` varchar(50) DEFAULT NULL COMMENT '手机号码', `avatar` varchar(255) DEFAULT NULL COMMENT '头像地址', `description` varchar(512) DEFAULT NULL COMMENT '描述', `status` tinyint(1) UNSIGNED DEFAULT 1 COMMENT '状态（1：启用，2：禁用）', @@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS `sys_user_role` ( CREATE TABLE IF NOT EXISTS `sys_log` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', `description` varchar(255) NOT NULL COMMENT '日志描述', - `module` varchar(255) NOT NULL COMMENT '所属模块', + `module` varchar(50) NOT NULL COMMENT '所属模块', `request_url` varchar(512) NOT NULL COMMENT '请求URL', `request_method` varchar(10) NOT NULL COMMENT '请求方式', `request_headers` text DEFAULT NULL COMMENT '请求头', @@ -120,9 +120,9 @@ CREATE TABLE IF NOT EXISTS `sys_log` ( `response_body` mediumtext DEFAULT NULL COMMENT '响应体', `elapsed_time` bigint(20) UNSIGNED NOT NULL COMMENT '请求耗时（ms）', `status` tinyint(1) UNSIGNED DEFAULT 1 COMMENT '操作状态（1：成功，2：失败）', - `client_ip` varchar(255) DEFAULT NULL COMMENT '客户端IP', - `location` varchar(512) DEFAULT NULL COMMENT 'IP归属地', - `browser` varchar(255) DEFAULT NULL COMMENT '浏览器', + `client_ip` varchar(100) DEFAULT NULL COMMENT '客户端IP', + `location` varchar(255) DEFAULT NULL COMMENT 'IP归属地', + `browser` varchar(100) DEFAULT NULL COMMENT '浏览器', `error_msg` text DEFAULT NULL COMMENT '错误信息', `exception_detail` mediumtext DEFAULT NULL COMMENT '异常详情', `create_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '创建人', From 165effedb9fccc0df61690eccb8433c6e8ff4544 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 13 Apr 2023 21:03:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- continew-admin-webapi/src/main/resources/application-prod.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/continew-admin-webapi/src/main/resources/application-prod.yml b/continew-admin-webapi/src/main/resources/application-prod.yml index 55ffc391..c0aa5884 100644 --- a/continew-admin-webapi/src/main/resources/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/application-prod.yml @@ -128,6 +128,10 @@ rsa: springdoc: swagger-ui: enabled: false +## 接口文档增强配置 +knife4j: + # 开启生产环境屏蔽 + production: true --- ### 文件上传配置 spring.servlet: From efbcb9b39d273902590119a271e9ed89a9767651 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 13 Apr 2023 22:29:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=AE=9E=E7=8E=B0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/config/mybatis/DataPermissionHandlerImpl.java | 7 +++++-- .../cnadmin/monitor/service/impl/LogServiceImpl.java | 2 +- .../cnadmin/auth/service/impl/LoginServiceImpl.java | 2 +- .../cnadmin/auth/service/impl/OnlineUserServiceImpl.java | 2 +- .../cnadmin/auth/service/impl/PermissionServiceImpl.java | 2 +- .../cnadmin/system/service/impl/DeptServiceImpl.java | 2 +- .../cnadmin/system/service/impl/MenuServiceImpl.java | 2 +- .../cnadmin/system/service/impl/RoleDeptServiceImpl.java | 2 +- .../cnadmin/system/service/impl/RoleMenuServiceImpl.java | 2 +- .../cnadmin/system/service/impl/RoleServiceImpl.java | 2 +- .../cnadmin/system/service/impl/UserRoleServiceImpl.java | 2 +- .../cnadmin/system/service/impl/UserServiceImpl.java | 2 +- 12 files changed, 16 insertions(+), 13 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java index 21c43137..658a72f7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java @@ -32,7 +32,10 @@ import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.model.dto.RoleDTO; import top.charles7c.cnadmin.common.util.helper.LoginHelper; -import net.sf.jsqlparser.expression.*; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.Function; +import net.sf.jsqlparser.expression.LongValue; +import net.sf.jsqlparser.expression.Parenthesis; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.conditional.OrExpression; import net.sf.jsqlparser.expression.operators.relational.EqualsTo; @@ -45,7 +48,7 @@ import net.sf.jsqlparser.statement.select.SelectExpressionItem; import net.sf.jsqlparser.statement.select.SubSelect; /** - * 数据权限处理器实现类 + * 数据权限处理器实现 *

* 来源：DataPermissionInterceptor 如何使用？ *

diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java index 17f21b57..468d822a 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java @@ -49,7 +49,7 @@ import top.charles7c.cnadmin.monitor.model.vo.*; import top.charles7c.cnadmin.monitor.service.LogService; /** - * 系统日志业务实现类 + * 系统日志业务实现 * * @author Charles7c * @since 2022/12/23 20:12 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java index ff7ddf25..170b51ee 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java @@ -53,7 +53,7 @@ import top.charles7c.cnadmin.system.service.RoleService; import top.charles7c.cnadmin.system.service.UserService; /** - * 登录业务实现类 + * 登录业务实现 * * @author Charles7c * @since 2022/12/21 21:49 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java index 81fb068a..a9baf00b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java @@ -41,7 +41,7 @@ import top.charles7c.cnadmin.common.model.vo.PageDataVO; import top.charles7c.cnadmin.common.util.helper.LoginHelper; /** - * 在线用户业务实现类 + * 在线用户业务实现 * * @author Charles7c * @author Lion Li（RuoYi-Vue-Plus） diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java index daafa551..18d14041 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java @@ -30,7 +30,7 @@ import top.charles7c.cnadmin.system.service.MenuService; import top.charles7c.cnadmin.system.service.RoleService; /** - * 权限业务实现类 + * 权限业务实现 * * @author Charles7c * @since 2023/3/2 20:40 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index 5dd381f7..f2635abe 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -48,7 +48,7 @@ import top.charles7c.cnadmin.system.service.RoleDeptService; import top.charles7c.cnadmin.system.service.UserService; /** - * 部门业务实现类 + * 部门业务实现 * * @author Charles7c * @since 2023/1/22 17:55 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java index f42788cf..49e8eacf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java @@ -36,7 +36,7 @@ import top.charles7c.cnadmin.system.model.vo.MenuVO; import top.charles7c.cnadmin.system.service.MenuService; /** - * 菜单业务实现类 + * 菜单业务实现 * * @author Charles7c * @since 2023/2/15 20:30 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java index ca4ad4c9..31ff3b8b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java @@ -31,7 +31,7 @@ import top.charles7c.cnadmin.system.model.entity.RoleDeptDO; import top.charles7c.cnadmin.system.service.RoleDeptService; /** - * 角色和部门业务实现类 + * 角色和部门业务实现 * * @author Charles7c * @since 2023/2/19 10:47 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java index 6fabaf6c..afaabb89 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java @@ -32,7 +32,7 @@ import top.charles7c.cnadmin.system.model.entity.RoleMenuDO; import top.charles7c.cnadmin.system.service.RoleMenuService; /** - * 角色和菜单业务实现类 + * 角色和菜单业务实现 * * @author Charles7c * @since 2023/2/19 10:43 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java index 2ee157d3..f69ddce3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java @@ -47,7 +47,7 @@ import top.charles7c.cnadmin.system.model.vo.RoleVO; import top.charles7c.cnadmin.system.service.*; /** - * 角色业务实现类 + * 角色业务实现 * * @author Charles7c * @since 2023/2/8 23:17 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java index 7e5c6576..89620b3a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java @@ -31,7 +31,7 @@ import top.charles7c.cnadmin.system.model.entity.UserRoleDO; import top.charles7c.cnadmin.system.service.UserRoleService; /** - * 用户和角色业务实现类 + * 用户和角色业务实现 * * @author Charles7c * @since 2023/2/20 21:30 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index 5dff7b6a..cedf71fc 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -63,7 +63,7 @@ import top.charles7c.cnadmin.system.service.UserRoleService; import top.charles7c.cnadmin.system.service.UserService; /** - * 用户业务实现类 + * 用户业务实现 * * @author Charles7c * @since 2022/12/21 21:49