From b461e7f651fc22e191085a7ea6310799f0789248 Mon Sep 17 00:00:00 2001 From: johnniang Date: Sat, 2 Mar 2019 21:56:07 +0800 Subject: [PATCH] Add priority column in Post domain --- .../cc/ryanc/halo/model/domain/Attachment.java | 2 ++ .../java/cc/ryanc/halo/model/domain/Category.java | 2 ++ .../java/cc/ryanc/halo/model/domain/Comment.java | 2 ++ .../java/cc/ryanc/halo/model/domain/Gallery.java | 2 ++ src/main/java/cc/ryanc/halo/model/domain/Link.java | 2 ++ src/main/java/cc/ryanc/halo/model/domain/Logs.java | 2 ++ src/main/java/cc/ryanc/halo/model/domain/Menu.java | 2 ++ .../java/cc/ryanc/halo/model/domain/Options.java | 2 ++ src/main/java/cc/ryanc/halo/model/domain/Post.java | 14 +++++++++++++- .../halo/web/controller/core/CommonController.java | 1 + src/main/resources/application-dev.yaml | 1 - 11 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/model/domain/Attachment.java b/src/main/java/cc/ryanc/halo/model/domain/Attachment.java index b7db4d068..cbf5cbbf2 100644 --- a/src/main/java/cc/ryanc/halo/model/domain/Attachment.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Attachment.java @@ -1,6 +1,7 @@ package cc.ryanc.halo.model.domain; import lombok.Data; +import lombok.ToString; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -17,6 +18,7 @@ import java.util.Date; * @date : 2018/1/10 */ @Data +@ToString @Entity @Table(name = "halo_attachment") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/cc/ryanc/halo/model/domain/Category.java b/src/main/java/cc/ryanc/halo/model/domain/Category.java index dd92ae49f..ef4322078 100755 --- a/src/main/java/cc/ryanc/halo/model/domain/Category.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Category.java @@ -2,6 +2,7 @@ package cc.ryanc.halo.model.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; +import lombok.ToString; import javax.persistence.*; import javax.validation.constraints.NotBlank; @@ -18,6 +19,7 @@ import java.util.List; * @date : 2017/11/30 */ @Data +@ToString @Entity @Table(name = "halo_category") public class Category implements Serializable { diff --git a/src/main/java/cc/ryanc/halo/model/domain/Comment.java b/src/main/java/cc/ryanc/halo/model/domain/Comment.java index 4ba00a3e8..9777ee583 100644 --- a/src/main/java/cc/ryanc/halo/model/domain/Comment.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Comment.java @@ -3,6 +3,7 @@ package cc.ryanc.halo.model.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; +import lombok.ToString; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -22,6 +23,7 @@ import java.util.List; * @date : 2018/1/22 */ @Data +@ToString @Entity @Table(name = "halo_comment") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/cc/ryanc/halo/model/domain/Gallery.java b/src/main/java/cc/ryanc/halo/model/domain/Gallery.java index 76a88ffba..2cf10908a 100644 --- a/src/main/java/cc/ryanc/halo/model/domain/Gallery.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Gallery.java @@ -1,6 +1,7 @@ package cc.ryanc.halo.model.domain; import lombok.Data; +import lombok.ToString; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -17,6 +18,7 @@ import java.io.Serializable; * @date : 2018/2/26 */ @Data +@ToString @Entity @Table(name = "halo_gallery") public class Gallery implements Serializable { diff --git a/src/main/java/cc/ryanc/halo/model/domain/Link.java b/src/main/java/cc/ryanc/halo/model/domain/Link.java index 178aa19d6..4187c3b64 100755 --- a/src/main/java/cc/ryanc/halo/model/domain/Link.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Link.java @@ -1,6 +1,7 @@ package cc.ryanc.halo.model.domain; import lombok.Data; +import lombok.ToString; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -18,6 +19,7 @@ import java.io.Serializable; * @date : 2017/11/14 */ @Data +@ToString @Entity @Table(name = "halo_link") public class Link implements Serializable { diff --git a/src/main/java/cc/ryanc/halo/model/domain/Logs.java b/src/main/java/cc/ryanc/halo/model/domain/Logs.java index 604f026f3..dc23b86f4 100644 --- a/src/main/java/cc/ryanc/halo/model/domain/Logs.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Logs.java @@ -1,6 +1,7 @@ package cc.ryanc.halo.model.domain; import lombok.Data; +import lombok.ToString; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -17,6 +18,7 @@ import java.util.Date; * @date : 2018/1/19 */ @Data +@ToString @Entity @Table(name = "halo_logs") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/cc/ryanc/halo/model/domain/Menu.java b/src/main/java/cc/ryanc/halo/model/domain/Menu.java index aaed95e9e..840be2df6 100644 --- a/src/main/java/cc/ryanc/halo/model/domain/Menu.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Menu.java @@ -1,6 +1,7 @@ package cc.ryanc.halo.model.domain; import lombok.Data; +import lombok.ToString; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -19,6 +20,7 @@ import java.io.Serializable; * @date : 2018/1/24 */ @Data +@ToString @Entity @Table(name = "halo_menu") public class Menu implements Serializable { diff --git a/src/main/java/cc/ryanc/halo/model/domain/Options.java b/src/main/java/cc/ryanc/halo/model/domain/Options.java index 94b6a15c5..764fb62fe 100755 --- a/src/main/java/cc/ryanc/halo/model/domain/Options.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Options.java @@ -1,6 +1,7 @@ package cc.ryanc.halo.model.domain; import lombok.Data; +import lombok.ToString; import javax.persistence.*; import java.io.Serializable; @@ -14,6 +15,7 @@ import java.io.Serializable; * @date : 2017/11/14 */ @Data +@ToString @Entity @Table(name = "halo_options") public class Options implements Serializable { diff --git a/src/main/java/cc/ryanc/halo/model/domain/Post.java b/src/main/java/cc/ryanc/halo/model/domain/Post.java index 88d09f90d..0b4f88e5d 100755 --- a/src/main/java/cc/ryanc/halo/model/domain/Post.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Post.java @@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.ToString; -import org.springframework.data.annotation.CreatedDate; +import org.hibernate.annotations.ColumnDefault; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -148,6 +148,12 @@ public class Post implements Serializable { */ private String customTpl; + /** + * Post priority (default is 0) + */ + @ColumnDefault("0") + private Integer priority; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") public Date getPostDate() { return postDate; @@ -161,6 +167,7 @@ public class Post implements Serializable { @PrePersist public void prePersist() { DateTime now = DateUtil.date(); + if (postDate == null) { postDate = now; } @@ -168,6 +175,11 @@ public class Post implements Serializable { if (postUpdate == null) { postUpdate = now; } + + if (priority == null) { + priority = 0; + } + postId = null; } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java index 31abc9a9a..0ccbc3e1f 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java @@ -40,6 +40,7 @@ public class CommonController implements ErrorController { Throwable throwable = (Throwable) request.getAttribute("javax.servlet.error.exception"); if (throwable != null && StringUtils.startsWithIgnoreCase(throwable.getMessage(), "Could not resolve view with name '")) { + log.error("Captured an exception", throwable); // TODO May cause unreasoned problem // if Ftl was not found then redirect to /404 return "redirect:/404"; diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index b1d21594f..eca93eaec 100755 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -62,5 +62,4 @@ logging: level: cc.ryanc.halo: DEBUG org.hibernate: ERROR - web: DEBUG file: ./logs/log.log