From e6fa1006b30c5c7fe3e058babcbf3137e939d232 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Fri, 31 Aug 2018 20:50:37 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=9A=82=E6=97=B6=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BF=9D=E5=AD=98=E6=96=87=E7=AB=A0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../halo/web/controller/front/FrontArchiveController.java | 3 +++ .../web/controller/front/FrontCategoryController.java | 3 +++ .../halo/web/controller/front/FrontIndexController.java | 3 +++ .../halo/web/controller/front/FrontPageController.java | 3 +++ .../halo/web/controller/front/FrontTagController.java | 3 +++ .../resources/templates/admin/admin_page_md_editor.ftl | 2 +- .../resources/templates/admin/admin_post_md_editor.ftl | 2 +- .../templates/common/comment/_native_comment.ftl | 8 +++++++- 8 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java index 06806f993..a8c1c5da6 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java @@ -11,6 +11,7 @@ import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.utils.CommentUtil; import cc.ryanc.halo.web.controller.core.BaseController; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.PageUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -153,10 +154,12 @@ public class FrontArchiveController extends BaseController { } //评论分页 ListPage commentsPage = new ListPage(CommentUtil.getComments(comments),cp, size); + int[] rainbow = PageUtil.rainbow(cp, commentsPage.getTotalPage(), 3); model.addAttribute("is_post",true); model.addAttribute("post", post); model.addAttribute("comments", commentsPage); model.addAttribute("commentsCount", comments.size()); + model.addAttribute("rainbow", rainbow); model.addAttribute("tagWords", CollUtil.join(tagWords, ",")); postService.updatePostView(post); return this.render("post"); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java index 4b447659d..b3c5e5dc0 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java @@ -7,6 +7,7 @@ import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.CategoryService; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.web.controller.core.BaseController; +import cn.hutool.core.util.PageUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -88,8 +89,10 @@ public class FrontCategoryController extends BaseController { } Pageable pageable = PageRequest.of(page - 1, size, sort); Page posts = postService.findPostByCategories(category, pageable); + int[] rainbow = PageUtil.rainbow(page, posts.getTotalPages(), 3); model.addAttribute("is_categories",true); model.addAttribute("posts", posts); + model.addAttribute("rainbow", rainbow); model.addAttribute("category", category); return this.render("category"); } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java index 08ca96a3c..7d44d50d3 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java @@ -5,6 +5,7 @@ import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.web.controller.core.BaseController; +import cn.hutool.core.util.PageUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -75,8 +76,10 @@ public class FrontIndexController extends BaseController { if (null == posts) { return this.renderNotFound(); } + int[] rainbow = PageUtil.rainbow(page, posts.getTotalPages(), 3); model.addAttribute("is_index",true); model.addAttribute("posts", posts); + model.addAttribute("rainbow", rainbow); return this.render("index"); } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java index ae6fa8bba..cacc58a3c 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java @@ -14,6 +14,7 @@ import cc.ryanc.halo.service.GalleryService; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.utils.CommentUtil; import cc.ryanc.halo.web.controller.core.BaseController; +import cn.hutool.core.util.PageUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -95,10 +96,12 @@ public class FrontPageController extends BaseController { } //评论分页 ListPage commentsPage = new ListPage(CommentUtil.getComments(comments),cp, size); + int[] rainbow = PageUtil.rainbow(cp, commentsPage.getTotalPage(), 3); model.addAttribute("is_page",true); model.addAttribute("post", post); model.addAttribute("comments", commentsPage); model.addAttribute("commentsCount", comments.size()); + model.addAttribute("rainbow", rainbow); postService.updatePostView(post); return this.render("page"); } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java index 77cdbd272..01291555c 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java @@ -7,6 +7,7 @@ import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.service.TagService; import cc.ryanc.halo.web.controller.core.BaseController; +import cn.hutool.core.util.PageUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -83,8 +84,10 @@ public class FrontTagController extends BaseController { } Pageable pageable = PageRequest.of(page - 1, size, sort); Page posts = postService.findPostsByTags(tag, pageable); + int[] rainbow = PageUtil.rainbow(page, posts.getTotalPages(), 3); model.addAttribute("is_tags",true); model.addAttribute("posts", posts); + model.addAttribute("rainbow", rainbow); model.addAttribute("tag", tag); return this.render("tag"); } diff --git a/src/main/resources/templates/admin/admin_page_md_editor.ftl b/src/main/resources/templates/admin/admin_page_md_editor.ftl index 239939c44..3683edf6c 100755 --- a/src/main/resources/templates/admin/admin_page_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_page_md_editor.ftl @@ -277,7 +277,7 @@ }); } - setInterval("autoPush()","60000"); + // setInterval("autoPush()","60000"); /** * 自动保存文章 */ diff --git a/src/main/resources/templates/admin/admin_post_md_editor.ftl b/src/main/resources/templates/admin/admin_post_md_editor.ftl index abc30f5ea..aa996238e 100755 --- a/src/main/resources/templates/admin/admin_post_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_post_md_editor.ftl @@ -371,7 +371,7 @@ } }); } - setInterval("autoPush()","60000"); + // setInterval("autoPush()","60000"); /** * 自动保存文章 */ diff --git a/src/main/resources/templates/common/comment/_native_comment.ftl b/src/main/resources/templates/common/comment/_native_comment.ftl index 8b9e36275..0fca5bd93 100644 --- a/src/main/resources/templates/common/comment/_native_comment.ftl +++ b/src/main/resources/templates/common/comment/_native_comment.ftl @@ -333,7 +333,13 @@
  • - ${comments.nowPage} + <#list rainbow as r> + <#if r == comments.nowPage> + ${r} + <#else> + ${r} + +
    • <#if comments.hasNext>