From d39ffbb38299ea4fa53d6f8383ddc2d7cdc02fe8 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Sun, 3 Mar 2019 09:16:18 +0800 Subject: [PATCH] :pencil2: modify the property of the post class priority to postPriority --- src/main/java/cc/ryanc/halo/model/domain/Post.java | 6 +++--- .../halo/web/controller/front/FrontIndexController.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/model/domain/Post.java b/src/main/java/cc/ryanc/halo/model/domain/Post.java index 0b4f88e5d..6d1a3408a 100755 --- a/src/main/java/cc/ryanc/halo/model/domain/Post.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Post.java @@ -152,7 +152,7 @@ public class Post implements Serializable { * Post priority (default is 0) */ @ColumnDefault("0") - private Integer priority; + private Integer postPriority; @JsonFormat(pattern = "yyyy-MM-dd HH:mm") public Date getPostDate() { @@ -176,8 +176,8 @@ public class Post implements Serializable { postUpdate = now; } - if (priority == null) { - priority = 0; + if (postPriority == null) { + postPriority = 0; } postId = null; 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 dea938ca7..97e714e0e 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 @@ -46,7 +46,7 @@ public class FrontIndexController extends BaseController { */ @GetMapping public String index(Model model) { - return this.index(model, 1, Sort.by(DESC, "priority").and(Sort.by(DESC, "postDate"))); + return this.index(model, 1, Sort.by(DESC, "postPriority").and(Sort.by(DESC, "postDate"))); } /** @@ -60,7 +60,7 @@ public class FrontIndexController extends BaseController { public String index(Model model, @PathVariable(value = "page") Integer page, @SortDefault.SortDefaults({ - @SortDefault(sort = "priority", direction = DESC), + @SortDefault(sort = "postPriority", direction = DESC), @SortDefault(sort = "postDate", direction = DESC) }) Sort sort) { log.debug("Requested index page, sort info: [{}]", sort);