diff --git a/src/main/java/cc/ryanc/halo/config/HaloConfiguration.java b/src/main/java/cc/ryanc/halo/config/HaloConfiguration.java new file mode 100644 index 000000000..9c18b6dea --- /dev/null +++ b/src/main/java/cc/ryanc/halo/config/HaloConfiguration.java @@ -0,0 +1,16 @@ +package cc.ryanc.halo.config; + +import cc.ryanc.halo.config.properties.HaloProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +/** + * Halo configuration. + * + * @author johnniang + */ +@Configuration +@EnableConfigurationProperties(HaloProperties.class) +public class HaloConfiguration { + +} diff --git a/src/main/java/cc/ryanc/halo/config/properties/HaloProperties.java b/src/main/java/cc/ryanc/halo/config/properties/HaloProperties.java new file mode 100644 index 000000000..fecadeee8 --- /dev/null +++ b/src/main/java/cc/ryanc/halo/config/properties/HaloProperties.java @@ -0,0 +1,19 @@ +package cc.ryanc.halo.config.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * Halo configuration properties. + * + * @author johnniang + */ +@Data +@ConfigurationProperties("halo") +public class HaloProperties { + + /** + * Doc api disabled. (Default is true) + */ + private Boolean docDisabled = true; +} 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 a7ea46528..dfedfbda4 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 @@ -80,7 +80,7 @@ public class FrontPageController extends BaseController { if (null == post || !post.getPostStatus().equals(PostStatusEnum.PUBLISHED.getCode())) { return this.renderNotFound(); } - List comments = null; + List 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 { @@ -92,7 +92,7 @@ public class FrontPageController extends BaseController { size = Integer.parseInt(OPTIONS.get(BlogPropertiesEnum.INDEX_COMMENTS.getProp())); } //评论分页 - final ListPage commentsPage = new ListPage(CommentUtil.getComments(comments), cp, size); + final ListPage commentsPage = new ListPage<>(CommentUtil.getComments(comments), cp, size); final int[] rainbow = PageUtil.rainbow(cp, commentsPage.getTotalPage(), 3); model.addAttribute("is_page", true); model.addAttribute("post", post); diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 2b90274b6..2f7579619 100755 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -64,3 +64,5 @@ logging: cc.ryanc.halo: DEBUG org.hibernate: ERROR file: ./logs/log.log +halo: + doc-disabled: false