From 0c3d0e2327da391f4d9ae2b90b49ad95c069b3cc Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 18 Jul 2018 22:35:23 +0800
Subject: [PATCH] =?UTF-8?q?:alien:=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/model/domain/Post.java   | 12 +++++++++++-
 src/main/resources/templates/admin/admin_comment.ftl |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

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 f2f86f501..bd82374c6 100755
--- a/src/main/java/cc/ryanc/halo/model/domain/Post.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/Post.java
@@ -1,5 +1,6 @@
 package cc.ryanc.halo.model.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
@@ -54,7 +55,6 @@ public class Post implements Serializable {
      * 文章内容 Markdown格式
      */
     @Lob
-    @JsonIgnore
     private String postContentMd;
 
     /**
@@ -130,4 +130,14 @@ public class Post implements Serializable {
      * 是否允许评论
      */
     private Integer allowComment = 0;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    public Date getPostDate() {
+        return postDate;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    public Date getPostUpdate() {
+        return postUpdate;
+    }
 }
diff --git a/src/main/resources/templates/admin/admin_comment.ftl b/src/main/resources/templates/admin/admin_comment.ftl
index 905c0f515..cb1cacb4c 100755
--- a/src/main/resources/templates/admin/admin_comment.ftl
+++ b/src/main/resources/templates/admin/admin_comment.ftl
@@ -53,9 +53,9 @@
                                                 <td>${comment.commentContent}</td>
                                                 <td>
                                                     <#if comment.post.postType == "post">
-                                                        <a target="_blank" href="/archives/${comment.post.postUrl}">${comment.post.postTitle}</a>
+                                                        <a target="_blank" href="/archives/${comment.post.postUrl}#comment-id-${comment.commentId?c}">${comment.post.postTitle}</a>
                                                     <#else >
-                                                        <a target="_blank" href="/p/${comment.post.postUrl}">${comment.post.postTitle}</a>
+                                                        <a target="_blank" href="/p/${comment.post.postUrl}#comment-id-${comment.commentId?c}">${comment.post.postTitle}</a>
                                                     </#if>
                                                 </td>
                                                 <td>${comment.commentDate}</td>