From 3a176ac5efbda4aea1e883b29e68861bd352d642 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 10 Oct 2023 22:37:24 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8F=8A=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/common/model/dto/LoginUser.java | 2 +- .../cnadmin/common/model/dto/RoleDTO.java | 2 +- .../model/request/UpdateStatusRequest.java | 4 +- .../cnadmin/monitor/model/entity/LogDO.java | 2 +- .../monitor/model/query/LoginLogQuery.java | 4 +- .../model/query/OperationLogQuery.java | 4 +- .../cnadmin/monitor/model/vo/LoginLogVO.java | 4 +- .../monitor/model/vo/OperationLogVO.java | 4 +- .../cnadmin/auth/model/vo/UserInfoVO.java | 4 +- .../cnadmin/system/model/entity/DeptDO.java | 2 +- .../cnadmin/system/model/entity/MenuDO.java | 4 +- .../cnadmin/system/model/entity/RoleDO.java | 4 +- .../cnadmin/system/model/entity/UserDO.java | 4 +- .../cnadmin/system/model/query/DeptQuery.java | 4 +- .../cnadmin/system/model/query/MenuQuery.java | 4 +- .../cnadmin/system/model/query/RoleQuery.java | 4 +- .../cnadmin/system/model/query/UserQuery.java | 4 +- .../system/model/request/DeptRequest.java | 4 +- .../system/model/request/MenuRequest.java | 8 +- .../system/model/request/RoleRequest.java | 8 +- .../model/request/UpdateBasicInfoRequest.java | 4 +- .../system/model/request/UserRequest.java | 8 +- .../system/model/vo/AnnouncementVO.java | 4 +- .../cnadmin/system/model/vo/DeptDetailVO.java | 4 +- .../cnadmin/system/model/vo/DeptVO.java | 4 +- .../cnadmin/system/model/vo/MenuVO.java | 8 +- .../cnadmin/system/model/vo/RoleDetailVO.java | 8 +- .../cnadmin/system/model/vo/RoleVO.java | 8 +- .../cnadmin/system/model/vo/UserDetailVO.java | 8 +- .../cnadmin/system/model/vo/UserVO.java | 8 +- .../system/service/RoleDeptService.java | 2 +- .../system/service/RoleMenuService.java | 2 +- .../system/service/UserRoleService.java | 2 +- .../changelog/v1.0.0/continew-admin_table.sql | 168 +++++++++--------- .../changelog/v1.1.0/continew-admin_table.sql | 68 +++---- .../changelog/v1.2.0/continew-admin_table.sql | 54 +++--- 36 files changed, 220 insertions(+), 220 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java index 6980d748..be1d1f36 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java @@ -95,7 +95,7 @@ public class LoginUser implements Serializable { /** * 是否为管理员 * - * @return true：是，false：否 + * @return true：是；false：否 */ public boolean isAdmin() { if (CollUtil.isEmpty(roleCodes)) { diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java index 3a7d949a..298ba332 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java @@ -44,7 +44,7 @@ public class RoleDTO implements Serializable { private String code; /** - * 数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限） + * 数据权限 */ private DataScopeEnum dataScope; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java index 34e1f9aa..369e62a8 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/request/UpdateStatusRequest.java @@ -39,9 +39,9 @@ public class UpdateStatusRequest implements Serializable { private static final long serialVersionUID = 1L; /** - * 状态（1启用 2禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") @NotNull(message = "状态非法") private DisEnableStatusEnum status; } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java index 14506c5c..e4bde07c 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java @@ -95,7 +95,7 @@ public class LogDO implements Serializable { private Long elapsedTime; /** - * 操作状态（1：成功，2：失败） + * 操作状态 */ private LogStatusEnum status; 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 64699c3d..c810f3a7 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 @@ -44,9 +44,9 @@ public class LoginLogQuery implements Serializable { private static final long serialVersionUID = 1L; /** - * 登录状态（1：成功，2：失败） + * 登录状态 */ - @Schema(description = "登录状态（1：成功，2：失败）", example = "1") + @Schema(description = "登录状态（1：成功；2：失败）", example = "1") @Query private Integer status; 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 7f94080f..26160847 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 @@ -51,9 +51,9 @@ public class OperationLogQuery implements Serializable { private String description; /** - * 操作状态（1：成功，2：失败） + * 操作状态 */ - @Schema(description = "操作状态（1：成功，2：失败）", example = "1") + @Schema(description = "操作状态（1：成功；2：失败）", example = "1") @Query private Integer status; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LoginLogVO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LoginLogVO.java index c5325dae..2c42446c 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LoginLogVO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/LoginLogVO.java @@ -41,9 +41,9 @@ public class LoginLogVO extends LogVO { private String description; /** - * 登录状态（1：成功，2：失败） + * 登录状态 */ - @Schema(description = "登录状态（1：成功，2：失败）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "登录状态（1：成功；2：失败）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private LogStatusEnum status; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/OperationLogVO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/OperationLogVO.java index 18c4a32e..eafa0b94 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/OperationLogVO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/vo/OperationLogVO.java @@ -47,9 +47,9 @@ public class OperationLogVO extends LogVO { private String module; /** - * 操作状态（1成功 2失败） + * 操作状态 */ - @Schema(description = "操作状态（1：成功，2：失败）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "操作状态（1：成功；2：失败）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private LogStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java index b2c0f21e..f1a25ec7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java @@ -62,9 +62,9 @@ public class UserInfoVO implements Serializable { private String nickname; /** - * 性别（0：未知，1：男，2：女） + * 性别 */ - @Schema(description = "性别（0：未知，1：男，2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别（0：未知；1：男；2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") private GenderEnum gender; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java index 3cbff126..389c45e4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java @@ -61,7 +61,7 @@ public class DeptDO extends BaseDO { private Integer sort; /** - * 状态（1：启用，2：禁用） + * 状态 */ private DisEnableStatusEnum status; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java index 2b941263..185cd502 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java @@ -47,7 +47,7 @@ public class MenuDO extends BaseDO { private Long parentId; /** - * 菜单类型（1：目录，2：菜单，3：按钮） + * 菜单类型 */ private MenuTypeEnum type; @@ -97,7 +97,7 @@ public class MenuDO extends BaseDO { private Integer sort; /** - * 状态（1：启用，2：禁用） + * 状态 */ private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java index e914c263..3ade9518 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java @@ -47,7 +47,7 @@ public class RoleDO extends BaseDO { private String code; /** - * 数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限） + * 数据权限 */ private DataScopeEnum dataScope; @@ -62,7 +62,7 @@ public class RoleDO extends BaseDO { private Integer sort; /** - * 状态（1：启用，2：禁用） + * 状态 */ private DisEnableStatusEnum status; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java index 919bb206..098c4ffa 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java @@ -54,7 +54,7 @@ public class UserDO extends BaseDO { private String password; /** - * 性别（0：未知，1：男，2：女） + * 性别 */ private GenderEnum gender; @@ -79,7 +79,7 @@ public class UserDO extends BaseDO { private String description; /** - * 状态（1：启用，2：禁用） + * 状态 */ private DisEnableStatusEnum status; 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 c316f846..bce274c8 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 @@ -45,9 +45,9 @@ public class DeptQuery implements Serializable { private String name; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", example = "1") + @Schema(description = "状态（1：启用；2：禁用）", example = "1") @Query private Integer status; } 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 1021a024..25cf5ce4 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 @@ -45,9 +45,9 @@ public class MenuQuery implements Serializable { private String title; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", example = "1") + @Schema(description = "状态（1：启用；2：禁用）", example = "1") @Query private Integer status; } 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 c32b0bdf..8ea212ba 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 @@ -44,9 +44,9 @@ public class RoleQuery implements Serializable { private String name; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", example = "1") + @Schema(description = "状态（1：启用；2：禁用）", example = "1") @Query private Integer status; } 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 14cc59d6..69167d69 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 @@ -51,9 +51,9 @@ public class UserQuery implements Serializable { private String username; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", example = "1") + @Schema(description = "状态（1：启用；2：禁用）", example = "1") @Query private Integer status; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java index d1b448d9..93c51601 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java @@ -74,9 +74,9 @@ public class DeptRequest extends BaseRequest { private String description; /** - * 状态（1启用 2禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java index 832e78ca..f51ab2c7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java @@ -45,9 +45,9 @@ public class MenuRequest extends BaseRequest { private static final long serialVersionUID = 1L; /** - * 菜单类型（1目录 2菜单 3按钮） + * 菜单类型 */ - @Schema(description = "菜单类型（1：目录，2：菜单，3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") + @Schema(description = "菜单类型（1：目录；2：菜单；3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") @NotNull(message = "菜单类型非法") private MenuTypeEnum type; @@ -127,8 +127,8 @@ public class MenuRequest extends BaseRequest { private Long parentId; /** - * 状态（1启用 2禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java index 6e885cc1..2b5e54aa 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java @@ -83,9 +83,9 @@ public class RoleRequest extends BaseRequest { private List menuIds = new ArrayList<>(); /** - * 数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限） + * 数据权限 */ - @Schema(description = "数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限）", type = "Integer", + @Schema(description = "数据权限（1：全部数据权限；2：本部门及以下数据权限；3：本部门数据权限；4：仅本人数据权限；5：自定义数据权限）", type = "Integer", allowableValues = {"1", "2", "3", "4", "5"}, example = "5") private DataScopeEnum dataScope; @@ -96,8 +96,8 @@ public class RoleRequest extends BaseRequest { private List deptIds = new ArrayList<>(); /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java index 1d01cef8..65ab8fb6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java @@ -50,9 +50,9 @@ public class UpdateBasicInfoRequest implements Serializable { private String nickname; /** - * 性别（0未知 1男 2女） + * 性别 */ - @Schema(description = "性别（0：未知，1：男，2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别（0：未知；1：男；2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") @NotNull(message = "性别非法") private GenderEnum gender; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java index bd51c005..a184ad61 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java @@ -78,9 +78,9 @@ public class UserRequest extends BaseRequest { private String phone; /** - * 性别（0：未知，1：男，2：女） + * 性别 */ - @Schema(description = "性别（0：未知，1：男，2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别（0：未知；1：男；2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") @NotNull(message = "性别非法") private GenderEnum gender; @@ -106,8 +106,8 @@ public class UserRequest extends BaseRequest { private String description; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java index 69e0f6bd..27482a9e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java @@ -62,11 +62,11 @@ public class AnnouncementVO extends BaseVO { private LocalDateTime terminateTime; /** - * 状态（1：待发布，2：已发布，3：已过期） + * 状态 * * @return 公告状态 */ - @Schema(description = "状态（1：待发布，2：已发布，3：已过期）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1") + @Schema(description = "状态（1：待发布；2：已发布；3：已过期）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1") public AnnouncementStatusEnum getStatus() { if (null != this.effectiveTime && this.effectiveTime.isAfter(LocalDateTime.now())) { return AnnouncementStatusEnum.PENDING_RELEASE; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java index b95a35e7..0f949444 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptDetailVO.java @@ -69,9 +69,9 @@ public class DeptDetailVO extends BaseDetailVO { private Integer sort; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private DisEnableStatusEnum status; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java index 7c36ea24..4285f402 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DeptVO.java @@ -56,9 +56,9 @@ public class DeptVO extends BaseVO { private Integer sort; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java index a4fcc5e1..34427c5c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/MenuVO.java @@ -79,9 +79,9 @@ public class MenuVO extends BaseVO { private String component; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private DisEnableStatusEnum status; @@ -121,9 +121,9 @@ public class MenuVO extends BaseVO { private String name; /** - * 菜单类型（1：目录，2：菜单，3：按钮） + * 菜单类型 */ - @Schema(description = "菜单类型（1：目录，2：菜单，3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") + @Schema(description = "菜单类型（1：目录；2：菜单；3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") @ExcelProperty(value = "菜单类型", converter = ExcelBaseEnumConverter.class) private MenuTypeEnum type; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java index 9884fab3..4f3638a7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleDetailVO.java @@ -58,9 +58,9 @@ public class RoleDetailVO extends BaseDetailVO { private String code; /** - * 数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限） + * 数据权限 */ - @Schema(description = "数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限）", type = "Integer", + @Schema(description = "数据权限（1：全部数据权限；2：本部门及以下数据权限；3：本部门数据权限；4：仅本人数据权限；5：自定义数据权限）", type = "Integer", allowableValues = {"1", "2", "3", "4", "5"}, example = "5") @ExcelProperty(value = "数据权限", converter = ExcelBaseEnumConverter.class) private DataScopeEnum dataScope; @@ -73,9 +73,9 @@ public class RoleDetailVO extends BaseDetailVO { private Integer sort; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", example = "1") + @Schema(description = "状态（1：启用；2：禁用）", example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private DisEnableStatusEnum status; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java index 8d8f495f..375ff39a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/RoleVO.java @@ -49,9 +49,9 @@ public class RoleVO extends BaseVO { private String code; /** - * 数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限） + * 数据权限 */ - @Schema(description = "数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限）", type = "Integer", + @Schema(description = "数据权限（1：全部数据权限；2：本部门及以下数据权限；3：本部门数据权限；4：仅本人数据权限；5：自定义数据权限）", type = "Integer", allowableValues = {"1", "2", "3", "4", "5"}, example = "5") private DataScopeEnum dataScope; @@ -62,9 +62,9 @@ public class RoleVO extends BaseVO { private Integer sort; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java index 4f01b1a0..b3c98fce 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserDetailVO.java @@ -61,9 +61,9 @@ public class UserDetailVO extends BaseDetailVO { private String nickname; /** - * 性别（0：未知，1：男，2：女） + * 性别 */ - @Schema(description = "性别（0：未知，1：男，2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别（0：未知；1：男；2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") @ExcelProperty(value = "性别", converter = ExcelBaseEnumConverter.class) private GenderEnum gender; @@ -90,9 +90,9 @@ public class UserDetailVO extends BaseDetailVO { private String avatar; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") @ExcelProperty(value = "状态", converter = ExcelBaseEnumConverter.class) private DisEnableStatusEnum status; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java index ab701582..b8e35762 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/UserVO.java @@ -54,9 +54,9 @@ public class UserVO extends BaseVO { private String nickname; /** - * 性别（0：未知，1：男，2：女） + * 性别 */ - @Schema(description = "性别（0：未知，1：男，2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") + @Schema(description = "性别（0：未知；1：男；2：女）", type = "Integer", allowableValues = {"0", "1", "2"}, example = "1") private GenderEnum gender; /** @@ -79,9 +79,9 @@ public class UserVO extends BaseVO { private String phone; /** - * 状态（1：启用，2：禁用） + * 状态 */ - @Schema(description = "状态（1：启用，2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") + @Schema(description = "状态（1：启用；2：禁用）", type = "Integer", allowableValues = {"1", "2"}, example = "1") private DisEnableStatusEnum status; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleDeptService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleDeptService.java index 057ac41c..bf887c7b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleDeptService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleDeptService.java @@ -33,7 +33,7 @@ public interface RoleDeptService { * 部门 ID 列表 * @param roleId * 角色 ID - * @return true：成功，false：无变更/失败 + * @return true：成功；false：无变更/失败 */ boolean save(List deptIds, Long roleId); diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleMenuService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleMenuService.java index ca77b374..e9f2d354 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleMenuService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleMenuService.java @@ -33,7 +33,7 @@ public interface RoleMenuService { * 菜单 ID 列表 * @param roleId * 角色 ID - * @return true：成功，false：无变更/失败 + * @return true：成功；false：无变更/失败 */ boolean save(List menuIds, Long roleId); diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserRoleService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserRoleService.java index 38931239..40b0e6d4 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserRoleService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserRoleService.java @@ -33,7 +33,7 @@ public interface UserRoleService { * 角色 ID 列表 * @param userId * 用户 ID - * @return true：成功，false：无变更/失败 + * @return true：成功；false：无变更/失败 */ boolean save(List roleIds, Long userId); 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 a868dde4..9385cad6 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 @@ -2,24 +2,24 @@ -- changeset Charles7c:1 CREATE TABLE IF NOT EXISTS `sys_menu` ( - `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `title` varchar(30) NOT NULL COMMENT '菜单标题', - `parent_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '上级菜单ID', - `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '菜单类型（1：目录，2：菜单，3：按钮）', - `path` varchar(255) DEFAULT NULL COMMENT '路由地址', - `name` varchar(50) DEFAULT NULL COMMENT '组件名称', - `component` varchar(255) DEFAULT NULL COMMENT '组件路径', - `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标', - `is_external` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否外链', - `is_cache` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否缓存', - `is_hidden` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否隐藏', - `permission` varchar(100) DEFAULT NULL COMMENT '权限标识', - `sort` int UNSIGNED NOT NULL DEFAULT 999 COMMENT '菜单排序', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（1：启用，2：禁用）', - `create_user` bigint(20) UNSIGNED NOT NULL COMMENT '创建人', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '修改人', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', + `title` varchar(30) NOT NULL COMMENT '菜单标题', + `parent_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '上级菜单ID', + `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '菜单类型（1：目录；2：菜单；3：按钮）', + `path` varchar(255) DEFAULT NULL COMMENT '路由地址', + `name` varchar(50) DEFAULT NULL COMMENT '组件名称', + `component` varchar(255) DEFAULT NULL COMMENT '组件路径', + `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标', + `is_external` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否外链', + `is_cache` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否缓存', + `is_hidden` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否隐藏', + `permission` varchar(100) DEFAULT NULL COMMENT '权限标识', + `sort` int NOT NULL DEFAULT 999 COMMENT '菜单排序', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（1：启用；2：禁用）', + `create_user` bigint(20) NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_user` bigint(20) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_title_parent_id`(`title`, `parent_id`) USING BTREE, INDEX `idx_parent_id`(`parent_id`) USING BTREE, @@ -28,18 +28,18 @@ CREATE TABLE IF NOT EXISTS `sys_menu` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='菜单表'; CREATE TABLE IF NOT EXISTS `sys_dept` ( - `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `name` varchar(30) NOT NULL COMMENT '部门名称', - `parent_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '上级部门ID', - `ancestors` varchar(512) DEFAULT '' COMMENT '祖级列表', - `description` varchar(200) DEFAULT NULL COMMENT '描述', - `sort` int UNSIGNED NOT NULL DEFAULT 999 COMMENT '部门排序', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（1：启用，2：禁用）', - `is_system` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否为系统内置数据', - `create_user` bigint(20) UNSIGNED NOT NULL COMMENT '创建人', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '修改人', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', + `name` varchar(30) NOT NULL COMMENT '部门名称', + `parent_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '上级部门ID', + `ancestors` varchar(512) NOT NULL DEFAULT '' COMMENT '祖级列表', + `description` varchar(200) DEFAULT NULL COMMENT '描述', + `sort` int NOT NULL DEFAULT 999 COMMENT '部门排序', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（1：启用；2：禁用）', + `is_system` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否为系统内置数据', + `create_user` bigint(20) NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_user` bigint(20) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_name_parent_id`(`name`, `parent_id`) USING BTREE, INDEX `idx_parent_id`(`parent_id`) USING BTREE, @@ -48,18 +48,18 @@ CREATE TABLE IF NOT EXISTS `sys_dept` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='部门表'; CREATE TABLE IF NOT EXISTS `sys_role` ( - `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `name` varchar(30) NOT NULL COMMENT '角色名称', - `code` varchar(30) NOT NULL COMMENT '角色编码', - `data_scope` tinyint(1) NOT NULL DEFAULT 4 COMMENT '数据权限（1：全部数据权限，2：本部门及以下数据权限，3：本部门数据权限，4：仅本人数据权限，5：自定义数据权限）', - `description` varchar(200) DEFAULT NULL COMMENT '描述', - `sort` int UNSIGNED NOT NULL DEFAULT 999 COMMENT '角色排序', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（1：启用，2：禁用）', - `is_system` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否为系统内置数据', - `create_user` bigint(20) UNSIGNED NOT NULL COMMENT '创建人', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '修改人', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', + `name` varchar(30) NOT NULL COMMENT '角色名称', + `code` varchar(30) NOT NULL COMMENT '角色编码', + `data_scope` tinyint(1) NOT NULL DEFAULT 4 COMMENT '数据权限（1：全部数据权限；2：本部门及以下数据权限；3：本部门数据权限；4：仅本人数据权限；5：自定义数据权限）', + `description` varchar(200) DEFAULT NULL COMMENT '描述', + `sort` int NOT NULL DEFAULT 999 COMMENT '角色排序', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（1：启用；2：禁用）', + `is_system` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否为系统内置数据', + `create_user` bigint(20) NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_user` bigint(20) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_name`(`name`) USING BTREE, UNIQUE INDEX `uk_code`(`code`) USING BTREE, @@ -68,35 +68,35 @@ CREATE TABLE IF NOT EXISTS `sys_role` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色表'; CREATE TABLE IF NOT EXISTS `sys_role_menu` ( - `role_id` bigint(20) UNSIGNED NOT NULL COMMENT '角色ID', - `menu_id` bigint(20) UNSIGNED NOT NULL COMMENT '菜单ID', + `role_id` bigint(20) NOT NULL COMMENT '角色ID', + `menu_id` bigint(20) NOT NULL COMMENT '菜单ID', PRIMARY KEY (`role_id`,`menu_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色和菜单关联表'; CREATE TABLE IF NOT EXISTS `sys_role_dept` ( - `role_id` bigint(20) UNSIGNED NOT NULL COMMENT '角色ID', - `dept_id` bigint(20) UNSIGNED NOT NULL COMMENT '部门ID', + `role_id` bigint(20) NOT NULL COMMENT '角色ID', + `dept_id` bigint(20) NOT NULL COMMENT '部门ID', PRIMARY KEY (`role_id`,`dept_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色和部门关联表'; CREATE TABLE IF NOT EXISTS `sys_user` ( - `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `username` varchar(64) NOT NULL COMMENT '用户名', - `nickname` varchar(30) NOT NULL COMMENT '昵称', - `password` varchar(32) DEFAULT NULL COMMENT '密码', - `gender` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '性别（0：未知，1：男，2：女）', - `email` varchar(255) DEFAULT NULL COMMENT '邮箱', - `phone` varchar(15) DEFAULT NULL COMMENT '手机号码', - `avatar` varchar(255) DEFAULT NULL COMMENT '头像地址', - `description` varchar(200) DEFAULT NULL COMMENT '描述', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（1：启用，2：禁用）', - `is_system` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否为系统内置数据', - `pwd_reset_time` datetime DEFAULT NULL COMMENT '最后一次修改密码时间', - `dept_id` bigint(20) UNSIGNED NOT NULL COMMENT '部门ID', - `create_user` bigint(20) UNSIGNED NOT NULL COMMENT '创建人', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '修改人', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', + `username` varchar(64) NOT NULL COMMENT '用户名', + `nickname` varchar(30) NOT NULL COMMENT '昵称', + `password` varchar(32) DEFAULT NULL COMMENT '密码', + `gender` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '性别（0：未知；1：男；2：女）', + `email` varchar(255) DEFAULT NULL COMMENT '邮箱', + `phone` varchar(15) DEFAULT NULL COMMENT '手机号码', + `avatar` varchar(255) DEFAULT NULL COMMENT '头像地址', + `description` varchar(200) DEFAULT NULL COMMENT '描述', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '状态（1：启用；2：禁用）', + `is_system` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否为系统内置数据', + `pwd_reset_time` datetime DEFAULT NULL COMMENT '最后一次修改密码时间', + `dept_id` bigint(20) NOT NULL COMMENT '部门ID', + `create_user` bigint(20) NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_user` bigint(20) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_username`(`username`) USING BTREE, UNIQUE INDEX `uk_email`(`email`) USING BTREE, @@ -107,31 +107,31 @@ CREATE TABLE IF NOT EXISTS `sys_user` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户表'; CREATE TABLE IF NOT EXISTS `sys_user_role` ( - `user_id` bigint(20) UNSIGNED NOT NULL COMMENT '用户ID', - `role_id` bigint(20) UNSIGNED NOT NULL COMMENT '角色ID', + `user_id` bigint(20) NOT NULL COMMENT '用户ID', + `role_id` bigint(20) NOT NULL COMMENT '角色ID', PRIMARY KEY (`user_id`,`role_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户和角色关联表'; CREATE TABLE IF NOT EXISTS `sys_log` ( - `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `description` 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 '请求头', - `request_body` text DEFAULT NULL COMMENT '请求体', - `status_code` int UNSIGNED NOT NULL COMMENT '状态码', - `response_headers` text DEFAULT NULL COMMENT '响应头', - `response_body` mediumtext DEFAULT NULL COMMENT '响应体', - `elapsed_time` bigint(20) UNSIGNED NOT NULL COMMENT '请求耗时（ms）', - `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '操作状态（1：成功，2：失败）', - `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 '创建人', - `create_time` datetime NOT NULL COMMENT '创建时间', + `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', + `description` 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 '请求头', + `request_body` text DEFAULT NULL COMMENT '请求体', + `status_code` int NOT NULL COMMENT '状态码', + `response_headers` text DEFAULT NULL COMMENT '响应头', + `response_body` mediumtext DEFAULT NULL COMMENT '响应体', + `elapsed_time` bigint(20) NOT NULL COMMENT '请求耗时（ms）', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '操作状态（1：成功；2：失败）', + `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) DEFAULT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, INDEX `idx_module`(`module`) USING BTREE, INDEX `idx_client_ip`(`client_ip`) USING BTREE, diff --git a/continew-admin-webapi/src/main/resources/db/changelog/v1.1.0/continew-admin_table.sql b/continew-admin-webapi/src/main/resources/db/changelog/v1.1.0/continew-admin_table.sql index 7bf8210b..b09a74bd 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/v1.1.0/continew-admin_table.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/v1.1.0/continew-admin_table.sql @@ -2,48 +2,48 @@ -- changeset Charles7c:1 CREATE TABLE IF NOT EXISTS `gen_config` ( - `table_name` varchar(64) COMMENT '表名称', - `module_name` varchar(60) NOT NULL COMMENT '模块名称', - `package_name` varchar(60) NOT NULL COMMENT '包名称', - `frontend_path` varchar(255) DEFAULT NULL COMMENT '前端路径', - `business_name` varchar(50) NOT NULL COMMENT '业务名称', - `author` varchar(100) NOT NULL COMMENT '作者', - `table_prefix` varchar(20) DEFAULT NULL COMMENT '表前缀', - `is_override` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否覆盖', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `table_name` varchar(64) COMMENT '表名称', + `module_name` varchar(60) NOT NULL COMMENT '模块名称', + `package_name` varchar(60) NOT NULL COMMENT '包名称', + `frontend_path` varchar(255) DEFAULT NULL COMMENT '前端路径', + `business_name` varchar(50) NOT NULL COMMENT '业务名称', + `author` varchar(100) NOT NULL COMMENT '作者', + `table_prefix` varchar(20) DEFAULT NULL COMMENT '表前缀', + `is_override` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否覆盖', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`table_name`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生成配置表'; CREATE TABLE IF NOT EXISTS `gen_field_config` ( - `table_name` varchar(64) NOT NULL COMMENT '表名称', - `column_name` varchar(64) NOT NULL COMMENT '列名称', - `column_type` varchar(25) NOT NULL COMMENT '列类型', - `field_name` varchar(64) NOT NULL COMMENT '字段名称', - `field_type` varchar(25) NOT NULL COMMENT '字段类型', - `comment` varchar(512) DEFAULT NULL COMMENT '注释', - `is_required` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否必填', - `show_in_list` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否在列表中显示', - `show_in_form` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否在表单中显示', - `show_in_query` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否在查询中显示', - `form_type` tinyint(1) UNSIGNED DEFAULT NULL COMMENT '表单类型', - `query_type` tinyint(1) UNSIGNED DEFAULT NULL COMMENT '查询方式', - `create_time` datetime NOT NULL COMMENT '创建时间', + `table_name` varchar(64) NOT NULL COMMENT '表名称', + `column_name` varchar(64) NOT NULL COMMENT '列名称', + `column_type` varchar(25) NOT NULL COMMENT '列类型', + `field_name` varchar(64) NOT NULL COMMENT '字段名称', + `field_type` varchar(25) NOT NULL COMMENT '字段类型', + `comment` varchar(512) DEFAULT NULL COMMENT '注释', + `is_required` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否必填', + `show_in_list` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否在列表中显示', + `show_in_form` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否在表单中显示', + `show_in_query` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否在查询中显示', + `form_type` tinyint(1) UNSIGNED DEFAULT NULL COMMENT '表单类型', + `query_type` tinyint(1) UNSIGNED DEFAULT NULL COMMENT '查询方式', + `create_time` datetime NOT NULL COMMENT '创建时间', INDEX `idx_table_name`(`table_name`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='字段配置表'; CREATE TABLE IF NOT EXISTS `sys_announcement` ( - `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `title` varchar(150) NOT NULL COMMENT '标题', - `content` mediumtext NOT NULL COMMENT '内容', - `type` varchar(30) NOT NULL COMMENT '类型', - `effective_time` datetime DEFAULT NULL COMMENT '生效时间', - `terminate_time` datetime DEFAULT NULL COMMENT '终止时间', - `sort` int UNSIGNED NOT NULL DEFAULT 999 COMMENT '排序', - `create_user` bigint(20) UNSIGNED NOT NULL COMMENT '创建人', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '修改人', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', + `title` varchar(150) NOT NULL COMMENT '标题', + `content` mediumtext NOT NULL COMMENT '内容', + `type` varchar(30) NOT NULL COMMENT '类型', + `effective_time` datetime DEFAULT NULL COMMENT '生效时间', + `terminate_time` datetime DEFAULT NULL COMMENT '终止时间', + `sort` int NOT NULL DEFAULT 999 COMMENT '排序', + `create_user` bigint(20) NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_user` bigint(20) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, INDEX `idx_create_user`(`create_user`) USING BTREE, INDEX `idx_update_user`(`update_user`) USING BTREE diff --git a/continew-admin-webapi/src/main/resources/db/changelog/v1.2.0/continew-admin_table.sql b/continew-admin-webapi/src/main/resources/db/changelog/v1.2.0/continew-admin_table.sql index 7174a8b2..c95fac4c 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/v1.2.0/continew-admin_table.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/v1.2.0/continew-admin_table.sql @@ -2,32 +2,32 @@ -- changeset Charles7c:1 CREATE TABLE IF NOT EXISTS `sys_dict` ( - `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `name` varchar(30) NOT NULL COMMENT '字典名称', - `code` varchar(30) NOT NULL COMMENT '字典编码', - `description` varchar(200) DEFAULT NULL COMMENT '描述', - `is_system` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否为系统内置数据', - `create_user` bigint(20) UNSIGNED NOT NULL COMMENT '创建人', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '修改人', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', + `name` varchar(30) NOT NULL COMMENT '字典名称', + `code` varchar(30) NOT NULL COMMENT '字典编码', + `description` varchar(200) DEFAULT NULL COMMENT '描述', + `is_system` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否为系统内置数据', + `create_user` bigint(20) NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_user` bigint(20) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_name`(`name`) USING BTREE, UNIQUE INDEX `uk_code`(`code`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='字典表'; CREATE TABLE IF NOT EXISTS `sys_dict_item` ( - `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `label` varchar(30) NOT NULL COMMENT '字典标签', - `value` varchar(30) NOT NULL COMMENT '字典值', - `color` varchar(30) DEFAULT NULL COMMENT '背景颜色', - `sort` int UNSIGNED NOT NULL DEFAULT 999 COMMENT '字典项排序', - `description` varchar(200) DEFAULT NULL COMMENT '描述', - `dict_id` bigint(20) UNSIGNED NOT NULL COMMENT '字典ID', - `create_user` bigint(20) UNSIGNED NOT NULL COMMENT '创建人', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '修改人', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', + `label` varchar(30) NOT NULL COMMENT '字典标签', + `value` varchar(30) NOT NULL COMMENT '字典值', + `color` varchar(30) DEFAULT NULL COMMENT '背景颜色', + `sort` int NOT NULL DEFAULT 999 COMMENT '字典项排序', + `description` varchar(200) DEFAULT NULL COMMENT '描述', + `dict_id` bigint(20) NOT NULL COMMENT '字典ID', + `create_user` bigint(20) NOT NULL COMMENT '创建人', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_user` bigint(20) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_value_dict_id`(`value`, `dict_id`) USING BTREE, INDEX `idx_dict_id`(`dict_id`) USING BTREE, @@ -36,12 +36,12 @@ CREATE TABLE IF NOT EXISTS `sys_dict_item` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='字典项表'; CREATE TABLE IF NOT EXISTS `sys_option` ( - `name` varchar(50) NOT NULL COMMENT '参数名称', - `code` varchar(100) NOT NULL COMMENT '参数键', - `value` text DEFAULT NULL COMMENT '参数值', - `default_value` text DEFAULT NULL COMMENT '参数默认值', - `description` varchar(200) DEFAULT NULL COMMENT '描述', - `update_user` bigint(20) unsigned DEFAULT NULL COMMENT '修改人', - `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `name` varchar(50) NOT NULL COMMENT '参数名称', + `code` varchar(100) NOT NULL COMMENT '参数键', + `value` text DEFAULT NULL COMMENT '参数值', + `default_value` text DEFAULT NULL COMMENT '参数默认值', + `description` varchar(200) DEFAULT NULL COMMENT '描述', + `update_user` bigint(20) DEFAULT NULL COMMENT '修改人', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`code`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='参数表'; \ No newline at end of file