diff --git a/src/main/java/cc/ryanc/halo/model/entity/Attachment.java b/src/main/java/cc/ryanc/halo/model/entity/Attachment.java index 4c61e866f..a0ace3ffb 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Attachment.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Attachment.java @@ -24,49 +24,49 @@ public class Attachment { /** * 附件名称 */ - @Column(name = "name",columnDefinition = "varchar(255) not null") + @Column(name = "name", columnDefinition = "varchar(255) not null") private String name; /** * 附件路径 */ - @Column(name = "path",columnDefinition = "varchar(1023) default ''") + @Column(name = "path", columnDefinition = "varchar(1023) default ''") private String path; /** * 缩略图路径 */ - @Column(name = "thumb_path",columnDefinition = "varchar(1023) default ''") + @Column(name = "thumb_path", columnDefinition = "varchar(1023) default ''") private String thumbPath; /** * 附件类型 */ - @Column(name = "media_type",columnDefinition = "varchar(50) default ''") + @Column(name = "media_type", columnDefinition = "varchar(50) default ''") private String mediaType; /** * 附件后缀 */ - @Column(name = "suffix",columnDefinition = "varchar(50) default ''") + @Column(name = "suffix", columnDefinition = "varchar(50) default ''") private String suffix; /** * 附件尺寸 */ - @Column(name = "dimension",columnDefinition = "varchar(50) default ''") + @Column(name = "dimension", columnDefinition = "varchar(50) default ''") private String dimension; /** * 附件大小 */ - @Column(name = "size",columnDefinition = "varchar(50) default ''") + @Column(name = "size", columnDefinition = "varchar(50) default ''") private String size; /** * 附件上传类型 */ - @Column(name = "type",columnDefinition = "int default 0") + @Column(name = "type", columnDefinition = "int default 0") private Integer type; /** diff --git a/src/main/java/cc/ryanc/halo/model/entity/Category.java b/src/main/java/cc/ryanc/halo/model/entity/Category.java index d18171e64..f3a4d5a37 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Category.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Category.java @@ -27,27 +27,47 @@ public class Category { @GeneratedValue private Integer id; - @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date createTime; - - @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date updateTime; - - @Column(name = "deleted", columnDefinition = "tinyint default 0") - private Boolean deleted; - + /** + * 分类名称 + */ @Column(name = "name", columnDefinition = "varchar(50) not null") private String name; + /** + * 缩略名 + */ @Column(name = "snake_name", columnDefinition = "varchar(50) not null") private String snakeName; + /** + * 描述 + */ @Column(name = "description", columnDefinition = "varchar(100) default ''") private String description; + /** + * 上级目录 + */ @Column(name = "parent_id", columnDefinition = "int default 0") private Integer parentId; + /** + * 创建时间戳 + */ + @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date createTime; + + /** + * 更新时间戳 + */ + @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date updateTime; + + /** + * 是否已删除 + */ + @Column(name = "deleted", columnDefinition = "TINYINT default 0") + private Boolean deleted; } diff --git a/src/main/java/cc/ryanc/halo/model/entity/Comment.java b/src/main/java/cc/ryanc/halo/model/entity/Comment.java index ba69618a2..bc9390d27 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Comment.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Comment.java @@ -27,38 +27,71 @@ public class Comment { @GeneratedValue private Long id; - @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date createTime; - - @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date updateTime; - - @Column(name = "deleted", columnDefinition = "tinyint default 0") - private Boolean deleted; - + /** + * 评论者昵称 + */ @Column(name = "author", columnDefinition = "varchar(50) not null") private String author; + /** + * 评论者邮箱 + */ @Column(name = "email", columnDefinition = "varchar(50) default ''") private String email; + /** + * 评论者 ip 地址 + */ @Column(name = "ip_address", columnDefinition = "varchar(127) default ''") private String ipAddress; + /** + * Gavatar md5 + */ @Column(name = "gavatar_md5", columnDefinition = "varchar(128) default ''") private String gavatarMd5; + /** + * 评论内容 + */ @Column(name = "content", columnDefinition = "varchar(1024) not null") private String content; + /** + * UA 信息 + */ @Column(name = "user_agent", columnDefinition = "varchar(512) default ''") private String userAgent; + /** + * 是否为博主 + */ @Column(name = "is_admin", columnDefinition = "tinyint default 0") private Boolean isAdmin; + /** + * 上级评论 + */ @Column(name = "parent_id", columnDefinition = "bigint default 0") private Long parentId; + + /** + * 创建时间戳 + */ + @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date createTime; + + /** + * 更新时间戳 + */ + @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date updateTime; + + /** + * 是否已删除 + */ + @Column(name = "deleted", columnDefinition = "TINYINT default 0") + private Boolean deleted; } diff --git a/src/main/java/cc/ryanc/halo/model/entity/Gallery.java b/src/main/java/cc/ryanc/halo/model/entity/Gallery.java index 5c175a378..ee4a553f9 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Gallery.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Gallery.java @@ -24,38 +24,38 @@ public class Gallery { /** * 图片名称 */ - @Column(name = "name",columnDefinition = "varchar(255) not null") + @Column(name = "name", columnDefinition = "varchar(255) not null") private String name; /** * 描述 */ - @Column(name = "description",columnDefinition = "varchar(255) default ''") + @Column(name = "description", columnDefinition = "varchar(255) default ''") private String description; /** * 拍摄时间/创作时间 */ - @Column(name = "take_time",columnDefinition = "timestamp not null") + @Column(name = "take_time", columnDefinition = "timestamp not null") @Temporal(TemporalType.TIMESTAMP) private Date takeTime; /** * 拍摄地点 */ - @Column(name = "location",columnDefinition = "varchar(255) default ''") + @Column(name = "location", columnDefinition = "varchar(255) default ''") private String location; /** * 缩略图 */ - @Column(name = "thumbnail",columnDefinition = "varchar(1023) default ''") + @Column(name = "thumbnail", columnDefinition = "varchar(1023) default ''") private String thumbnail; /** * 图片地址 */ - @Column(name = "url",columnDefinition = "varchar(1023) not null") + @Column(name = "url", columnDefinition = "varchar(1023) not null") private String url; /** diff --git a/src/main/java/cc/ryanc/halo/model/entity/Link.java b/src/main/java/cc/ryanc/halo/model/entity/Link.java index a134005bc..1eb696d4b 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Link.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Link.java @@ -24,31 +24,31 @@ public class Link { /** * 友链名称 */ - @Column(name = "name",columnDefinition = "varchar(255) not null") + @Column(name = "name", columnDefinition = "varchar(255) not null") private String name; /** * 友链地址 */ - @Column(name = "url",columnDefinition = "varchar(255) not null") + @Column(name = "url", columnDefinition = "varchar(255) not null") private String url; /** * 友链 Logo */ - @Column(name = "logo",columnDefinition = "varchar(255) default ''") + @Column(name = "logo", columnDefinition = "varchar(255) default ''") private String logo; /** * 描述 */ - @Column(name = "description",columnDefinition = "varchar(255) default ''") + @Column(name = "description", columnDefinition = "varchar(255) default ''") private String description; /** * 分组 */ - @Column(name = "group",columnDefinition = "varchar(255) default ''") + @Column(name = "group", columnDefinition = "varchar(255) default ''") private String group; /** diff --git a/src/main/java/cc/ryanc/halo/model/entity/Log.java b/src/main/java/cc/ryanc/halo/model/entity/Log.java index 8b6037788..6b47a7d1b 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Log.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Log.java @@ -29,27 +29,47 @@ public class Log { @GeneratedValue private Long id; - @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date createTime; - - @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date updateTime; - - @Column(name = "deleted", columnDefinition = "tinyint default 0") - private Boolean deleted; - + /** + * 日志标识 + */ @Column(name = "log_key", columnDefinition = "varchar(1023) default ''") private String logKey; + /** + * 日志事件类型 + */ @Column(name = "type", columnDefinition = "int not null") private LogType type; + /** + * 日志内容 + */ @Column(name = "content", columnDefinition = "varchar(1023) not null") private String content; + /** + * 操作 IP + */ @Column(name = "ip_address", columnDefinition = "varchar(127) default ''") private String ipAddress; + /** + * 创建时间戳 + */ + @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date createTime; + + /** + * 更新时间戳 + */ + @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date updateTime; + + /** + * 是否已删除 + */ + @Column(name = "deleted", columnDefinition = "TINYINT default 0") + private Boolean deleted; } diff --git a/src/main/java/cc/ryanc/halo/model/entity/Menu.java b/src/main/java/cc/ryanc/halo/model/entity/Menu.java index 1ffbd3952..23361ba9b 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Menu.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Menu.java @@ -24,31 +24,31 @@ public class Menu { /** * 菜单名称 */ - @Column(name = "name",columnDefinition = "varchar(255) not null") + @Column(name = "name", columnDefinition = "varchar(255) not null") private String name; /** * 菜单地址 */ - @Column(name = "url",columnDefinition = "varchar(255) not null") + @Column(name = "url", columnDefinition = "varchar(255) not null") private String url; /** * 排序 */ - @Column(name = "sort",columnDefinition = "int default 0") + @Column(name = "sort", columnDefinition = "int default 0") private Integer sort; /** * 窗口打开方式 */ - @Column(name = "target",columnDefinition = "varchar(20) default '_self'") + @Column(name = "target", columnDefinition = "varchar(20) default '_self'") private String target; /** * 菜单图标 */ - @Column(name = "icon",columnDefinition = "varchar(50) default ''") + @Column(name = "icon", columnDefinition = "varchar(50) default ''") private String icon; /** diff --git a/src/main/java/cc/ryanc/halo/model/entity/Option.java b/src/main/java/cc/ryanc/halo/model/entity/Option.java index e579ce0af..d8e7fb795 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Option.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Option.java @@ -27,21 +27,35 @@ public class Option { @GeneratedValue private Integer id; - @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date createTime; - - @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date updateTime; - - @Column(name = "deleted", columnDefinition = "TINYINT default 0") - private Boolean deleted; - + /** + * 设置项 Key + */ @Column(name = "option_key", columnDefinition = "varchar(100) not null") private String optionKey; + /** + * 设置项 Value + */ @Column(name = "option_value", columnDefinition = "varchar(1023) not null") private String optionValue; + /** + * 创建时间戳 + */ + @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date createTime; + + /** + * 更新时间戳 + */ + @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date updateTime; + + /** + * 是否已删除 + */ + @Column(name = "deleted", columnDefinition = "TINYINT default 0") + private Boolean deleted; } diff --git a/src/main/java/cc/ryanc/halo/model/entity/Post.java b/src/main/java/cc/ryanc/halo/model/entity/Post.java index 300e290b5..dc7ddd2c1 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Post.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Post.java @@ -29,53 +29,104 @@ public class Post { @GeneratedValue private Integer id; - @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date createTime; - - @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date updateTime; - - @Column(name = "deleted", columnDefinition = "tinyint default 0") - private Boolean deleted; - + /** + * 文章标题 + */ @Column(name = "title", columnDefinition = "varchar(100) not null") private String title; + /** + * 文章类型 + * 0: 普通文章 + * 1: 自定义页面 + * 2: 日志 + */ @Column(name = "type", columnDefinition = "int default 0") private PostType type; + /** + * 源内容 + */ @Column(name = "original_content", columnDefinition = "text not null") private String originalContent; + /** + * 渲染后内容 + */ @Column(name = "format_content", columnDefinition = "text not null") private String formatContent; + /** + * 摘要 + */ @Column(name = "summary", columnDefinition = "varchar(500) default ''") private String summary; + /** + * 缩略图 + */ @Column(name = "thumbnail", columnDefinition = "varchar(1023) default ''") private String thumbnail; + /** + * 浏览量 + */ @Column(name = "visits", columnDefinition = "bigint default 0") private Long visits; + /** + * 是否允许评论 + */ @Column(name = "disallow_comment", columnDefinition = "int default 0") private Boolean disallowComment; + /** + * 文章密码 + */ @Column(name = "password", columnDefinition = "varchar(255) default ''") private String password; + /** + * 自定义渲染模板名称 + */ @Column(name = "template", columnDefinition = "varchar(255) default ''") private String template; + /** + * 是否置顶 + */ @Column(name = "top_priority", columnDefinition = "int default 0") private Integer topPriority; + /** + * 发布来源 + */ @Column(name = "create_from", columnDefinition = "int default 0") private PostCreateFrom createFrom; + /** + * 点赞量/喜欢量 + */ @Column(name = "likes", columnDefinition = "bigint default 0") private Long likes; + + /** + * 创建时间戳 + */ + @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date createTime; + + /** + * 更新时间戳 + */ + @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date updateTime; + + /** + * 是否已删除 + */ + @Column(name = "deleted", columnDefinition = "TINYINT default 0") + private Boolean deleted; } diff --git a/src/main/java/cc/ryanc/halo/model/entity/PostCategory.java b/src/main/java/cc/ryanc/halo/model/entity/PostCategory.java index b4aecb27c..3e0d0b0a0 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/PostCategory.java +++ b/src/main/java/cc/ryanc/halo/model/entity/PostCategory.java @@ -27,20 +27,35 @@ public class PostCategory { @GeneratedValue private Integer id; - @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date createTime; - - @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIME") - @Temporal(TemporalType.TIMESTAMP) - private Date updateTime; - - @Column(name = "deleted", columnDefinition = "tinyint default 0") - private Boolean deleted; - + /** + * 分类目录编号 + */ @Column(name = "category_id") private Integer categoryId; + /** + * 文章编号 + */ @Column(name = "post_id") private Integer postId; + + /** + * 创建时间戳 + */ + @Column(name = "create_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date createTime; + + /** + * 更新时间戳 + */ + @Column(name = "update_time", columnDefinition = "timestamp default CURRENT_TIMESTAMP") + @Temporal(TemporalType.TIMESTAMP) + private Date updateTime; + + /** + * 是否已删除 + */ + @Column(name = "deleted", columnDefinition = "TINYINT default 0") + private Boolean deleted; } diff --git a/src/main/java/cc/ryanc/halo/model/entity/Tag.java b/src/main/java/cc/ryanc/halo/model/entity/Tag.java index 15bf7731a..4bf8ba451 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Tag.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Tag.java @@ -24,13 +24,13 @@ public class Tag { /** * 标签名 */ - @Column(name = "name",columnDefinition = "varchar(255) not null") + @Column(name = "name", columnDefinition = "varchar(255) not null") private String name; /** * 缩略名 */ - @Column(name = "snake_name",columnDefinition = "varchar(255) not null") + @Column(name = "snake_name", columnDefinition = "varchar(255) not null") private String snakeName; /** diff --git a/src/main/java/cc/ryanc/halo/model/entity/User.java b/src/main/java/cc/ryanc/halo/model/entity/User.java index fb71f4660..4cc87acf6 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/User.java +++ b/src/main/java/cc/ryanc/halo/model/entity/User.java @@ -24,37 +24,37 @@ public class User { /** * 用户名 */ - @Column(name = "username",columnDefinition = "varchar(50) not null") + @Column(name = "username", columnDefinition = "varchar(50) not null") private String username; /** * 昵称 */ - @Column(name = "nickname",columnDefinition = "varchar(255) not null") + @Column(name = "nickname", columnDefinition = "varchar(255) not null") private String nickname; /** * 密码 */ - @Column(name = "password",columnDefinition = "varchar(255) not null") + @Column(name = "password", columnDefinition = "varchar(255) not null") private String password; /** * 邮箱 */ - @Column(name = "email",columnDefinition = "varchar(127) default ''") + @Column(name = "email", columnDefinition = "varchar(127) default ''") private String email; /** * 头像 */ - @Column(name = "avatar",columnDefinition = "varchar(1023) default ''") + @Column(name = "avatar", columnDefinition = "varchar(1023) default ''") private String avatar; /** * 描述 */ - @Column(name = "description",columnDefinition = "varchar(1023) default ''") + @Column(name = "description", columnDefinition = "varchar(1023) default ''") private String description; /** diff --git a/src/main/java/cc/ryanc/halo/model/entity/enums/CommentStatus.java b/src/main/java/cc/ryanc/halo/model/entity/enums/CommentStatus.java index d7da65069..bfc047a66 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/enums/CommentStatus.java +++ b/src/main/java/cc/ryanc/halo/model/entity/enums/CommentStatus.java @@ -7,8 +7,19 @@ package cc.ryanc.halo.model.entity.enums; */ public enum CommentStatus implements ValueEnum { + /** + * 已发布 + */ PUBLISHED(0), + + /** + * 草稿 + */ AUDITING(1), + + /** + * 回收站 + */ RECYCLE(2); private final Integer value; diff --git a/src/main/java/cc/ryanc/halo/model/entity/enums/PostCreateFrom.java b/src/main/java/cc/ryanc/halo/model/entity/enums/PostCreateFrom.java index ed6412703..52d0041ab 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/enums/PostCreateFrom.java +++ b/src/main/java/cc/ryanc/halo/model/entity/enums/PostCreateFrom.java @@ -7,7 +7,14 @@ package cc.ryanc.halo.model.entity.enums; */ public enum PostCreateFrom implements ValueEnum { + /** + * 发布来源:管理后台 + */ ADMIN(0), + + /** + * 发布来源:微信 + */ WECHAT(1); private final Integer value; diff --git a/src/main/java/cc/ryanc/halo/model/entity/enums/PostType.java b/src/main/java/cc/ryanc/halo/model/entity/enums/PostType.java index 054af7ddf..49e3da8eb 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/enums/PostType.java +++ b/src/main/java/cc/ryanc/halo/model/entity/enums/PostType.java @@ -7,8 +7,19 @@ package cc.ryanc.halo.model.entity.enums; */ public enum PostType implements ValueEnum { + /** + * 普通文章 + */ POST(0), + + /** + * 自定义页面 + */ PAGE(1), + + /** + * 日志 + */ JOURNAL(2); private final Integer value;