From 84e5362d7015ad6c3c8cdf4706a7a2396b6ba72a Mon Sep 17 00:00:00 2001 From: RYAN0UP_ Date: Tue, 27 Mar 2018 21:22:41 +0800 Subject: [PATCH] =?UTF-8?q?:alien:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=90=AF=E7=94=A8pjax=E4=B9=8B=E5=90=8E=E6=89=80?= =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?= =?UTF-8?q?:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/ryanc/halo/model/domain/Comment.java | 5 +++ .../ryanc/halo/repository/PostRepository.java | 0 .../ryanc/halo/service/AttachmentService.java | 2 +- .../halo/web/controller/IndexController.java | 1 + .../web/controller/InstallController.java | 1 + .../controller/admin/CommentController.java | 1 + .../templates/admin/admin_attachment.ftl | 2 +- .../templates/admin/admin_cate-update.ftl | 4 +- .../templates/admin/admin_category.ftl | 4 +- .../templates/admin/admin_comment.ftl | 16 +++---- .../resources/templates/admin/admin_halo.ftl | 2 +- .../resources/templates/admin/admin_index.ftl | 12 +++++- .../templates/admin/admin_link-update.ftl | 6 +-- .../resources/templates/admin/admin_link.ftl | 4 +- .../templates/admin/admin_md-editor.ftl | 32 ++++++-------- .../resources/templates/admin/admin_menu.ftl | 4 +- .../templates/admin/admin_option.ftl | 4 +- .../resources/templates/admin/admin_page.ftl | 4 +- .../resources/templates/admin/admin_post.ftl | 22 +++++----- .../templates/admin/admin_profile.ftl | 4 +- .../templates/admin/admin_rt-editor.ftl | 4 +- .../templates/admin/admin_tag-update.ftl | 4 +- .../resources/templates/admin/admin_tag.ftl | 4 +- .../templates/admin/admin_theme-editor.ftl | 38 +++++++---------- .../resources/templates/admin/admin_theme.ftl | 6 +-- .../templates/admin/module/_macro.ftl | 2 +- .../templates/admin/module/_sidebar.ftl | 42 +++++++++---------- .../admin/widget/_attachment-detail.ftl | 2 +- 28 files changed, 119 insertions(+), 113 deletions(-) mode change 100755 => 100644 src/main/java/cc/ryanc/halo/repository/PostRepository.java 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 4c91b860f..e5d9b316b 100644 --- a/src/main/java/cc/ryanc/halo/model/domain/Comment.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Comment.java @@ -83,4 +83,9 @@ public class Comment implements Serializable { * 评论状态，0：正常，1：待审核，2：回收站 */ private Integer commentStatus=1; + + /** + * 是否是博主的评论 0:不是 1:是 + */ + private Integer isAdmin; } diff --git a/src/main/java/cc/ryanc/halo/repository/PostRepository.java b/src/main/java/cc/ryanc/halo/repository/PostRepository.java old mode 100755 new mode 100644 diff --git a/src/main/java/cc/ryanc/halo/service/AttachmentService.java b/src/main/java/cc/ryanc/halo/service/AttachmentService.java index ab6809964..ace8614b8 100644 --- a/src/main/java/cc/ryanc/halo/service/AttachmentService.java +++ b/src/main/java/cc/ryanc/halo/service/AttachmentService.java @@ -31,7 +31,7 @@ public interface AttachmentService { List findAllAttachments(); /** - * 查询所有附件，分类 + * 查询所有附件，分页 * * @param pageable pageable * @return page diff --git a/src/main/java/cc/ryanc/halo/web/controller/IndexController.java b/src/main/java/cc/ryanc/halo/web/controller/IndexController.java index 771e63ce5..3bd48a628 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/IndexController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/IndexController.java @@ -499,6 +499,7 @@ public class IndexController extends BaseController{ comment.setPost(post); comment.setCommentDate(new Date()); comment.setCommentAuthorIp(HaloUtil.getIpAddr(request)); + comment.setIsAdmin(0); commentService.saveByComment(comment); if("true".equals(HaloConst.OPTIONS.get("smtp_email_enable")) && "true".equals(HaloConst.OPTIONS.get("new_comment_notice"))){ diff --git a/src/main/java/cc/ryanc/halo/web/controller/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/InstallController.java index 89a45a99f..7ffb22620 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/InstallController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/InstallController.java @@ -141,6 +141,7 @@ public class InstallController { comment.setCommentDate(new Date()); comment.setCommentContent("欢迎，欢迎！"); 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"); + comment.setIsAdmin(0); commentService.saveByComment(comment); //设置默认主题 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 091fd1d27..5181ed355 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 @@ -202,6 +202,7 @@ public class CommentController extends BaseController{ comment.setCommentAgent(userAgent); comment.setCommentParent(commentId); comment.setCommentStatus(0); + comment.setIsAdmin(1); commentService.saveByComment(comment); //正则表达式判断对方的邮箱是否是正确的格式 diff --git a/src/main/resources/templates/admin/admin_attachment.ftl b/src/main/resources/templates/admin/admin_attachment.ftl index a275a9857..98a9bbd02 100755 --- a/src/main/resources/templates/admin/admin_attachment.ftl +++ b/src/main/resources/templates/admin/admin_attachment.ftl @@ -22,7 +22,7 @@ 上传
    -
  1. 首页
    2. +
  2. 首页
  3. 附件
diff --git a/src/main/resources/templates/admin/admin_cate-update.ftl b/src/main/resources/templates/admin/admin_cate-update.ftl index b72b6616c..a4332ac97 100755 --- a/src/main/resources/templates/admin/admin_cate-update.ftl +++ b/src/main/resources/templates/admin/admin_cate-update.ftl @@ -16,8 +16,8 @@

分类目录

    -
  1. 首页
    2. -
  2. 分类目录
    3. +
  3. 首页
    4. +
  4. 分类目录
  5. 修改
diff --git a/src/main/resources/templates/admin/admin_category.ftl b/src/main/resources/templates/admin/admin_category.ftl index 08b10f4ae..02d2dd1b5 100755 --- a/src/main/resources/templates/admin/admin_category.ftl +++ b/src/main/resources/templates/admin/admin_category.ftl @@ -15,10 +15,10 @@
  1. - + 首页
    2. -
  2. 文章
    3. +
  3. 文章
  4. 分类目录
diff --git a/src/main/resources/templates/admin/admin_comment.ftl b/src/main/resources/templates/admin/admin_comment.ftl index e366b65f5..bcf3eefb8 100755 --- a/src/main/resources/templates/admin/admin_comment.ftl +++ b/src/main/resources/templates/admin/admin_comment.ftl @@ -13,7 +13,7 @@

评论

  1. - 首页 + 首页
  2. 评论
@@ -21,13 +21,13 @@
@@ -56,16 +56,16 @@ <#switch comment.commentStatus> <#case 0> - + <#break > <#case 1> - 通过 - 通过并回复 + 通过 + 通过并回复 <#break > <#case 2> - 还原 + 还原 <#break > diff --git a/src/main/resources/templates/admin/admin_halo.ftl b/src/main/resources/templates/admin/admin_halo.ftl index 223e6b860..79f3e4ecf 100644 --- a/src/main/resources/templates/admin/admin_halo.ftl +++ b/src/main/resources/templates/admin/admin_halo.ftl @@ -18,7 +18,7 @@

关于Halo

  1. - 首页 + 首页
  2. 关于Halo
diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl index d51e20c14..d3d46e542 100755 --- a/src/main/resources/templates/admin/admin_index.ftl +++ b/src/main/resources/templates/admin/admin_index.ftl @@ -248,7 +248,17 @@ ${comment.post.postTitle} - ${comment.commentContent} + <#switch comment.commentStatus> + <#case 0> + ${comment.commentContent} + <#break> + <#case 1> + ${comment.commentContent} + <#break> + <#case 2> + ${comment.commentContent} + <#break> + <#switch comment.commentStatus> diff --git a/src/main/resources/templates/admin/admin_link-update.ftl b/src/main/resources/templates/admin/admin_link-update.ftl index 5c95c6f2b..650b8ef35 100755 --- a/src/main/resources/templates/admin/admin_link-update.ftl +++ b/src/main/resources/templates/admin/admin_link-update.ftl @@ -18,9 +18,9 @@

友情链接

    -
  1. 首页
    2. -
  2. 页面
    3. -
  3. 友情链接
    4. +
  4. 首页
    5. +
  5. 页面
    6. +
  6. 友情链接
  7. 修改
diff --git a/src/main/resources/templates/admin/admin_link.ftl b/src/main/resources/templates/admin/admin_link.ftl index 0f9f2fcd4..97a0752ca 100755 --- a/src/main/resources/templates/admin/admin_link.ftl +++ b/src/main/resources/templates/admin/admin_link.ftl @@ -12,8 +12,8 @@

友情链接#

    -
  1. 首页
    2. -
  2. 页面
    3. +
  3. 首页
    4. +
  4. 页面
  5. 友情链接
diff --git a/src/main/resources/templates/admin/admin_md-editor.ftl b/src/main/resources/templates/admin/admin_md-editor.ftl index c737f84dc..46d6d7e50 100644 --- a/src/main/resources/templates/admin/admin_md-editor.ftl +++ b/src/main/resources/templates/admin/admin_md-editor.ftl @@ -20,10 +20,10 @@
  1. - 首页 + 首页
  2. - 文章 + 文章
  3. 新建文章
@@ -40,7 +40,7 @@
永久链接： - https://ryanc.cc/archives// + ${options.site_url}/article// @@ -130,6 +130,7 @@ + +