diff --git a/deploy.sh b/deploy.sh index e1e526c80..e0eecabce 100644 --- a/deploy.sh +++ b/deploy.sh @@ -4,7 +4,7 @@ HALO_DIR="/www/wwwroot/halo" # 拉取最新的源码 -git pull +# git pull # 进入Halo根目录 cd $HALO_DIR diff --git a/src/main/resources/templates/admin/admin_category.ftl b/src/main/resources/templates/admin/admin_category.ftl index 129a8c0e0..dea978dfa 100755 --- a/src/main/resources/templates/admin/admin_category.ftl +++ b/src/main/resources/templates/admin/admin_category.ftl @@ -106,7 +106,9 @@ ${cate.cateName} ${cate.cateUrl} ${(cate.cateDesc)!} - ${cate.posts?size} + + ${cate.posts?size} + <#if updateCategory?? && updateCategory.cateId?c==cate.cateId?c> 正在修改 diff --git a/src/main/resources/templates/admin/admin_page.ftl b/src/main/resources/templates/admin/admin_page.ftl index d322880d9..91d112f39 100755 --- a/src/main/resources/templates/admin/admin_page.ftl +++ b/src/main/resources/templates/admin/admin_page.ftl @@ -88,8 +88,12 @@ ${page.postTitle} /p/${page.postUrl} - ${page.comments?size} - ${page.postViews} + + ${page.comments?size} + + + ${page.postViews} + ${page.postDate?string("yyyy-MM-dd HH:mm")} 预览 diff --git a/src/main/resources/templates/admin/admin_post.ftl b/src/main/resources/templates/admin/admin_post.ftl index c3e12518e..49cbf4ae7 100755 --- a/src/main/resources/templates/admin/admin_post.ftl +++ b/src/main/resources/templates/admin/admin_post.ftl @@ -85,10 +85,10 @@ - ${post.getComments()?size} + ${post.getComments()?size} - ${post.postViews} + ${post.postViews} ${post.postDate?if_exists?string("yyyy-MM-dd HH:mm")}