From e3e958b419e1ea23fe146b255fce749050302f63 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 6 Jan 2024 18:45:56 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/system/model/entity/DeptDO.java | 4 +-- .../admin/system/model/entity/DictDO.java | 4 +-- .../admin/system/model/entity/DictItemDO.java | 6 ++-- .../admin/system/model/entity/MenuDO.java | 8 +++--- .../admin/system/model/entity/OptionDO.java | 8 +++--- .../admin/system/model/entity/RoleDO.java | 6 ++-- .../admin/system/model/query/DeptQuery.java | 4 +-- .../admin/system/model/query/DictQuery.java | 4 +-- .../admin/system/model/query/MenuQuery.java | 4 +-- .../admin/system/model/query/OptionQuery.java | 6 ++-- .../admin/system/model/query/RoleQuery.java | 4 +-- .../admin/system/model/req/DeptReq.java | 14 +++++----- .../admin/system/model/req/DictItemReq.java | 22 +++++++-------- .../admin/system/model/req/DictReq.java | 16 +++++------ .../admin/system/model/req/MenuReq.java | 28 +++++++++---------- .../admin/system/model/req/OptionReq.java | 14 +++++----- .../system/model/req/OptionResetValueReq.java | 6 ++-- .../admin/system/model/req/RoleReq.java | 22 +++++++-------- .../system/model/resp/DeptDetailResp.java | 10 +++---- .../admin/system/model/resp/DeptResp.java | 8 +++--- .../system/model/resp/DictDetailResp.java | 8 +++--- .../system/model/resp/DictItemDetailResp.java | 18 ++++++------ .../admin/system/model/resp/DictItemResp.java | 12 ++++---- .../admin/system/model/resp/DictResp.java | 8 +++--- .../admin/system/model/resp/MenuResp.java | 24 ++++++++-------- .../admin/system/model/resp/OptionResp.java | 14 +++++----- .../system/model/resp/RoleDetailResp.java | 18 ++++++------ .../admin/system/model/resp/RoleResp.java | 12 ++++---- .../changelog/v1.0.0/continew-admin_table.sql | 18 ++++++------ .../changelog/v1.2.0/continew-admin_table.sql | 20 ++++++------- 30 files changed, 175 insertions(+), 175 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java index 7646a0ea..4b8f8133 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DeptDO.java @@ -39,7 +39,7 @@ public class DeptDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 部门名称 + * 名称 */ private String name; @@ -59,7 +59,7 @@ public class DeptDO extends BaseDO { private String description; /** - * 部门排序 + * 排序 */ private Integer sort; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java index 5c38272c..cfa38316 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictDO.java @@ -38,12 +38,12 @@ public class DictDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 字典名称 + * 名称 */ private String name; /** - * 字典编码 + * 编码 */ private String code; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java index 31b59b56..a173b357 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/DictItemDO.java @@ -38,17 +38,17 @@ public class DictItemDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 字典标签 + * 标签 */ private String label; /** - * 字典值 + * 值 */ private String value; /** - * 背景颜色 + * 标签颜色 */ private String color; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java index 231129e7..24885bc2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MenuDO.java @@ -40,7 +40,7 @@ public class MenuDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 菜单标题 + * 标题 */ private String title; @@ -50,7 +50,7 @@ public class MenuDO extends BaseDO { private Long parentId; /** - * 菜单类型 + * 类型 */ private MenuTypeEnum type; @@ -70,7 +70,7 @@ public class MenuDO extends BaseDO { private String component; /** - * 菜单图标 + * 图标 */ private String icon; @@ -95,7 +95,7 @@ public class MenuDO extends BaseDO { private String permission; /** - * 菜单排序 + * 排序 */ private Integer sort; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/OptionDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/OptionDO.java index d4ad383d..7b481da6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/OptionDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/OptionDO.java @@ -41,23 +41,23 @@ public class OptionDO implements Serializable { private static final long serialVersionUID = 1L; /** - * 参数名称 + * 名称 */ private String name; /** - * 参数键 + * 键 */ @TableId private String code; /** - * 参数值 + * 值 */ private String value; /** - * 参数默认值 + * 默认值 */ private String defaultValue; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java index 2b7de7e5..a57813e8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/RoleDO.java @@ -40,12 +40,12 @@ public class RoleDO extends BaseDO { private static final long serialVersionUID = 1L; /** - * 角色名称 + * 名称 */ private String name; /** - * 角色编码 + * 编码 */ private String code; @@ -60,7 +60,7 @@ public class RoleDO extends BaseDO { private String description; /** - * 角色排序 + * 排序 */ private Integer sort; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java index 5bf0c925..fe2da6d0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java @@ -40,9 +40,9 @@ public class DeptQuery implements Serializable { private static final long serialVersionUID = 1L; /** - * 部门名称 + * 名称 */ - @Schema(description = "部门名称", example = "测试部") + @Schema(description = "名称", example = "测试部") @Query(type = QueryType.INNER_LIKE) private String name; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java index ce3f94d4..07ed31b2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java @@ -39,9 +39,9 @@ public class DictQuery implements Serializable { private static final long serialVersionUID = 1L; /** - * 字典名称 + * 名称 */ - @Schema(description = "字典名称") + @Schema(description = "名称") @Query(blurry = {"code", "name", "description"}) private String name; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java index 284b42e7..624046a7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java @@ -40,9 +40,9 @@ public class MenuQuery implements Serializable { private static final long serialVersionUID = 1L; /** - * 菜单标题 + * 标题 */ - @Schema(description = "菜单标题", example = "用户管理") + @Schema(description = "标题", example = "用户管理") @Query(type = QueryType.INNER_LIKE) private String title; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java index 86aa9df1..04c4c7ef 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java @@ -43,10 +43,10 @@ public class OptionQuery implements Serializable { private static final long serialVersionUID = 1L; /** - * 参数键列表 + * 键列表 */ - @Schema(description = "参数键列表", example = "site_title,site_copyright") - @NotEmpty(message = "参数键不能为空") + @Schema(description = "键列表", example = "site_title,site_copyright") + @NotEmpty(message = "键不能为空") @Query(type = QueryType.IN) private List code; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java index 1ada6ff8..670a8bfe 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java @@ -39,9 +39,9 @@ public class RoleQuery implements Serializable { private static final long serialVersionUID = 1L; /** - * 角色名称 + * 名称 */ - @Schema(description = "角色名称", example = "测试人员") + @Schema(description = "名称", example = "测试人员") @Query(blurry = {"name", "code"}) private String name; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java index 2d1b0787..8032b94b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DeptReq.java @@ -55,18 +55,18 @@ public class DeptReq extends BaseReq { private Long parentId; /** - * 部门名称 + * 名称 */ - @Schema(description = "部门名称", example = "测试部") - @NotBlank(message = "部门名称不能为空") - @Pattern(regexp = RegexConstants.GENERAL_NAME, message = "部门名称长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线") + @Schema(description = "名称", example = "测试部") + @NotBlank(message = "名称不能为空") + @Pattern(regexp = RegexConstants.GENERAL_NAME, message = "名称长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线") private String name; /** - * 部门排序 + * 排序 */ - @Schema(description = "部门排序", example = "1") - @Min(value = 1, message = "部门排序最小值为 {value}") + @Schema(description = "排序", example = "1") + @Min(value = 1, message = "排序最小值为 {value}") private Integer sort; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java index 2aa8cc1d..24dec6bd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictItemReq.java @@ -42,26 +42,26 @@ public class DictItemReq extends BaseReq { private static final long serialVersionUID = 1L; /** - * 字典标签 + * 标签 */ - @Schema(description = "字典标签", example = "通知") - @NotBlank(message = "字典标签不能为空") - @Length(max = 30, message = "字典标签长度不能超过 {max} 个字符") + @Schema(description = "标签", example = "通知") + @NotBlank(message = "标签不能为空") + @Length(max = 30, message = "标签长度不能超过 {max} 个字符") private String label; /** - * 字典值 + * 值 */ - @Schema(description = "字典值", example = "1") - @NotBlank(message = "字典值不能为空") - @Length(max = 30, message = "字典值长度不能超过 {max} 个字符") + @Schema(description = "值", example = "1") + @NotBlank(message = "值不能为空") + @Length(max = 30, message = "值长度不能超过 {max} 个字符") private String value; /** - * 背景颜色 + * 标签颜色 */ - @Schema(description = "背景颜色", example = "blue") - @Length(max = 30, message = "背景颜色长度不能超过 {max} 个字符") + @Schema(description = "标签颜色", example = "blue") + @Length(max = 30, message = "标签颜色长度不能超过 {max} 个字符") private String color; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java index ea28df4b..553ab843 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/DictReq.java @@ -43,19 +43,19 @@ public class DictReq extends BaseReq { private static final long serialVersionUID = 1L; /** - * 字典名称 + * 名称 */ - @Schema(description = "字典名称", example = "公告类型") - @NotBlank(message = "字典名称不能为空") - @Pattern(regexp = RegexConstants.GENERAL_NAME, message = "字典名称长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线") + @Schema(description = "名称", example = "公告类型") + @NotBlank(message = "名称不能为空") + @Pattern(regexp = RegexConstants.GENERAL_NAME, message = "名称长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线") private String name; /** - * 字典编码 + * 编码 */ - @Schema(description = "字典编码", example = "announcement_type") - @NotBlank(message = "字典编码不能为空") - @Pattern(regexp = RegexConstants.GENERAL_CODE, message = "字典编码长度为 2 到 30 位，可以包含字母、数字，下划线，以字母开头") + @Schema(description = "编码", example = "announcement_type") + @NotBlank(message = "编码不能为空") + @Pattern(regexp = RegexConstants.GENERAL_CODE, message = "编码长度为 2 到 30 位，可以包含字母、数字，下划线，以字母开头") private String code; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java index a201b561..4c4d78cf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/MenuReq.java @@ -46,33 +46,33 @@ public class MenuReq extends BaseReq { private static final long serialVersionUID = 1L; /** - * 菜单类型 + * 类型 */ - @Schema(description = "菜单类型（1：目录；2：菜单；3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") - @NotNull(message = "菜单类型非法") + @Schema(description = "类型（1：目录；2：菜单；3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") + @NotNull(message = "类型非法") private MenuTypeEnum type; /** - * 菜单图标 + * 图标 */ - @Schema(description = "菜单图标", example = "user") - @Length(max = 50, message = "菜单图标长度不能超过 {max} 个字符") + @Schema(description = "图标", example = "user") + @Length(max = 50, message = "图标长度不能超过 {max} 个字符") private String icon; /** - * 菜单标题 + * 标题 */ - @Schema(description = "菜单标题", example = "用户管理") - @NotBlank(message = "菜单标题不能为空") - @Length(max = 30, message = "菜单标题长度不能超过 {max} 个字符") + @Schema(description = "标题", example = "用户管理") + @NotBlank(message = "标题不能为空") + @Length(max = 30, message = "标题长度不能超过 {max} 个字符") private String title; /** - * 菜单排序 + * 排序 */ - @Schema(description = "菜单排序", example = "1") - @NotNull(message = "菜单排序不能为空") - @Min(value = 1, message = "菜单排序最小值为 {value}") + @Schema(description = "排序", example = "1") + @NotNull(message = "排序不能为空") + @Min(value = 1, message = "排序最小值为 {value}") private Integer sort; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java index 40a2c8e2..adaaa70c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionReq.java @@ -42,17 +42,17 @@ public class OptionReq extends BaseReq { private static final long serialVersionUID = 1L; /** - * 参数键 + * 键 */ - @Schema(description = "参数键", example = "site_title") - @NotBlank(message = "参数键不能为空") - @Length(max = 100, message = "参数键长度不能超过 {max} 个字符") + @Schema(description = "键", example = "site_title") + @NotBlank(message = "键不能为空") + @Length(max = 100, message = "键长度不能超过 {max} 个字符") private String code; /** - * 参数值 + * 值 */ - @Schema(description = "参数值", example = "ContiNew Admin") - @NotBlank(message = "参数值不能为空") + @Schema(description = "值", example = "ContiNew Admin") + @NotBlank(message = "值不能为空") private String value; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionResetValueReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionResetValueReq.java index 1a68097c..ac64a2e5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionResetValueReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/OptionResetValueReq.java @@ -40,9 +40,9 @@ public class OptionResetValueReq implements Serializable { private static final long serialVersionUID = 1L; /** - * 参数键列表 + * 键列表 */ - @Schema(description = "参数键列表", example = "site_title,site_copyright") - @NotEmpty(message = "参数键不能为空") + @Schema(description = "键列表", example = "site_title,site_copyright") + @NotEmpty(message = "键不能为空") private List code; } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java index 9bab8698..a87c2384 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/req/RoleReq.java @@ -49,26 +49,26 @@ public class RoleReq extends BaseReq { private static final long serialVersionUID = 1L; /** - * 角色名称 + * 名称 */ - @Schema(description = "角色名称", example = "测试人员") - @NotBlank(message = "角色名称不能为空") - @Pattern(regexp = RegexConstants.GENERAL_NAME, message = "角色名称长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线") + @Schema(description = "名称", example = "测试人员") + @NotBlank(message = "名称不能为空") + @Pattern(regexp = RegexConstants.GENERAL_NAME, message = "名称长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线") private String name; /** - * 角色编码 + * 编码 */ - @Schema(description = "角色编码", example = "test") - @NotBlank(message = "角色编码不能为空") - @Pattern(regexp = RegexConstants.GENERAL_CODE, message = "角色编码长度为 2 到 30 位，可以包含字母、数字，下划线，以字母开头") + @Schema(description = "编码", example = "test") + @NotBlank(message = "编码不能为空") + @Pattern(regexp = RegexConstants.GENERAL_CODE, message = "编码长度为 2 到 30 位，可以包含字母、数字，下划线，以字母开头") private String code; /** - * 角色排序 + * 排序 */ - @Schema(description = "角色排序", example = "1") - @Min(value = 1, message = "角色排序最小值为 {value}") + @Schema(description = "排序", example = "1") + @Min(value = 1, message = "排序最小值为 {value}") private Integer sort; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java index 34ea099d..3268873c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptDetailResp.java @@ -45,10 +45,10 @@ public class DeptDetailResp extends BaseDetailResp { private static final long serialVersionUID = 1L; /** - * 部门名称 + * 名称 */ - @Schema(description = "部门名称", example = "测试部") - @ExcelProperty(value = "部门名称") + @Schema(description = "名称", example = "测试部") + @ExcelProperty(value = "名称") private String name; /** @@ -66,9 +66,9 @@ public class DeptDetailResp extends BaseDetailResp { private String parentName; /** - * 部门排序 + * 排序 */ - @Schema(description = "部门排序", example = "1") + @Schema(description = "排序", example = "1") private Integer sort; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java index f2276976..6017d112 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DeptResp.java @@ -41,9 +41,9 @@ public class DeptResp extends BaseResp { private static final long serialVersionUID = 1L; /** - * 部门名称 + * 名称 */ - @Schema(description = "部门名称", example = "测试部") + @Schema(description = "名称", example = "测试部") private String name; /** @@ -53,9 +53,9 @@ public class DeptResp extends BaseResp { private Long parentId; /** - * 部门排序 + * 排序 */ - @Schema(description = "部门排序", example = "3") + @Schema(description = "排序", example = "3") private Integer sort; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictDetailResp.java index 0e4629d6..a83ec013 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictDetailResp.java @@ -38,15 +38,15 @@ public class DictDetailResp extends BaseDetailResp { private static final long serialVersionUID = 1L; /** - * 字典名称 + * 名称 */ - @Schema(description = "字典名称", example = "公告类型") + @Schema(description = "名称", example = "公告类型") private String name; /** - * 字典编码 + * 编码 */ - @Schema(description = "字典编码", example = "announcement_type") + @Schema(description = "编码", example = "announcement_type") private String code; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemDetailResp.java index 74037320..34606307 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemDetailResp.java @@ -42,24 +42,24 @@ public class DictItemDetailResp extends BaseDetailResp { private static final long serialVersionUID = 1L; /** - * 字典标签 + * 标签 */ - @Schema(description = "字典标签", example = "通知") - @ExcelProperty(value = "字典标签", order = 2) + @Schema(description = "标签", example = "通知") + @ExcelProperty(value = "标签", order = 2) private String label; /** - * 字典值 + * 值 */ - @Schema(description = "字典值", example = "1") - @ExcelProperty(value = "字典值", order = 3) + @Schema(description = "值", example = "1") + @ExcelProperty(value = "值", order = 3) private String value; /** - * 背景颜色 + * 标签颜色 */ - @Schema(description = "背景颜色", example = "blue") - @ExcelProperty(value = "背景颜色", order = 4) + @Schema(description = "标签颜色", example = "blue") + @ExcelProperty(value = "标签颜色", order = 4) private String color; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java index d23f95dc..80811f4a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictItemResp.java @@ -38,21 +38,21 @@ public class DictItemResp extends BaseResp { private static final long serialVersionUID = 1L; /** - * 字典标签 + * 标签 */ - @Schema(description = "字典标签", example = "通知") + @Schema(description = "标签", example = "通知") private String label; /** - * 字典值 + * 值 */ - @Schema(description = "字典值", example = "1") + @Schema(description = "值", example = "1") private String value; /** - * 背景颜色 + * 标签颜色 */ - @Schema(description = "背景颜色", example = "blue") + @Schema(description = "标签颜色", example = "blue") private String color; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java index adfec911..4afaaa67 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/DictResp.java @@ -38,15 +38,15 @@ public class DictResp extends BaseResp { private static final long serialVersionUID = 1L; /** - * 字典名称 + * 名称 */ - @Schema(description = "字典名称", example = "公告类型") + @Schema(description = "名称", example = "公告类型") private String name; /** - * 字典编码 + * 编码 */ - @Schema(description = "字典编码", example = "announcement_type") + @Schema(description = "编码", example = "announcement_type") private String code; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java index 38a05505..0273157e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/MenuResp.java @@ -47,24 +47,24 @@ public class MenuResp extends BaseResp { private static final long serialVersionUID = 1L; /** - * 菜单标题 + * 标题 */ - @Schema(description = "菜单标题", example = "用户管理") - @ExcelProperty(value = "菜单标题") + @Schema(description = "标题", example = "用户管理") + @ExcelProperty(value = "标题") private String title; /** - * 菜单图标 + * 图标 */ - @Schema(description = "菜单图标", example = "user") - @ExcelProperty(value = "菜单图标") + @Schema(description = "图标", example = "user") + @ExcelProperty(value = "图标") private String icon; /** - * 菜单排序 + * 排序 */ - @Schema(description = "菜单排序", example = "1") - @ExcelProperty(value = "菜单排序") + @Schema(description = "排序", example = "1") + @ExcelProperty(value = "排序") private Integer sort; /** @@ -124,10 +124,10 @@ public class MenuResp extends BaseResp { private String name; /** - * 菜单类型 + * 类型 */ - @Schema(description = "菜单类型（1：目录；2：菜单；3：按钮）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "2") - @ExcelProperty(value = "菜单类型", converter = ExcelBaseEnumConverter.class) + @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/continew/admin/system/model/resp/OptionResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/OptionResp.java index 77b11bdf..e8f04218 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/OptionResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/OptionResp.java @@ -41,25 +41,25 @@ public class OptionResp implements Serializable { private static final long serialVersionUID = 1L; /** - * 参数名称 + * 名称 */ - @Schema(description = "参数名称", example = "系统标题") + @Schema(description = "名称", example = "系统标题") private String name; /** - * 参数键 + * 键 */ - @Schema(description = "参数键", example = "site_title") + @Schema(description = "键", example = "site_title") private String code; /** - * 参数值 + * 值 */ - @Schema(description = "参数值", example = "ContiNew Admin") + @Schema(description = "值", example = "ContiNew Admin") private String value; /** - * 参数默认值 + * 默认值 */ @JsonIgnore private String defaultValue; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java index b2b367a6..0beacd3e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleDetailResp.java @@ -46,17 +46,17 @@ public class RoleDetailResp extends BaseDetailResp { private static final long serialVersionUID = 1L; /** - * 角色名称 + * 名称 */ - @Schema(description = "角色名称", example = "测试人员") - @ExcelProperty(value = "角色名称") + @Schema(description = "名称", example = "测试人员") + @ExcelProperty(value = "名称") private String name; /** - * 角色编码 + * 编码 */ - @Schema(description = "角色编码", example = "test") - @ExcelProperty(value = "角色编码") + @Schema(description = "编码", example = "test") + @ExcelProperty(value = "编码") private String code; /** @@ -68,10 +68,10 @@ public class RoleDetailResp extends BaseDetailResp { private DataScopeEnum dataScope; /** - * 角色排序 + * 排序 */ - @Schema(description = "角色排序", example = "1") - @ExcelProperty(value = "角色排序") + @Schema(description = "排序", example = "1") + @ExcelProperty(value = "排序") private Integer sort; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java index c6404e6e..75bdacea 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/resp/RoleResp.java @@ -40,15 +40,15 @@ public class RoleResp extends BaseResp { private static final long serialVersionUID = 1L; /** - * 角色名称 + * 名称 */ - @Schema(description = "角色名称", example = "测试人员") + @Schema(description = "名称", example = "测试人员") private String name; /** - * 角色编码 + * 编码 */ - @Schema(description = "角色编码", example = "test") + @Schema(description = "编码", example = "test") private String code; /** @@ -59,9 +59,9 @@ public class RoleResp extends BaseResp { private DataScopeEnum dataScope; /** - * 角色排序 + * 排序 */ - @Schema(description = "角色排序", example = "1") + @Schema(description = "排序", example = "1") private Integer sort; /** 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 1c7d70f0..ffeb5ec0 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,18 +3,18 @@ -- changeset Charles7c:1 CREATE TABLE IF NOT EXISTS `sys_menu` ( `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', - `title` varchar(30) NOT NULL COMMENT '菜单标题', + `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：按钮）', + `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 '菜单图标', + `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 '菜单排序', + `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 '创建时间', @@ -29,11 +29,11 @@ CREATE TABLE IF NOT EXISTS `sys_menu` ( CREATE TABLE IF NOT EXISTS `sys_dept` ( `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', - `name` varchar(30) NOT NULL COMMENT '部门名称', + `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 '部门排序', + `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 '创建人', @@ -49,11 +49,11 @@ CREATE TABLE IF NOT EXISTS `sys_dept` ( CREATE TABLE IF NOT EXISTS `sys_role` ( `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', - `name` varchar(30) NOT NULL COMMENT '角色名称', - `code` varchar(30) NOT NULL COMMENT '角色编码', + `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 '角色排序', + `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 '创建人', 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 c95fac4c..c5c2fb3c 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 @@ -3,8 +3,8 @@ -- changeset Charles7c:1 CREATE TABLE IF NOT EXISTS `sys_dict` ( `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', - `name` varchar(30) NOT NULL COMMENT '字典名称', - `code` varchar(30) NOT NULL COMMENT '字典编码', + `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 '创建人', @@ -18,10 +18,10 @@ CREATE TABLE IF NOT EXISTS `sys_dict` ( CREATE TABLE IF NOT EXISTS `sys_dict_item` ( `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 '字典项排序', + `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 '创建人', @@ -36,10 +36,10 @@ 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 '参数默认值', + `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 '修改时间',