From f2b9fc768dbe4a1a5fa46f70c54ab9f16274299c Mon Sep 17 00:00:00 2001 From: ruibaby Date: Wed, 1 May 2019 19:53:09 +0800 Subject: [PATCH] Enable gzip. --- .../halo/app/controller/content/ContentSheetController.java | 3 ++- .../run/halo/app/model/freemarker/tag/MenuTagDirective.java | 6 ++++++ src/main/resources/application-dev.yaml | 5 ++++- src/main/resources/application-test.yaml | 3 +++ src/main/resources/application.yaml | 3 +++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/run/halo/app/controller/content/ContentSheetController.java b/src/main/java/run/halo/app/controller/content/ContentSheetController.java index 02511d04e..dd51ba67c 100644 --- a/src/main/java/run/halo/app/controller/content/ContentSheetController.java +++ b/src/main/java/run/halo/app/controller/content/ContentSheetController.java @@ -65,7 +65,8 @@ public class ContentSheetController { // sheet and post all can use model.addAttribute("sheet", sheetService.convertToDetail(sheet)); - model.addAttribute("post",sheetService.convertToDetail(sheet)); + model.addAttribute("post", sheetService.convertToDetail(sheet)); + model.addAttribute("is_sheet", true); if (StrUtil.isNotEmpty(sheet.getTemplate())) { if (themeService.templateExists(sheet.getTemplate() + HaloConst.SUFFIX_FTL)) { diff --git a/src/main/java/run/halo/app/model/freemarker/tag/MenuTagDirective.java b/src/main/java/run/halo/app/model/freemarker/tag/MenuTagDirective.java index 2a9050a30..406daf4f2 100644 --- a/src/main/java/run/halo/app/model/freemarker/tag/MenuTagDirective.java +++ b/src/main/java/run/halo/app/model/freemarker/tag/MenuTagDirective.java @@ -2,6 +2,7 @@ package run.halo.app.model.freemarker.tag; import freemarker.core.Environment; import freemarker.template.*; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import run.halo.app.model.support.HaloConst; import run.halo.app.service.MenuService; @@ -9,6 +10,8 @@ import run.halo.app.service.MenuService; import java.io.IOException; import java.util.Map; +import static org.springframework.data.domain.Sort.Direction.DESC; + /** * Freemarker custom tag of menu. * @@ -37,6 +40,9 @@ public class MenuTagDirective implements TemplateDirectiveModel { case "list": env.setVariable("menus", builder.build().wrap(menuService.listAll())); break; + case "tree": + env.setVariable("menus",builder.build().wrap(menuService.listAsTree(Sort.by(DESC, "priority")))); + break; case "count": env.setVariable("count", builder.build().wrap(menuService.count())); break; diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index e95910db8..b81ba59ba 100755 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -9,6 +9,9 @@ server: servlet: session: timeout: 86400s + compression: + enabled: true + mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain spring: output: ansi: @@ -57,5 +60,5 @@ logging: halo: doc-disabled: false production-env: false - auth-enabled: false + auth-enabled: true workDir: ${user.home}/halo-dev/ \ No newline at end of file diff --git a/src/main/resources/application-test.yaml b/src/main/resources/application-test.yaml index d8ebbf73a..e05453263 100755 --- a/src/main/resources/application-test.yaml +++ b/src/main/resources/application-test.yaml @@ -9,6 +9,9 @@ server: servlet: session: timeout: 86400s + compression: + enabled: true + mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain spring: output: ansi: diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 0c73ed617..55b28ea20 100755 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -9,6 +9,9 @@ server: servlet: session: timeout: 86400s + compression: + enabled: true + mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain spring: devtools: add-properties: false