Complete topping post feature(issue: #103)

src/main/java/cc/ryanc/halo/web/controller/core/BaseController.java

@@ -1,5 +1,6 @@
 package cc.ryanc.halo.web.controller.core;
 
+import cc.ryanc.halo.logging.Logger;
 import cn.hutool.core.text.StrBuilder;
 
 /**
@@ -12,6 +13,8 @@ import cn.hutool.core.text.StrBuilder;
  */
 public abstract class BaseController {
 
+    protected Logger log = Logger.getLogger(getClass());
+
     /**
      * 定义默认主题
      */

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

@@ -44,7 +44,6 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
  * @author : RYAN0UP
  * @date : 2018/4/26
  */
-@Slf4j
 @Controller
 @RequestMapping(value = "/archives")
 public class FrontArchiveController extends BaseController {
@@ -141,7 +140,7 @@ public class FrontArchiveController extends BaseController {
             model.addAttribute("afterPost", nextPost);
             model.addAttribute("nextPost", nextPost);
         }
-        List<Comment> comments = null;
+        List<Comment> comments;
         if (StrUtil.equals(OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()), TrueFalseEnum.TRUE.getDesc()) || OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()) == null) {
             comments = commentService.findCommentsByPostAndCommentStatus(post, CommentStatusEnum.PUBLISHED.getCode());
         } else {
@@ -162,7 +161,7 @@ public class FrontArchiveController extends BaseController {
             size = Integer.parseInt(OPTIONS.get(BlogPropertiesEnum.INDEX_COMMENTS.getProp()));
         }
         //评论分页
-        final ListPage<Comment> commentsPage = new ListPage<Comment>(CommentUtil.getComments(comments), cp, size);
+        final ListPage<Comment> commentsPage = new ListPage<>(CommentUtil.getComments(comments), cp, size);
         final int[] rainbow = PageUtil.rainbow(cp, commentsPage.getTotalPage(), 3);
         model.addAttribute("is_post", true);
         model.addAttribute("comments", commentsPage);

src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java

@@ -1,5 +1,6 @@
 package cc.ryanc.halo.web.controller.front;
 
+import cc.ryanc.halo.logging.Logger;
 import cc.ryanc.halo.model.domain.Comment;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.dto.JsonResult;
@@ -43,10 +44,11 @@ import static cc.ryanc.halo.model.dto.HaloConst.OPTIONS;
  * @author : RYAN0UP
  * @date : 2018/4/26
  */
-@Slf4j
 @Controller
 public class FrontCommentController {
 
+    private final Logger log = Logger.getLogger(getClass());
+
     @Autowired
     private CommentService commentService;
 

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

@@ -30,7 +30,6 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
  * @author : RYAN0UP
  * @date : 2018/4/26
  */
-@Slf4j
 @Controller
 @RequestMapping(value = {"/", "index"})
 public class FrontIndexController extends BaseController {
@@ -47,7 +46,7 @@ public class FrontIndexController extends BaseController {
      */
     @GetMapping
     public String index(Model model) {
-        return this.index(model, 1, Sort.by(DESC, "postDate"));
+        return this.index(model, 1, Sort.by(DESC, "priority").and(Sort.by(DESC, "postDate")));
     }
 
     /**
@@ -60,7 +59,12 @@ public class FrontIndexController extends BaseController {
     @GetMapping(value = "page/{page}")
     public String index(Model model,
                         @PathVariable(value = "page") Integer page,
-                        @SortDefault(sort = "postDate", direction = DESC) Sort sort) {
+                        @SortDefault.SortDefaults({
+                                @SortDefault(sort = "priority", direction = DESC),
+                                @SortDefault(sort = "postDate", direction = DESC)
+                        }) Sort sort) {
+        log.debug("Requested index page, sort info: [{}]", sort);
+
         //默认显示10条
         int size = 10;
         if (StrUtil.isNotBlank(OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()))) {

src/main/java/cc/ryanc/halo/web/controller/front/FrontSearchController.java

@@ -1,5 +1,6 @@
 package cc.ryanc.halo.web.controller.front;
 
+import cc.ryanc.halo.logging.Logger;
 import cc.ryanc.halo.model.domain.Post;
 import cc.ryanc.halo.model.enums.BlogPropertiesEnum;
 import cc.ryanc.halo.model.enums.PostStatusEnum;
@@ -34,11 +35,12 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
  * @author : RYAN0UP
  * @date : 2019/1/11
  */
-@Slf4j
 @Controller
 @RequestMapping(value = "/search")
 public class FrontSearchController extends BaseController {
 
+    private final Logger log = Logger.getLogger(getClass());
+
     @Autowired
     private PostService postService;