🐛 暂时下线自动保存文章功能。

halo-dev · Aug 31, 2018 · e6fa100 · e6fa100
1 parent c5af7bf
commit e6fa100
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 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
@@ -11,6 +11,7 @@
 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 String getPost(@PathVariable String postUrl,
         }
         //评论分页
         ListPage<Comment> commentsPage = new ListPage<Comment>(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
@@ -7,6 +7,7 @@
 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 String categories(Model model,
         }
         Pageable pageable = PageRequest.of(page - 1, size, sort);
         Page<Post> 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
@@ -5,6 +5,7 @@
 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 String index(Model model,
         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
@@ -14,6 +14,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.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 String getPage(@PathVariable(value = "postUrl") String postUrl,
         }
         //评论分页
         ListPage<Comment> commentsPage = new ListPage<Comment>(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
@@ -7,6 +7,7 @@
 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 String tags(Model model,
         }
         Pageable pageable = PageRequest.of(page - 1, size, sort);
         Page<Post> 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
@@ -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
@@ -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
@@ -333,7 +333,13 @@
                 </li>
                 </#if>
                 <li>
-                    <span title="当前页">${comments.nowPage}</span>
+                    <#list rainbow as r>
+                        <#if r == comments.nowPage>
+                            <a href="?cp=${comments.nowPage}#comments-list" style="color: red;">${r}</a>
+                        <#else>
+                            <a href="?cp=${r}#comments-list">${r}</a>
+                        </#if>
+                    </#list>
                 </li>
                 <#if comments.hasNext>
                 <li>