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 index 3fd7c4b6a..84b37b4df 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java @@ -53,6 +53,7 @@ public class FrontArchiveController extends BaseController { * 文章归档 * * @param model model + * * @return 模板路径 */ @GetMapping @@ -65,6 +66,7 @@ public class FrontArchiveController extends BaseController { * * @param model model * @param page page 当前页码 + * * @return 模板路径/themes/{theme}/archives */ @GetMapping(value = "page/{page}") @@ -89,6 +91,7 @@ public class FrontArchiveController extends BaseController { * @param model model * @param year year 年份 * @param month month 月份 + * * @return 模板路径/themes/{theme}/archives */ @GetMapping(value = "{year}/{month}") @@ -109,6 +112,7 @@ public class FrontArchiveController extends BaseController { * * @param postUrl 文章路径名 * @param model model + * * @return 模板路径/themes/{theme}/post */ @GetMapping(value = "{postUrl}") @@ -147,7 +151,7 @@ public class FrontArchiveController extends BaseController { } } //默认显示10条 - Integer size = 10; + int size = 10; //获取每页评论条数 if (StrUtil.isNotBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_COMMENTS.getProp()))) { size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_COMMENTS.getProp())); 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 b5c3ccf02..17947e4f2 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 @@ -5,10 +5,7 @@ import cc.ryanc.halo.model.domain.Gallery; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.ListPage; -import cc.ryanc.halo.model.enums.BlogPropertiesEnum; -import cc.ryanc.halo.model.enums.CommentStatusEnum; -import cc.ryanc.halo.model.enums.PostTypeEnum; -import cc.ryanc.halo.model.enums.TrueFalseEnum; +import cc.ryanc.halo.model.enums.*; import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.GalleryService; import cc.ryanc.halo.service.PostService; @@ -72,6 +69,7 @@ public class FrontPageController extends BaseController { * * @param postUrl 页面路径 * @param model model + * * @return 模板路径/themes/{theme}/post */ @GetMapping(value = "/p/{postUrl}") @@ -79,7 +77,7 @@ public class FrontPageController extends BaseController { @RequestParam(value = "cp", defaultValue = "1") Integer cp, Model model) { Post post = postService.findByPostUrl(postUrl, PostTypeEnum.POST_TYPE_PAGE.getDesc()); - if (null == post) { + if (null == post || !post.getPostStatus().equals(PostStatusEnum.PUBLISHED.getCode())) { return this.renderNotFound(); } List comments = null; @@ -89,7 +87,7 @@ public class FrontPageController extends BaseController { comments = commentService.findCommentsByPostAndCommentStatusNot(post, CommentStatusEnum.RECYCLE.getCode()); } //默认显示10条 - Integer size = 10; + int size = 10; //获取每页评论条数 if (StrUtil.isNotBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_COMMENTS.getProp()))) { size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_COMMENTS.getProp())); diff --git a/src/main/resources/templates/admin/admin_category.ftl b/src/main/resources/templates/admin/admin_category.ftl index 0e75744eb..75cb7bc40 100755 --- a/src/main/resources/templates/admin/admin_category.ftl +++ b/src/main/resources/templates/admin/admin_category.ftl @@ -29,17 +29,17 @@
- + <@spring.message code='admin.categories.form.cate-name-tips' />
- + <@spring.message code='admin.categories.form.cate-url-tips' />
- + <@spring.message code='admin.categories.form.cate-desc-tips' />
@@ -96,9 +96,9 @@ <#if categories?? && categories?size gt 0> <#list categories as cate> - ${cate.cateName} - ${cate.cateUrl} - ${(cate.cateDesc)!} + ${cate.cateName!} + ${cate.cateUrl!} + ${cate.cateDesc!} ${cate.posts?size} diff --git a/src/main/resources/templates/admin/admin_page.ftl b/src/main/resources/templates/admin/admin_page.ftl index c6981b605..47c600529 100755 --- a/src/main/resources/templates/admin/admin_page.ftl +++ b/src/main/resources/templates/admin/admin_page.ftl @@ -1,137 +1,147 @@ -<#compress > -<#include "module/_macro.ftl"> -<@head>${options.blog_title!} | <@spring.message code='admin.pages.title' /> -
-
-

<@spring.message code='admin.pages.title' />

- - <@spring.message code='admin.pages.btn.new-page' /> - -
    -
  1. - <@spring.message code='admin.index.bread.index' /> -
    2. -
  2. <@spring.message code='admin.pages.title' />
    3. -
  3. <@spring.message code='admin.pages.bread.all-pages' />
    4. -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - -
<@spring.message code='common.th.title' /><@spring.message code='common.th.url' /><@spring.message code='common.th.control' />
<@spring.message code='admin.pages.links' />/links - <@spring.message code='common.btn.view' /> - <@spring.message code='common.btn.edit' /> -
<@spring.message code='admin.pages.gallery' />/gallery - <@spring.message code='common.btn.view' /> - <@spring.message code='common.btn.edit' /> -
-
-
-
-
- - - - - - - - - - - <#if pages?size gt 0> - <#list pages as page> - - - - - - - - - - <#else> - - - - - -
<@spring.message code='common.th.title' /><@spring.message code='common.th.url' /><@spring.message code='common.th.comments' /><@spring.message code='common.th.views' /><@spring.message code='common.th.date' /><@spring.message code='common.th.control' />
${page.postTitle}/p/${page.postUrl} - ${page.comments?size} - - ${page.postViews} - ${page.postDate?string("yyyy-MM-dd HH:mm")} - <@spring.message code='common.btn.view' /> - <@spring.message code='common.btn.edit' /> - -
<@spring.message code='common.text.no-data' />
-
-
-
-
-
-
-
- - - -
-<@footer> - +<#compress > +<#include "module/_macro.ftl"> +<@head>${options.blog_title!} | <@spring.message code='admin.pages.title' /> +
+
+

<@spring.message code='admin.pages.title' />

+ + <@spring.message code='admin.pages.btn.new-page' /> + +
    +
  1. + <@spring.message code='admin.index.bread.index' /> +
    2. +
  2. <@spring.message code='admin.pages.title' />
    3. +
  3. <@spring.message code='admin.pages.bread.all-pages' />
    4. +
+
+
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + +
<@spring.message code='common.th.title' /><@spring.message code='common.th.url' /><@spring.message code='common.th.control' />
<@spring.message code='admin.pages.links' />/links + <@spring.message code='common.btn.view' /> + <@spring.message code='common.btn.edit' /> +
<@spring.message code='admin.pages.gallery' />/gallery + <@spring.message code='common.btn.view' /> + <@spring.message code='common.btn.edit' /> +
+
+
+
+
+ + + + + + + + + + + + <#if pages?size gt 0> + <#list pages as page> + + + + + + + + + + + <#else> + + + + + +
<@spring.message code='common.th.title' /><@spring.message code='common.th.url' /><@spring.message code='common.th.comments' /><@spring.message code='common.th.views' /><@spring.message code='common.th.status' /><@spring.message code='common.th.date' /><@spring.message code='common.th.control' />
${page.postTitle}/p/${page.postUrl} + ${page.comments?size} + + ${page.postViews} + + <#if page.postStatus==0> + <@spring.message code='common.status.published' /> + <#elseif page.postStatus==1> + <@spring.message code='common.status.draft' /> + <#else> + <@spring.message code='common.status.recycle-bin' /> + + ${page.postDate?string("yyyy-MM-dd HH:mm")} + <@spring.message code='common.btn.view' /> + <@spring.message code='common.btn.edit' /> + +
<@spring.message code='common.text.no-data' />
+
+
+
+
+
+
+
+ + + +
+<@footer> + diff --git a/src/main/resources/templates/admin/admin_page_md_editor.ftl b/src/main/resources/templates/admin/admin_page_md_editor.ftl index 2aba88466..c6c94332d 100755 --- a/src/main/resources/templates/admin/admin_page_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_page_md_editor.ftl @@ -5,7 +5,7 @@