From c643e204f80f0b9118c6ff6eff0196c9f805c692 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Sat, 30 Nov 2019 21:10:42 +0800 Subject: [PATCH 1/3] feat: add treeByTeam tag for menu. --- .../core/freemarker/tag/MenuTagDirective.java | 4 ++++ .../java/run/halo/app/service/MenuService.java | 11 ++++++++++- .../halo/app/service/impl/MenuServiceImpl.java | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/main/java/run/halo/app/core/freemarker/tag/MenuTagDirective.java b/src/main/java/run/halo/app/core/freemarker/tag/MenuTagDirective.java index 2b9823169..806c53471 100644 --- a/src/main/java/run/halo/app/core/freemarker/tag/MenuTagDirective.java +++ b/src/main/java/run/halo/app/core/freemarker/tag/MenuTagDirective.java @@ -50,6 +50,10 @@ public class MenuTagDirective implements TemplateDirectiveModel { String team = params.get("team").toString(); env.setVariable("menus", builder.build().wrap(menuService.listByTeam(team, Sort.by(DESC, "priority")))); break; + case "treeByTeam": + String treeTeam = params.get("team").toString(); + env.setVariable("menus", builder.build().wrap(menuService.listByTeamAsTree(treeTeam, Sort.by(DESC, "priority")))); + break; case "count": env.setVariable("count", builder.build().wrap(menuService.count())); break; diff --git a/src/main/java/run/halo/app/service/MenuService.java b/src/main/java/run/halo/app/service/MenuService.java index 672b5ef31..e7d2942fc 100644 --- a/src/main/java/run/halo/app/service/MenuService.java +++ b/src/main/java/run/halo/app/service/MenuService.java @@ -47,6 +47,15 @@ public interface MenuService extends CrudService { */ List listByTeam(@NonNull String team, Sort sort); + /** + * List menus by team as tree. + * + * @param team team + * @param sort sort + * @return list of tree menus + */ + List listByTeamAsTree(@NonNull String team, Sort sort); + /** * Creates a menu. * @@ -62,7 +71,7 @@ public interface MenuService extends CrudService { * @param sort sort info must not be null * @return a menu tree */ - List listAsTree(Sort sort); + List listAsTree(@NonNull Sort sort); /** * Lists menu by parent id. diff --git a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java index 52ee0251c..644cf2a89 100644 --- a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java @@ -77,6 +77,24 @@ public class MenuServiceImpl extends AbstractCrudService implemen return menus.stream().map(menu -> (MenuDTO) new MenuDTO().convertFrom(menu)).collect(Collectors.toList()); } + @Override + public List listByTeamAsTree(String team, Sort sort) { + Assert.notNull(team, "Team must not be null"); + + List menus = menuRepository.findByTeam(team, sort); + + if (CollectionUtils.isEmpty(menus)) { + return Collections.emptyList(); + } + + MenuVO topLevelMenu = createTopLevelMenu(); + + concreteTree(topLevelMenu, menus); + + List children = topLevelMenu.getChildren(); + return children; + } + @Override public Menu createBy(MenuParam menuParam) { Assert.notNull(menuParam, "Menu param must not be null"); From 0c1b32e77668252071318647a25ae2ddc879475b Mon Sep 17 00:00:00 2001 From: johnniang Date: Sat, 30 Nov 2019 23:23:06 +0800 Subject: [PATCH 2/3] Remove redundant code of http servlet request fetching globally --- src/main/java/run/halo/app/utils/HaloUtils.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main/java/run/halo/app/utils/HaloUtils.java b/src/main/java/run/halo/app/utils/HaloUtils.java index e14641894..da4cd20fe 100755 --- a/src/main/java/run/halo/app/utils/HaloUtils.java +++ b/src/main/java/run/halo/app/utils/HaloUtils.java @@ -30,17 +30,6 @@ public class HaloUtils { public static final String URL_SEPARATOR = "/"; - /** - * Gets current http servlet request. - * - * @return current http servlet request - */ - @NonNull - public static HttpServletRequest getHttpServletRequest() { - return ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())) - .getRequest(); - } - @NonNull public static String ensureBoth(@NonNull String string, @NonNull String bothfix) { return ensureBoth(string, bothfix, bothfix); From 6214f140d8603318a58bdc31bfbac74d9c5ca171 Mon Sep 17 00:00:00 2001 From: johnniang Date: Sat, 30 Nov 2019 23:49:51 +0800 Subject: [PATCH 3/3] Correct third person call --- .../resources/templates/common/mail_template/mail_notice.ftl | 2 +- .../resources/templates/common/mail_template/mail_reply.ftl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/templates/common/mail_template/mail_notice.ftl b/src/main/resources/templates/common/mail_template/mail_notice.ftl index fddd2137f..f3e94cece 100644 --- a/src/main/resources/templates/common/mail_template/mail_notice.ftl +++ b/src/main/resources/templates/common/mail_template/mail_notice.ftl @@ -12,7 +12,7 @@ ${author!}：${content!}


-

你可以点击查看完整内容

+

您可以点击查看完整内容

diff --git a/src/main/resources/templates/common/mail_template/mail_reply.ftl b/src/main/resources/templates/common/mail_template/mail_reply.ftl index 145751bcb..ce09cac9e 100644 --- a/src/main/resources/templates/common/mail_template/mail_reply.ftl +++ b/src/main/resources/templates/common/mail_template/mail_reply.ftl @@ -10,10 +10,10 @@

您在《${page!}》的留言:

${baseContent!}

-

${replyAuthor!} 给你的回复: +

${replyAuthor!} 给您的回复:

${replyContent!}

-

你可以点击 +

您可以点击 查看完整内容

欢迎再度光临