From 73ef224233e00a6e3a91149638e9fcb8aaecc976 Mon Sep 17 00:00:00 2001 From: RYAN0UP_ Date: Wed, 28 Mar 2018 11:48:14 +0800 Subject: [PATCH] =?UTF-8?q?:alien:=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/ryanc/halo/service/LinkService.java | 10 +-- .../cc/ryanc/halo/service/TagService.java | 10 +-- .../halo/service/impl/LinkServiceImpl.java | 15 +--- .../halo/service/impl/TagServiceImpl.java | 13 +-- .../web/controller/admin/PageController.java | 29 ++---- .../web/controller/admin/TagController.java | 41 +++------ .../templates/admin/admin_link-update.ftl | 86 ------------------ .../resources/templates/admin/admin_link.ftl | 89 +++++++++++++------ .../resources/templates/admin/admin_page.ftl | 6 +- .../templates/admin/admin_tag-update.ftl | 73 --------------- .../resources/templates/admin/admin_tag.ftl | 61 +++++++++---- 11 files changed, 129 insertions(+), 304 deletions(-) delete mode 100755 src/main/resources/templates/admin/admin_link-update.ftl delete mode 100755 src/main/resources/templates/admin/admin_tag-update.ftl diff --git a/src/main/java/cc/ryanc/halo/service/LinkService.java b/src/main/java/cc/ryanc/halo/service/LinkService.java index 124c69e7c..64ea78602 100755 --- a/src/main/java/cc/ryanc/halo/service/LinkService.java +++ b/src/main/java/cc/ryanc/halo/service/LinkService.java @@ -14,7 +14,7 @@ import java.util.Optional; public interface LinkService { /** - * 新增友情链接 + * 新增/修改友情链接 * * @param link link * @return Link @@ -29,14 +29,6 @@ public interface LinkService { */ Link removeByLinkId(Long linkId); - /** - * 修改 - * - * @param link link - * @return Link - */ - Link updateByLink(Link link); - /** * 查询所有 * diff --git a/src/main/java/cc/ryanc/halo/service/TagService.java b/src/main/java/cc/ryanc/halo/service/TagService.java index cbe857c1c..4da7a2b7d 100644 --- a/src/main/java/cc/ryanc/halo/service/TagService.java +++ b/src/main/java/cc/ryanc/halo/service/TagService.java @@ -14,7 +14,7 @@ import java.util.Optional; public interface TagService { /** - * 新增标签 + * 新增/修改标签 * * @param tag tag * @return Tag @@ -29,14 +29,6 @@ public interface TagService { */ Tag removeByTagId(Long tagId); - /** - * 更新标签 - * - * @param tag tag - * @return tag - */ - Tag updateByTag(Tag tag); - /** * 获取所有标签 * diff --git a/src/main/java/cc/ryanc/halo/service/impl/LinkServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/LinkServiceImpl.java index 3828f15d4..4da55a880 100755 --- a/src/main/java/cc/ryanc/halo/service/impl/LinkServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/LinkServiceImpl.java @@ -29,7 +29,7 @@ public class LinkServiceImpl implements LinkService { private static final String LINK_CACHE_NAME = "link_cache"; /** - * 保存友情链接 清除缓存 + * 新增/修改友情链接 清除缓存 * * @param link link * @return Link @@ -54,19 +54,6 @@ public class LinkServiceImpl implements LinkService { return link.get(); } - /** - * 修改友情链接 清除缓存 - * - * @param link link - * @return Link - */ - @CachePut(value = LINK_CACHE_NAME,key = "#link.linkId+'link'") - @CacheEvict(value = LINK_CACHE_NAME,key = LINK_KEY) - @Override - public Link updateByLink(Link link) { - return linkRepository.save(link); - } - /** * 查询所有友情链接 缓存 * diff --git a/src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java index 6648dca2f..4ab7e89cb 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java @@ -26,7 +26,7 @@ public class TagServiceImpl implements TagService { private static final String CATEGORY_CACHE_NAME = "cateCache"; /** - * 新增标签 + * 新增/修改标签 * * @param tag tag * @return Tag @@ -49,17 +49,6 @@ public class TagServiceImpl implements TagService { return tag.get(); } - /** - * 更新标签 - * - * @param tag tag - * @return tag - */ - @Override - public Tag updateByTag(Tag tag) { - return tagRepository.save(tag); - } - /** * 获取所有标签 * 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 df1672aa7..4dc6273f5 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 @@ -52,6 +52,7 @@ public class PageController { public String links(Model model){ List links = linkService.findAllLinks(); model.addAttribute("links",links); + model.addAttribute("statusName","添加"); //设置选项 model.addAttribute("options", HaloConst.OPTIONS); @@ -67,16 +68,18 @@ public class PageController { */ @GetMapping("/links/edit") public String toEditLink(Model model,@PathParam("linkId") Long linkId){ + List links = linkService.findAllLinks(); Optional link = linkService.findByLinkId(linkId); - model.addAttribute("link",link.get()); - + model.addAttribute("updateLink",link.get()); + model.addAttribute("statusName","修改"); + model.addAttribute("links",links); //设置选项 model.addAttribute("options",HaloConst.OPTIONS); - return "admin/admin_link-update"; + return "admin/admin_link"; } /** - * 处理添加友链的请求并渲染页面 + * 处理添加/修改友链的请求并渲染页面 * * @param link Link * @return freemarker @@ -109,24 +112,6 @@ public class PageController { return "redirect:/admin/page/links"; } - /** - * 处理修改的请求并重定向 - * - * @param link Link - * @return freemarker - */ - @PostMapping(value = "/links/update") - public String updateLink(@ModelAttribute Link link){ - try { - Optional beforeLink = linkService.findByLinkId(link.getLinkId()); - linkService.updateByLink(link); - log.info("修改友情链接页面：修改之前的数据："+beforeLink.get()+"，修改之后的数据："+link); - }catch (Exception e){ - log.error("未知错误："+e.getMessage()); - } - return "redirect:/admin/page/links"; - } - /** * 图库管理 * diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java index dcb72a5b4..1e9f48afa 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java @@ -37,13 +37,14 @@ public class TagController { public String tags(Model model){ List tags = tagService.findAllTags(); model.addAttribute("tags",tags); + model.addAttribute("statusName","新增"); //设置选项 model.addAttribute("options",HaloConst.OPTIONS); return "admin/admin_tag"; } /** - * 新增标签 + * 新增/修改标签 * * @param tag tag * @return string @@ -51,8 +52,7 @@ public class TagController { @PostMapping(value = "/save") public String saveTag(@ModelAttribute Tag tag){ try{ - Tag backTag = tagService.saveByTag(tag); - log.info("新添加的标签为："+backTag); + tagService.saveByTag(tag); }catch (Exception e){ log.error("未知错误："+e.getMessage()); } @@ -102,33 +102,12 @@ public class TagController { */ @GetMapping(value = "/edit") public String toEditTag(Model model,@PathParam("tagId") Long tagId){ - try{ - Optional tag = tagService.findByTagId(tagId); - model.addAttribute("tag",tag.get()); - //设置选项 - model.addAttribute("options",HaloConst.OPTIONS); - log.info("tagId为"+tagId+"的数据为："+tag.get()); - }catch (Exception e){ - log.error("未知错误："+e.getMessage()); - } - return "admin/admin_tag-update"; - } - - /** - * 处理修改标签的请求 - * - * @param tag tag - * @return string - */ - @PostMapping(value = "/update") - public String updateTag(@ModelAttribute Tag tag){ - try { - Optional beforeTag = tagService.findByTagId(tag.getTagId()); - log.info("修改之前的数据："+beforeTag.get()+"，修改之后的数据："+tag); - tagService.updateByTag(tag); - }catch (Exception e){ - log.error("未知错误："+e.getMessage()); - } - return "redirect:/admin/tag"; + List tags = tagService.findAllTags(); + Tag tag = tagService.findByTagId(tagId).get(); + model.addAttribute("statusName","修改"); + model.addAttribute("updateTag",tag); + model.addAttribute("tags",tags); + model.addAttribute("options",HaloConst.OPTIONS); + return "admin/admin_tag"; } } diff --git a/src/main/resources/templates/admin/admin_link-update.ftl b/src/main/resources/templates/admin/admin_link-update.ftl deleted file mode 100755 index 650b8ef35..000000000 --- a/src/main/resources/templates/admin/admin_link-update.ftl +++ /dev/null @@ -1,86 +0,0 @@ -<#compress > -<#include "module/_macro.ftl"> -<@head title="Halo后台管理-友情链接修改"> - -
- - <#include "module/_header.ftl"> - - <#include "module/_sidebar.ftl"> -
- - -
-

友情链接 -

-
    -
  1. 首页
    2. -
  2. 页面
    3. -
  3. 友情链接
    4. -
  4. 修改
    5. -
-
-
-
-
-
-

修改友情链接

-
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-
-
-
-
- - -
- <#include "module/_footer.ftl"> -
-<@footer> - \ No newline at end of file diff --git a/src/main/resources/templates/admin/admin_link.ftl b/src/main/resources/templates/admin/admin_link.ftl index 97a0752ca..4ccd9a1f5 100755 --- a/src/main/resources/templates/admin/admin_link.ftl +++ b/src/main/resources/templates/admin/admin_link.ftl @@ -10,7 +10,7 @@
-

友情链接#

+

友情链接

  1. 首页
  2. 页面
    3. @@ -21,32 +21,61 @@
    -

    添加友情链接

    -
    -
    -
    - - - 好友的网站名称 +

    ${statusName}友情链接

    + <#if updateLink??> + + +
    +
    + + + 好友的网站名称 +
    +
    + + + *需要加上http://或https:// +
    +
    + + + *LOGO链接地址，需要加上http://或https://，在部分主题可显示 +
    +
    + + + *网站的描述，部分主题可显示 +
    -
    - - - *需要加上http://或https:// +
    + + <#else> +
    +
    +
    + + + 好友的网站名称 +
    +
    + + + *需要加上http://或https:// +
    +
    + + + *LOGO链接地址，需要加上http://或https://，在部分主题可显示 +
    +
    + + + *网站的描述，部分主题可显示 +
    -
    - - - *LOGO链接地址，需要加上http://或https://，在部分主题可显示 -
    -
    - - - *网站的描述，部分主题可显示 -
    -
    -
    - +
    + +
    @@ -63,8 +92,14 @@ ${link.linkName} ${link.linkUrl} ${link.linkDesc} - 修改 - - -
    - -
    -
    -
    -
- - -
- <#include "module/_footer.ftl"> - -<@footer> - \ No newline at end of file diff --git a/src/main/resources/templates/admin/admin_tag.ftl b/src/main/resources/templates/admin/admin_tag.ftl index 39e8d85aa..a4d92f8be 100755 --- a/src/main/resources/templates/admin/admin_tag.ftl +++ b/src/main/resources/templates/admin/admin_tag.ftl @@ -28,25 +28,46 @@
-

添加新标签

+

${statusName}标签<#if tag??>[${updateTag.tagName}]

-
-
-
- - - 页面上所显示的名称 + <#if updateTag??> + + +
+
+ + + 页面上所显示的名称 +
+
+ + + *这是文章路径上显示的名称，最好为英文 +
-
- - - *这是文章路径上显示的名称，最好为英文 +
+
-
-
- -
- + + <#else > +
+
+
+ + + 页面上所显示的名称 +
+
+ + + *这是文章路径上显示的名称，最好为英文 +
+
+
+ +
+
+
@@ -71,8 +92,12 @@ ${tag.tagUrl} 2 - 修改 - + <#if updateTag ?? && tag.tagId==updateTag.tagId> + 正在修改 + <#else > + 修改 + +