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 d5b9ab1ba..dba775a46 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Category.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Category.java @@ -1,6 +1,5 @@ package cc.ryanc.halo.model.entity; -import cc.ryanc.halo.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -8,7 +7,6 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Date; /** * Category entity. 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 0c0f4646e..08bb53645 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Comment.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Comment.java @@ -1,7 +1,6 @@ package cc.ryanc.halo.model.entity; import cc.ryanc.halo.model.enums.CommentStatus; -import cc.ryanc.halo.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +8,6 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Date; /** * Comment entity. 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 2529cd0c5..f639596fc 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Gallery.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Gallery.java @@ -1,6 +1,5 @@ package cc.ryanc.halo.model.entity; -import cc.ryanc.halo.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; 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 480cadfe6..f76b0acb7 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Link.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Link.java @@ -1,6 +1,5 @@ package cc.ryanc.halo.model.entity; -import cc.ryanc.halo.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -8,7 +7,6 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Date; /** * Link entity 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 7f4c6b9a0..9fc2ff41d 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Log.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Log.java @@ -2,7 +2,6 @@ package cc.ryanc.halo.model.entity; import cc.ryanc.halo.model.enums.LogType; -import cc.ryanc.halo.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -10,7 +9,6 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Date; /** * Log entity. 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 a3785b93d..57f7ed774 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Menu.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Menu.java @@ -1,6 +1,5 @@ package cc.ryanc.halo.model.entity; -import cc.ryanc.halo.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -8,7 +7,6 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Date; /** * Menu entity 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 cff96c9e6..5c82abbd0 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Option.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Option.java @@ -1,6 +1,5 @@ package cc.ryanc.halo.model.entity; -import cc.ryanc.halo.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -8,7 +7,6 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Date; /** * Setting entity. @@ -29,20 +27,27 @@ public class Option extends BaseEntity { private Integer id; /** - * 设置项 Key + * option key */ @Column(name = "option_key", columnDefinition = "varchar(100) not null") private String optionKey; /** - * 设置项 Value + * option value */ @Column(name = "option_value", columnDefinition = "varchar(1023) not null") private String optionValue; + /** + * source,default is system + */ + @Column(name = "source", columnDefinition = "varchar(127) default 'system'") + private String source; + @Override public void prePersist() { super.prePersist(); id = null; + source = "system"; } } 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 a38e7b656..8818dc096 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/PostCategory.java +++ b/src/main/java/cc/ryanc/halo/model/entity/PostCategory.java @@ -1,14 +1,11 @@ package cc.ryanc.halo.model.entity; -import cc.ryanc.halo.utils.DateUtils; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.ToString; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Date; import java.util.Objects; /** 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 8b59f91ac..5e6460d86 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/Tag.java +++ b/src/main/java/cc/ryanc/halo/model/entity/Tag.java @@ -5,11 +5,8 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedDate; import javax.persistence.*; -import java.util.Date; /** * Tag entity