github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v1' into v1

pull/137/head
johnniang 2019-03-12 23:15:32 +08:00
parent 333cdab99e da7d8905bd
commit 337c474a5c
15 changed files with 280 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/cc/ryanc/halo/model/entity/Category.java
View File

@ -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;
}

55
src/main/java/cc/ryanc/halo/model/entity/Comment.java
View File

@ -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;
}

42
src/main/java/cc/ryanc/halo/model/entity/Log.java
View File

@ -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;
}

36
src/main/java/cc/ryanc/halo/model/entity/Option.java
View File

@ -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;
}

73
src/main/java/cc/ryanc/halo/model/entity/Post.java
View File

@ -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;
}

37
src/main/java/cc/ryanc/halo/model/entity/PostCategory.java
View File

@ -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;
}

11
src/main/java/cc/ryanc/halo/model/entity/enums/CommentStatus.java
View File

@ -7,8 +7,19 @@ package cc.ryanc.halo.model.entity.enums;
*/
public enum CommentStatus implements ValueEnum<Integer> {
/**
* 已发布
*/
PUBLISHED(0),
/**
* 草稿
*/
AUDITING(1),
/**
* 回收站
*/
RECYCLE(2);
private final Integer value;

7
src/main/java/cc/ryanc/halo/model/entity/enums/PostCreateFrom.java
View File

@ -7,7 +7,14 @@ package cc.ryanc.halo.model.entity.enums;
*/
public enum PostCreateFrom implements ValueEnum<Integer> {
/**
* 发布来源：管理后台
*/
ADMIN(0),
/**
* 发布来源：微信
*/
WECHAT(1);
private final Integer value;

11
src/main/java/cc/ryanc/halo/model/entity/enums/PostType.java
View File

@ -7,8 +7,19 @@ package cc.ryanc.halo.model.entity.enums;
*/
public enum PostType implements ValueEnum<Integer> {
/**
* 普通文章
*/
POST(0),
/**
* 自定义页面
*/
PAGE(1),
/**
* 日志
*/
JOURNAL(2);
private final Integer value;