From 7ffbc93ea540c4e1e05fc9162748f47e00cf8eb4 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 30 Jan 2019 15:23:11 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cc/ryanc/halo/Application.java             | 2 ++
 src/main/java/cc/ryanc/halo/model/domain/Attachment.java | 9 +++++----
 src/main/java/cc/ryanc/halo/model/domain/Comment.java    | 4 ++++
 src/main/java/cc/ryanc/halo/model/domain/Logs.java       | 9 +++++----
 src/main/java/cc/ryanc/halo/model/domain/Post.java       | 6 ++++++
 .../java/cc/ryanc/halo/service/impl/LogsServiceImpl.java | 1 -
 .../java/cc/ryanc/halo/service/impl/PostServiceImpl.java | 1 -
 .../halo/web/controller/admin/AttachmentController.java  | 1 -
 .../halo/web/controller/admin/CommentController.java     | 1 -
 .../ryanc/halo/web/controller/admin/PageController.java  | 3 ---
 .../ryanc/halo/web/controller/admin/PostController.java  | 1 -
 .../halo/web/controller/core/InstallController.java      | 2 --
 .../web/controller/front/FrontCommentController.java     | 1 -
 13 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/java/cc/ryanc/halo/Application.java b/src/main/java/cc/ryanc/halo/Application.java
index f67e743eb..0f65eb888 100755
--- a/src/main/java/cc/ryanc/halo/Application.java
+++ b/src/main/java/cc/ryanc/halo/Application.java
@@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ApplicationContext;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 /**
  * <pre>
@@ -17,6 +18,7 @@ import org.springframework.context.ApplicationContext;
 @Slf4j
 @SpringBootApplication
 @EnableCaching
+@EnableJpaAuditing
 public class Application {
     public static void main(String[] args) {
         ApplicationContext context = SpringApplication.run(Application.class, args);
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 365e00c29..b7db4d068 100644
--- a/src/main/java/cc/ryanc/halo/model/domain/Attachment.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/Attachment.java
@@ -1,11 +1,10 @@
 package cc.ryanc.halo.model.domain;
 
 import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,6 +19,7 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "halo_attachment")
+@EntityListeners(AuditingEntityListener.class)
 public class Attachment implements Serializable {
 
     private static final long serialVersionUID = 3060117944880138064L;
@@ -59,6 +59,7 @@ public class Attachment implements Serializable {
     /**
      * 上传时间
      */
+    @CreatedDate
     private Date attachCreated;
 
     /**
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 b1c3c2c90..d1dd17b04 100644
--- a/src/main/java/cc/ryanc/halo/model/domain/Comment.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/Comment.java
@@ -2,6 +2,8 @@ package cc.ryanc.halo.model.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import javax.validation.constraints.Email;
@@ -21,6 +23,7 @@ import java.util.List;
 @Data
 @Entity
 @Table(name = "halo_comment")
+@EntityListeners(AuditingEntityListener.class)
 public class Comment implements Serializable {
 
     private static final long serialVersionUID = -6639021627094260505L;
@@ -72,6 +75,7 @@ public class Comment implements Serializable {
     /**
      * 评论时间
      */
+    @CreatedDate
     private Date commentDate;
 
     /**
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 be550604a..604f026f3 100644
--- a/src/main/java/cc/ryanc/halo/model/domain/Logs.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/Logs.java
@@ -1,11 +1,10 @@
 package cc.ryanc.halo.model.domain;
 
 import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,6 +19,7 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "halo_logs")
+@EntityListeners(AuditingEntityListener.class)
 public class Logs implements Serializable {
 
     private static final long serialVersionUID = -2571815432301283171L;
@@ -49,6 +49,7 @@ public class Logs implements Serializable {
     /**
      * 产生的时间
      */
+    @CreatedDate
     private Date logCreated;
 
     public Logs() {
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 777b85641..4f54480e5 100755
--- a/src/main/java/cc/ryanc/halo/model/domain/Post.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/Post.java
@@ -2,6 +2,9 @@ package cc.ryanc.halo.model.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -20,6 +23,7 @@ import java.util.List;
 @Data
 @Entity
 @Table(name = "halo_post")
+@EntityListeners(AuditingEntityListener.class)
 public class Post implements Serializable {
 
     private static final long serialVersionUID = -6019684584665869629L;
@@ -105,11 +109,13 @@ public class Post implements Serializable {
     /**
      * 发表日期
      */
+    @CreatedDate
     private Date postDate;
 
     /**
      * 最后一次更新时间
      */
+    @LastModifiedDate
     private Date postUpdate;
 
     /**
diff --git a/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java
index 078296b26..cf0cd042d 100644
--- a/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java
@@ -39,7 +39,6 @@ public class LogsServiceImpl implements LogsService {
         final Logs logs = new Logs();
         logs.setLogTitle(logTitle);
         logs.setLogContent(logContent);
-        logs.setLogCreated(new Date());
         logs.setLogIp(ServletUtil.getClientIP(request));
         logsRepository.save(logs);
     }
diff --git a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
index e4fb1ab3d..8671464ff 100755
--- a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
@@ -73,7 +73,6 @@ public class PostServiceImpl implements PostService {
         } else {
             post.setPostSummary(summaryText);
         }
-        post.setPostUpdate(DateUtil.date());
         return postRepository.save(post);
     }
 
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
index e41d2f94d..ff9ded0b3 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
@@ -133,7 +133,6 @@ public class AttachmentController {
                 attachment.setAttachSmallPath(resultMap.get("smallPath"));
                 attachment.setAttachType(file.getContentType());
                 attachment.setAttachSuffix(resultMap.get("suffix"));
-                attachment.setAttachCreated(DateUtil.date());
                 attachment.setAttachSize(resultMap.get("size"));
                 attachment.setAttachWh(resultMap.get("wh"));
                 attachment.setAttachLocation(resultMap.get("location"));
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
index 675929a2d..dedd8f2ca 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
@@ -182,7 +182,6 @@ public class CommentController extends BaseController {
             comment.setCommentAuthorUrl(HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()));
             comment.setCommentAuthorIp(ServletUtil.getClientIP(request));
             comment.setCommentAuthorAvatarMd5(SecureUtil.md5(user.getUserEmail()));
-            comment.setCommentDate(DateUtil.date());
 
             final StrBuilder buildContent = new StrBuilder("<a href='#comment-id-");
             buildContent.append(lastComment.getCommentId());
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
index 6041a62d2..7703b724f 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
@@ -261,10 +261,7 @@ public class PageController {
                 }
                 post.setPostViews(oldPost.getPostViews());
                 msg = localeMessageUtil.getMessage("code.admin.common.update-success");
-            } else {
-                post.setPostDate(DateUtil.date());
             }
-            post.setPostUpdate(DateUtil.date());
             post.setPostContent(MarkdownUtils.renderMarkdown(post.getPostContentMd()));
             //当没有选择文章缩略图的时候，自动分配一张内置的缩略图
             if (StrUtil.equals(post.getPostThumbnail(), BlogPropertiesEnum.DEFAULT_THUMBNAIL.getProp())) {
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
index 273b57b6d..be28538ca 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
@@ -183,7 +183,6 @@ public class PostController extends BaseController {
         final User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY);
         try {
             post.setPostContent(MarkdownUtils.renderMarkdown(post.getPostContentMd()));
-            post.setPostDate(DateUtil.date());
             post.setUser(user);
             post = postService.buildCategoriesAndTags(post, cateList, tagList);
             post.setPostUrl(urlFilter(post.getPostUrl()));
diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java
index 32478c3c8..8317ad3df 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java
@@ -137,7 +137,6 @@ public class InstallController {
             post.setPostContent(MarkdownUtils.renderMarkdown(post.getPostContentMd()));
             post.setPostSummary("欢迎使用Halo进行创作，删除这篇文章后赶紧开始吧。");
             post.setPostStatus(0);
-            post.setPostDate(DateUtil.date());
             post.setPostUrl("hello-halo");
             post.setUser(user);
             post.setCategories(categories);
@@ -152,7 +151,6 @@ public class InstallController {
             comment.setCommentAuthorUrl("https://ryanc.cc");
             comment.setCommentAuthorIp("127.0.0.1");
             comment.setCommentAuthorAvatarMd5(SecureUtil.md5("i@ryanc.cc"));
-            comment.setCommentDate(DateUtil.date());
             comment.setCommentContent("欢迎，欢迎！");
             comment.setCommentStatus(0);
             comment.setCommentAgent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.162 Safari/537.36");
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
index 6b757c77b..4658f1a1a 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
@@ -86,7 +86,6 @@ public class FrontCommentController {
             post = postService.findByPostId(post.getPostId()).orElse(new Post());
             comment.setCommentAuthorEmail(HtmlUtil.escape(comment.getCommentAuthorEmail()).toLowerCase());
             comment.setPost(post);
-            comment.setCommentDate(DateUtil.date());
             comment.setCommentAuthorIp(ServletUtil.getClientIP(request));
             comment.setIsAdmin(0);
             comment.setCommentAuthor(HtmlUtil.escape(comment.getCommentAuthor()));