From cac15204064ad916e9a07a28a66910dc9b734cd3 Mon Sep 17 00:00:00 2001 From: RYAN0UP_ Date: Wed, 28 Mar 2018 21:58:29 +0800 Subject: [PATCH] =?UTF-8?q?:alien:=20=E6=88=91=E4=B9=9F=E4=B8=8D=E7=9F=A5?= =?UTF-8?q?=E9=81=93=E6=94=B9=E4=BA=86=E5=95=A5:(?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/InstallController.java | 24 +++- .../web/controller/admin/MenuController.java | 16 +++ .../web/controller/admin/PageController.java | 4 +- .../resources/templates/admin/admin_menu.ftl | 29 +++- .../{admin_link.ftl => admin_page_link.ftl} | 0 .../resources/templates/admin/admin_tag.ftl | 130 ++++++++++++++---- 6 files changed, 169 insertions(+), 34 deletions(-) rename src/main/resources/templates/admin/{admin_link.ftl => admin_page_link.ftl} (100%) diff --git a/src/main/java/cc/ryanc/halo/web/controller/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/InstallController.java index 7ffb22620..5a5147484 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/InstallController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/InstallController.java @@ -48,6 +48,9 @@ public class InstallController { @Autowired private CommentService commentService; + @Autowired + private MenuService menuService; + /** * 渲染安装页面 * @@ -92,9 +95,6 @@ public class InstallController { }else{ installFile.createNewFile(); } - //保存title设置 - optionsService.saveOption("site_title",siteTitle); - optionsService.saveOption("site_url",siteUrl); //创建新的用户 User user= new User(); @@ -144,6 +144,10 @@ public class InstallController { comment.setIsAdmin(0); commentService.saveByComment(comment); + //保存博客标题和博客地址设置 + optionsService.saveOption("site_title",siteTitle); + optionsService.saveOption("site_url",siteUrl); + //设置默认主题 optionsService.saveOption("theme","halo"); @@ -171,6 +175,20 @@ public class InstallController { ) ); + Menu menuIndex = new Menu(); + menuIndex.setMenuName("首页"); + menuIndex.setMenuUrl("/"); + menuIndex.setMenuSort(1); + menuIndex.setMenuIcon(""); + menuService.saveByMenu(menuIndex); + + Menu menuArchive = new Menu(); + menuArchive.setMenuName("归档"); + menuArchive.setMenuUrl("/archives"); + menuArchive.setMenuSort(2); + menuArchive.setMenuIcon(""); + menuService.saveByMenu(menuArchive); + HaloConst.OPTIONS.clear(); HaloConst.OPTIONS = optionsService.findAllOptions(); }catch (Exception e){ diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java index 1a61e05ac..62f30e58d 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; +import javax.websocket.server.PathParam; import java.util.List; /** @@ -74,4 +75,19 @@ public class MenuController { model.addAttribute("options", HaloConst.OPTIONS); return "/admin/admin_menu"; } + + /** + * 删除菜单 + * @param menuId menuId + * @return String + */ + @GetMapping(value = "/remove") + public String removeMenu(@PathParam("menuId") Long menuId){ + try { + menuService.removeByMenuId(menuId); + }catch (Exception e){ + log.error("删除菜单失败：{0}",e.getMessage()); + } + return "redirect:/admin/menus"; + } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java index 4dc6273f5..c905cc29c 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java @@ -56,7 +56,7 @@ public class PageController { //设置选项 model.addAttribute("options", HaloConst.OPTIONS); - return "admin/admin_link"; + return "admin/admin_page_link"; } /** @@ -75,7 +75,7 @@ public class PageController { model.addAttribute("links",links); //设置选项 model.addAttribute("options",HaloConst.OPTIONS); - return "admin/admin_link"; + return "admin/admin_page_link"; } /** diff --git a/src/main/resources/templates/admin/admin_menu.ftl b/src/main/resources/templates/admin/admin_menu.ftl index 3202b2062..12372e6a6 100644 --- a/src/main/resources/templates/admin/admin_menu.ftl +++ b/src/main/resources/templates/admin/admin_menu.ftl @@ -105,7 +105,7 @@ <#else> 修改 - + @@ -116,6 +116,33 @@ + + + <#include "module/_footer.ftl"> diff --git a/src/main/resources/templates/admin/admin_link.ftl b/src/main/resources/templates/admin/admin_page_link.ftl similarity index 100% rename from src/main/resources/templates/admin/admin_link.ftl rename to src/main/resources/templates/admin/admin_page_link.ftl diff --git a/src/main/resources/templates/admin/admin_tag.ftl b/src/main/resources/templates/admin/admin_tag.ftl index a4d92f8be..d9debfaf7 100755 --- a/src/main/resources/templates/admin/admin_tag.ftl +++ b/src/main/resources/templates/admin/admin_tag.ftl @@ -9,6 +9,64 @@ <#include "module/_sidebar.ftl">
+

标签 @@ -76,40 +134,56 @@

所有标签

- - - - - - - - - - - <#list tags as tag> - - - - - - - - -
名称路径总数操作
${tag.tagName}${tag.tagUrl}2 - <#if updateTag ?? && tag.tagId==updateTag.tagId> - 正在修改 - <#else > - 修改 - - -
+ <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#--<#list tags as tag>--> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#----> + <#--
名称路径总数操作
${tag.tagName}${tag.tagUrl}2--> + <#--<#if updateTag ?? && tag.tagId==updateTag.tagId>--> + <#--正在修改--> + <#--<#else >--> + <#--修改--> + <#----> + <#----> + <#--
--> + <#list tags as tag> +
+ + ${tag.tagName}(2) + +
+ +
-