0.0.6

a09aede2 · RYAN0UP · 005a7e4f · a09aede2 · a09aede2 · a09aede2
5 changed file
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
@@ -63,7 +63,7 @@ public class FrontArchiveController extends BaseController {
        Sort sort = new Sort(Sort.Direction.DESC, "postDate");
        Pageable pageable = PageRequest.of(page - 1, 5, sort);
        Page<Post> posts = postService.findPostByStatus(0, PostType.POST_TYPE_POST.getDesc(), pageable);
-        if(null==posts){
+        if (null == posts) {
            return this.renderNotFound();
        }
        model.addAttribute("posts", posts);
@@ -83,7 +83,7 @@ public class FrontArchiveController extends BaseController {
                           @PathVariable(value = "year") String year,
                           @PathVariable(value = "month") String month) {
        Page<Post> posts = postService.findPostByYearAndMonth(year, month, null);
-        if(null==posts){
+        if (null == posts) {
            return this.renderNotFound();
        }
        model.addAttribute("posts", posts);
@@ -100,7 +100,7 @@ public class FrontArchiveController extends BaseController {
    @GetMapping(value = "{postUrl}")
    public String getPost(@PathVariable String postUrl, Model model) {
        Post post = postService.findByPostUrl(postUrl, PostType.POST_TYPE_POST.getDesc());
-        if(null==post || post.getPostStatus()!=0){
+        if (null == post || post.getPostStatus() != 0) {
            return this.renderNotFound();
        }
        //获得当前文章的发布日期
@@ -116,11 +116,12 @@ public class FrontArchiveController extends BaseController {
        if (null != afterPosts && afterPosts.size() > 0) {
            model.addAttribute("afterPost", afterPosts.get(afterPosts.size() - 1));
        }
-        Sort sort = new Sort(Sort.Direction.DESC,"commentDate");
-        Pageable pageable = PageRequest.of(0,999,sort);
-        Page<Comment> comments = commentService.findCommentsByPostAndCommentStatus(post,pageable,0);
+        Sort sort = new Sort(Sort.Direction.DESC, "commentDate");
+        Pageable pageable = PageRequest.of(0, 999, sort);
+        Page<Comment> comments = commentService.findCommentsByPostAndCommentStatus(post, pageable, 0);
        model.addAttribute("post", post);
        model.addAttribute("comments", CommentUtil.getComments(comments.getContent()));
+        model.addAttribute("commentsCount", comments.getTotalElements());
        postService.updatePostView(post);
        return this.render("post");
    }

--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -101,13 +101,13 @@
 }

 ::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-    background-color: transparent;
+    width: 2px;
+    height: 2px;
+    background-color: #eee;
 }
 ::-webkit-scrollbar-thumb {
-    background-color: transparent;
+    background-color: #d0afaf;
 }
 ::-webkit-scrollbar-track {
-    background-color: transparent;
+    background-color: #eee;
 }
\ No newline at end of file
--- a/src/main/resources/templates/admin/module/_footer.ftl
+++ b/src/main/resources/templates/admin/module/_footer.ftl
 <footer class="main-footer">
-    <div class="pull-right hidden-xs"><a target="_blank" href="https://github.com/ruibaby/halo/releases/tag/v0.0.5">0.0.5</a></div>
+    <div class="pull-right hidden-xs"><a target="_blank" href="https://github.com/ruibaby/halo/releases/tag/v0.0.6">0.0.6</a></div>
    Thanks for using <strong><a data-pjax="true" href="/admin/halo">Halo</a>.</strong>
 </footer>
--- a/src/main/resources/templates/admin/module/_header.ftl
+++ b/src/main/resources/templates/admin/module/_header.ftl
@@ -29,12 +29,13 @@
                                    <li>
                                        <a href="/admin/comments?status=1">
                                            <div class="pull-left">
-                                                <img src="//www.gravatar.com/avatar/${comment.commentAuthorAvatarMd5?default("hash")}?s=256&d=${options.native_comment_avatar?default("mm")}" class="img-circle" alt="User Image">
+                                                <img src="//gravatar.loli.net/avatar/${comment.commentAuthorAvatarMd5?default("hash")}?s=256&d=${options.native_comment_avatar?default("mm")}" class="img-circle" alt="User Image">
                                            </div>
-                                            <h4>${comment.commentAuthor}
+                                            <h4>
+                                                ${comment.commentAuthor}
                                                <small> ${comment.commentDate?string("yyyy/MM/dd HH:mm")}</small>
                                            </h4>
-                                            <p>${comment.commentContent}</p>
+                                            <object>${comment.commentContent}</object>
                                        </a>
                                    </li>
                                <#if x==10>

--- a/src/main/resources/templates/common/comment/_native_comment.ftl
+++ b/src/main/resources/templates/common/comment/_native_comment.ftl
@@ -233,7 +233,7 @@
 </style>
 <div class="native-comment">
    <div class="comment-avatar">
-        <img src="//www.gravatar.com/avatar/none?s=256&d=${options.native_comment_avatar?default('mm')}" height="48" width="48" class="comment-author-avatar">
+        <img src="//gravatar.loli.net/avatar/none?s=256&d=${options.native_comment_avatar?default('mm')}" height="48" width="48" class="comment-author-avatar">
    </div>
    <div class="native-wrap">
        <div class="comment-header">
@@ -254,14 +254,14 @@
    </div>
    <div class="native-message" style="text-align: center;padding: 20px;display: none"></div>
    <div class="native-info">
-        <#--<span id="native-info-total" style="font-weight: 600">${comments.getTotalElements()}</span>评论-->
+        <span id="native-info-total" style="font-weight: 600">${commentsCount?default(0)}</span>评论
    </div>
    <#macro childComments comments>
        <ul class="native-list" style="margin-left: 20px; border-left: 1px solid #f1f1f1">
        <#if comments?? && comments?size gt 0>
            <#list comments as comment>
                <li class="native-list-one" id="comment-id-${comment.commentId?c}">
-                    <img class="native-list-one-img" src="//www.gravatar.com/avatar/${comment.commentAuthorAvatarMd5?if_exists}?s=256&d=${options.native_comment_avatar?default('mm')}">
+                    <img class="native-list-one-img" src="//gravatar.loli.net/avatar/${comment.commentAuthorAvatarMd5?if_exists}?s=256&d=${options.native_comment_avatar?default('mm')}">
                    <section>
                        <div class="native-list-one-head">
                            <a class="native-list-one-head-name" rel="nofollow" href="${comment.commentAuthorUrl?if_exists}">${comment.commentAuthor?if_exists}</a>
@@ -290,7 +290,7 @@
        <#if comments?? && comments?size gt 0>
            <#list comments as comment>
                <li class="native-list-one" id="comment-id-${comment.commentId?c}">
-                    <img class="native-list-one-img" src="//www.gravatar.com/avatar/${comment.commentAuthorAvatarMd5?if_exists}?s=256&d=${options.native_comment_avatar?default('mm')}">
+                    <img class="native-list-one-img" src="//gravatar.loli.net/avatar/${comment.commentAuthorAvatarMd5?if_exists}?s=256&d=${options.native_comment_avatar?default('mm')}">
                    <section>
                        <div class="native-list-one-head">
                            <a class="native-list-one-head-name" rel="nofollow" href="${comment.commentAuthorUrl?if_exists}">${comment.commentAuthor?if_exists}</a>
@@ -398,9 +398,9 @@
        $('#commentContent').focus();
    });
    function loadAvatar() {
-        $(".comment-author-avatar").attr("src","//www.gravatar.com/avatar/"+md5(localStorage.getItem("email"))+"?s=256&d=${options.native_comment_avatar?default('mm')}");
+        $(".comment-author-avatar").attr("src","//gravatar.loli.net/avatar/"+md5(localStorage.getItem("email"))+"?s=256&d=${options.native_comment_avatar?default('mm')}");
        if($('input[name=commentAuthorEmail]').val()!='' && $('input[name=commentAuthorEmail]').val()!=null){
-            $(".comment-author-avatar").attr("src","//www.gravatar.com/avatar/"+md5($('input[name=commentAuthorEmail]').val())+"?s=256&d=${options.native_comment_avatar?default('mm')}");
+            $(".comment-author-avatar").attr("src","//gravatar.loli.net/avatar/"+md5($('input[name=commentAuthorEmail]').val())+"?s=256&d=${options.native_comment_avatar?default('mm')}");
        }
    }
    var parser = new UAParser();