github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/33/merge
ruibaby 2018-08-31 20:50:37 +08:00
parent c5af7bfcc8
commit e6fa1006b3
8 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
View File

@ -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<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");

3
src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java
View File

@ -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<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");
}

3
src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
View File

@ -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");
}

3
src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java
View File

@ -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<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");
}

3
src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java
View File

@ -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<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");
}

2
src/main/resources/templates/admin/admin_page_md_editor.ftl
View File

@ -277,7 +277,7 @@
});
}
setInterval("autoPush()","60000");
// setInterval("autoPush()","60000");
/**
* 自动保存文章
*/

2
src/main/resources/templates/admin/admin_post_md_editor.ftl
View File

@ -371,7 +371,7 @@
}
});
}
setInterval("autoPush()","60000");
// setInterval("autoPush()","60000");
/**
* 自动保存文章
*/

8
src/main/resources/templates/common/comment/_native_comment.ftl
View File

@ -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>