github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

👽 修改新增和修改的逻辑，简化代码:)

pull/1/head
RYAN0UP_ 2018-03-28 11:48:14 +08:00
parent a94099dd48
commit 73ef224233
11 changed files with 129 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cc/ryanc/halo/service/LinkService.java
View File

@ -14,7 +14,7 @@ import java.util.Optional;
public interface LinkService { public interface LinkService {
/** /**
* 新增友情链接 * 新增/修改友情链接
* *
* @param link link * @param link link
* @return Link * @return Link
@ -29,14 +29,6 @@ public interface LinkService {
*/ */
Link removeByLinkId(Long linkId); Link removeByLinkId(Long linkId);
/**
* 修改
*
* @param link link
* @return Link
*/
Link updateByLink(Link link);
/** /**
* 查询所有 * 查询所有
* *

10
src/main/java/cc/ryanc/halo/service/TagService.java
View File

@ -14,7 +14,7 @@ import java.util.Optional;
public interface TagService { public interface TagService {
/** /**
* 新增标签 * 新增/修改标签
* *
* @param tag tag * @param tag tag
* @return Tag * @return Tag
@ -29,14 +29,6 @@ public interface TagService {
*/ */
Tag removeByTagId(Long tagId); Tag removeByTagId(Long tagId);
/**
* 更新标签
*
* @param tag tag
* @return tag
*/
Tag updateByTag(Tag tag);
/** /**
* 获取所有标签 * 获取所有标签
* *

15
src/main/java/cc/ryanc/halo/service/impl/LinkServiceImpl.java
View File

@ -29,7 +29,7 @@ public class LinkServiceImpl implements LinkService {
private static final String LINK_CACHE_NAME = "link_cache"; private static final String LINK_CACHE_NAME = "link_cache";
/** /**
* 保存友情链接 清除缓存 * 新增/修改友情链接 清除缓存
* *
* @param link link * @param link link
* @return Link * @return Link
@ -54,19 +54,6 @@ public class LinkServiceImpl implements LinkService {
return link.get(); 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);
}
/** /**
* 查询所有友情链接 缓存 * 查询所有友情链接 缓存
* *

13
src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java
View File

@ -26,7 +26,7 @@ public class TagServiceImpl implements TagService {
private static final String CATEGORY_CACHE_NAME = "cateCache"; private static final String CATEGORY_CACHE_NAME = "cateCache";
/** /**
* 新增标签 * 新增/修改标签
* *
* @param tag tag * @param tag tag
* @return Tag * @return Tag
@ -49,17 +49,6 @@ public class TagServiceImpl implements TagService {
return tag.get(); return tag.get();
} }
/**
* 更新标签
*
* @param tag tag
* @return tag
*/
@Override
public Tag updateByTag(Tag tag) {
return tagRepository.save(tag);
}
/** /**
* 获取所有标签 * 获取所有标签
* *

29
src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
View File

@ -52,6 +52,7 @@ public class PageController {
public String links(Model model){ public String links(Model model){
List<Link> links = linkService.findAllLinks(); List<Link> links = linkService.findAllLinks();
model.addAttribute("links",links); model.addAttribute("links",links);
model.addAttribute("statusName","添加");
//设置选项 //设置选项
model.addAttribute("options", HaloConst.OPTIONS); model.addAttribute("options", HaloConst.OPTIONS);
@ -67,16 +68,18 @@ public class PageController {
*/ */
@GetMapping("/links/edit") @GetMapping("/links/edit")
public String toEditLink(Model model,@PathParam("linkId") Long linkId){ public String toEditLink(Model model,@PathParam("linkId") Long linkId){
List<Link> links = linkService.findAllLinks();
Optional<Link> link = linkService.findByLinkId(linkId); Optional<Link> 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); model.addAttribute("options",HaloConst.OPTIONS);
return "admin/admin_link-update"; return "admin/admin_link";
} }
/** /**
* 处理添加友链的请求并渲染页面 * 处理添加/修改友链的请求并渲染页面
* *
* @param link Link * @param link Link
* @return freemarker * @return freemarker
@ -109,24 +112,6 @@ public class PageController {
return "redirect:/admin/page/links"; return "redirect:/admin/page/links";
} }
/**
* 处理修改的请求并重定向
*
* @param link Link
* @return freemarker
*/
@PostMapping(value = "/links/update")
public String updateLink(@ModelAttribute Link link){
try {
Optional<Link> 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";
}
/** /**
* 图库管理 * 图库管理
* *

41
src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
View File

@ -37,13 +37,14 @@ public class TagController {
public String tags(Model model){ public String tags(Model model){
List<Tag> tags = tagService.findAllTags(); List<Tag> tags = tagService.findAllTags();
model.addAttribute("tags",tags); model.addAttribute("tags",tags);
model.addAttribute("statusName","新增");
//设置选项 //设置选项
model.addAttribute("options",HaloConst.OPTIONS); model.addAttribute("options",HaloConst.OPTIONS);
return "admin/admin_tag"; return "admin/admin_tag";
} }
/** /**
* 新增标签 * 新增/修改标签
* *
* @param tag tag * @param tag tag
* @return string * @return string
@ -51,8 +52,7 @@ public class TagController {
@PostMapping(value = "/save") @PostMapping(value = "/save")
public String saveTag(@ModelAttribute Tag tag){ public String saveTag(@ModelAttribute Tag tag){
try{ try{
Tag backTag = tagService.saveByTag(tag); tagService.saveByTag(tag);
log.info("新添加的标签为："+backTag);
}catch (Exception e){ }catch (Exception e){
log.error("未知错误："+e.getMessage()); log.error("未知错误："+e.getMessage());
} }
@ -102,33 +102,12 @@ public class TagController {
*/ */
@GetMapping(value = "/edit") @GetMapping(value = "/edit")
public String toEditTag(Model model,@PathParam("tagId") Long tagId){ public String toEditTag(Model model,@PathParam("tagId") Long tagId){
try{ List<Tag> tags = tagService.findAllTags();
Optional<Tag> tag = tagService.findByTagId(tagId); Tag tag = tagService.findByTagId(tagId).get();
model.addAttribute("tag",tag.get()); model.addAttribute("statusName","修改");
//设置选项 model.addAttribute("updateTag",tag);
model.addAttribute("options",HaloConst.OPTIONS); model.addAttribute("tags",tags);
log.info("tagId为"+tagId+"的数据为："+tag.get()); model.addAttribute("options",HaloConst.OPTIONS);
}catch (Exception e){ return "admin/admin_tag";
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<Tag> beforeTag = tagService.findByTagId(tag.getTagId());
log.info("修改之前的数据："+beforeTag.get()+"，修改之后的数据："+tag);
tagService.updateByTag(tag);
}catch (Exception e){
log.error("未知错误："+e.getMessage());
}
return "redirect:/admin/tag";
} }
} }

86
src/main/resources/templates/admin/admin_link-update.ftl
View File

@ -1,86 +0,0 @@
<#compress >
<#include "module/_macro.ftl">
<@head title="Halo后台管理-友情链接修改">
</@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">
<!-- 菜单栏模块 -->
<#include "module/_sidebar.ftl">
<div class="content-wrapper">
<link rel="stylesheet" href="/static/plugins/toast/css/jquery.toast.min.css">
<style type="text/css" rel="stylesheet">
.form-horizontal .control-label{
text-align: left;
}
</style>
<section class="content-header">
<h1>友情链接<small></small>
</h1>
<ol class="breadcrumb">
<li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li>
<li><a data-pjax="true" href="/admin/page">页面</a></li>
<li><a data-pjax="true" href="/admin/page/links">友情链接</a></li>
<li class="active">修改</li>
</ol>
</section>
<section class="content container-fluid">
<div class="row">
<div class="col-md-6">
<div class="box box-solid">
<div class="box-header with-border"><h3 class="box-title">修改友情链接</h3></div>
<form action="/admin/page/links/update" method="post" class="form-horizontal" onsubmit="return isNull()">
<input type="hidden" name="linkId" value="${link.linkId}">
<div class="box-body">
<div class="form-group">
<label for="cateName" class="col-sm-3 control-label">网站名称：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="linkName" name="linkName" value="${link.linkName}">
</div>
</div>
<div class="form-group">
<label for="cateUrl" class="col-sm-3 control-label">网址：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="linkUrl" name="linkUrl" value="${link.linkUrl}">
</div>
</div>
<div class="form-group">
<label for="cateUrl" class="col-sm-3 control-label">LOGO：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="linkPic" name="linkPic" value="${link.linkPic}">
</div>
</div>
<div class="form-group">
<label for="cateDesc" class="col-sm-3 control-label">描述：</label>
<div class="col-sm-9">
<textarea class="form-control" rows="3" id="linkDesc" name="linkDesc" style="resize: none">${link.linkDesc}</textarea>
</div>
</div>
</div>
<div class="box-footer">
<button class="btn btn-default" onclick="window.history.back()">返回</button>
<button type="submit" class="btn btn-primary pull-right">保存</button>
</div>
</form>
</div>
</div>
</div>
</section>
<script src="/static/plugins/toast/js/jquery.toast.min.js"></script>
<script>
function isNull() {
var name = $('#linkName').val();
var url = $('#linkUrl').val();
var pic = $('#linkPic').val();
var desc = $('#linkDesc').val();
if(name==""||url==""||pic==""){
showMsg("请输入完整信息！","info",2000);
return false;
}
}
</script>
</div>
<#include "module/_footer.ftl">
</div>
<@footer></@footer>
</#compress>

89
src/main/resources/templates/admin/admin_link.ftl
View File

@ -10,7 +10,7 @@
<div class="content-wrapper"> <div class="content-wrapper">
<link rel="stylesheet" href="/static/plugins/toast/css/jquery.toast.min.css"> <link rel="stylesheet" href="/static/plugins/toast/css/jquery.toast.min.css">
<section class="content-header"> <section class="content-header">
<h1>友情链接<small>#</small></h1> <h1>友情链接<small></small></h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i>首页</a></li> <li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i>首页</a></li>
<li><a data-pjax="true" href="/admin/page">页面</a></li> <li><a data-pjax="true" href="/admin/page">页面</a></li>
@ -21,32 +21,61 @@
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-5">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"><h3 class="box-title">添加友情链接</h3></div> <div class="box-header with-border"><h3 class="box-title">${statusName}友情链接</h3></div>
<form action="/admin/page/links/save" method="post" role="form" onsubmit="return isNull()"> <#if updateLink??>
<div class="box-body"> <form action="/admin/page/links/save" method="post" role="form" onsubmit="return isNull()">
<div class="form-group"> <input type="hidden" name="linkId" value="${updateLink.linkId}">
<label for="exampleInputEmail1">网站名称</label> <div class="box-body">
<input type="text" class="form-control" id="linkName" name="linkName" placeholder=""> <div class="form-group">
<small>好友的网站名称</small> <label for="exampleInputEmail1">网站名称</label>
<input type="text" class="form-control" id="linkName" name="linkName" value="${updateLink.linkName}">
<small>好友的网站名称</small>
</div>
<div class="form-group">
<label for="exampleInputPassword1">网址</label>
<input type="text" class="form-control" id="linkUrl" name="linkUrl" value="${updateLink.linkUrl}">
<small>*需要加上http://或https://</small>
</div>
<div class="form-group">
<label for="exampleInputPassword1">LOGO</label>
<input type="text" class="form-control" id="linkPic" name="linkPic" value="${updateLink.linkPic}">
<small>*LOGO链接地址，需要加上http://或https://，在部分主题可显示</small>
</div>
<div class="form-group">
<label for="exampleInputPassword1">描述</label>
<textarea class="form-control" rows="3" id="linkDesc" name="linkDesc" style="resize: none">${updateLink.linkDesc}</textarea>
<small>*网站的描述，部分主题可显示</small>
</div>
</div> </div>
<div class="form-group"> <div class="box-footer"><button type="submit" class="btn btn-primary">确定${statusName}</button></div>
<label for="exampleInputPassword1">网址</label> </form>
<input type="text" class="form-control" id="linkUrl" name="linkUrl" placeholder=""> <#else>
<small>*需要加上http://或https://</small> <form action="/admin/page/links/save" method="post" role="form" onsubmit="return isNull()">
<div class="box-body">
<div class="form-group">
<label for="exampleInputEmail1">网站名称</label>
<input type="text" class="form-control" id="linkName" name="linkName" placeholder="">
<small>好友的网站名称</small>
</div>
<div class="form-group">
<label for="exampleInputPassword1">网址</label>
<input type="text" class="form-control" id="linkUrl" name="linkUrl" placeholder="">
<small>*需要加上http://或https://</small>
</div>
<div class="form-group">
<label for="exampleInputPassword1">LOGO</label>
<input type="text" class="form-control" id="linkPic" name="linkPic" placeholder="">
<small>*LOGO链接地址，需要加上http://或https://，在部分主题可显示</small>
</div>
<div class="form-group">
<label for="exampleInputPassword1">描述</label>
<textarea class="form-control" rows="3" id="linkDesc" name="linkDesc" style="resize: none"></textarea>
<small>*网站的描述，部分主题可显示</small>
</div>
</div> </div>
<div class="form-group"> <div class="box-footer"><button type="submit" class="btn btn-primary">确定${statusName}</button></div>
<label for="exampleInputPassword1">LOGO</label> </form>
<input type="text" class="form-control" id="linkPic" name="linkPic" placeholder=""> </#if>
<small>*LOGO链接地址，需要加上http://或https://，在部分主题可显示</small>
</div>
<div class="form-group">
<label for="exampleInputPassword1">描述</label>
<textarea class="form-control" rows="3" id="linkDesc" name="linkDesc" style="resize: none"></textarea>
<small>*网站的描述，部分主题可显示</small>
</div>
</div>
<div class="box-footer"><button type="submit" class="btn btn-primary">确定添加</button></div>
</form>
</div> </div>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
@ -63,8 +92,14 @@
<td>${link.linkName}</td> <td>${link.linkName}</td>
<td>${link.linkUrl}</td> <td>${link.linkUrl}</td>
<td>${link.linkDesc}</td> <td>${link.linkDesc}</td>
<td><a class="btn btn-primary btn-xs" href="/admin/page/links/edit?linkId=${link.linkId}">修改</a> <td>
<button class="btn btn-danger btn-xs" onclick="modelShow('/admin/page/links/remove?linkId=${link.linkId}')">删除</></td> <#if updateLink?? && updateLink.linkId==link.linkId>
<a class="btn btn-primary btn-xs" href="#" disabled>正在修改</a>
<#else >
<a data-pjax="true" class="btn btn-primary btn-xs" href="/admin/page/links/edit?linkId=${link.linkId}">修改</a>
</#if>
<button class="btn btn-danger btn-xs" onclick="modelShow('/admin/page/links/remove?linkId=${link.linkId}')">删除</>
</td>
</tr> </tr>
</#list> </#list>
</tbody> </tbody>

6
src/main/resources/templates/admin/admin_page.ftl
View File

@ -54,7 +54,7 @@
<td>/links</td> <td>/links</td>
<td> <td>
<a href="/links" class="btn btn-info btn-sm btn-flat" target="_blank">预览</a> <a href="/links" class="btn btn-info btn-sm btn-flat" target="_blank">预览</a>
<a href="/admin/page/links" class="btn btn-primary btn-sm btn-flat">配置</a> <a data-pjax="true" href="/admin/page/links" class="btn btn-primary btn-sm btn-flat">配置</a>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -62,7 +62,7 @@
<td>/about</td> <td>/about</td>
<td> <td>
<a href="/gallery" class="btn btn-info btn-sm btn-flat" target="_blank">预览</a> <a href="/gallery" class="btn btn-info btn-sm btn-flat" target="_blank">预览</a>
<a href="/admin/page/gallery" class="btn btn-primary btn-sm btn-flat">配置</a> <a data-pjax="true" href="/admin/page/gallery" class="btn btn-primary btn-sm btn-flat">配置</a>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -70,7 +70,7 @@
<td>/about</td> <td>/about</td>
<td> <td>
<a href="/about" class="btn btn-info btn-sm btn-flat" target="_blank">预览</a> <a href="/about" class="btn btn-info btn-sm btn-flat" target="_blank">预览</a>
<a href="/admin/page/about" class="btn btn-primary btn-sm btn-flat">配置</a> <a data-pjax="true" href="/admin/page/about" class="btn btn-primary btn-sm btn-flat">配置</a>
</td> </td>
</tr> </tr>
</tbody> </tbody>

73
src/main/resources/templates/admin/admin_tag-update.ftl
View File

@ -1,73 +0,0 @@
<#compress >
<#include "module/_macro.ftl">
<@head title="Halo后台管理-修改标签">
</@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">
<!-- 菜单栏模块 -->
<#include "module/_sidebar.ftl">
<div class="content-wrapper">
<link rel="stylesheet" href="/static/plugins/toast/css/jquery.toast.min.css">
<style type="text/css" rel="stylesheet">
.form-horizontal .control-label{
text-align: left;
}
</style>
<section class="content-header">
<h1>标签<small></small>
</h1>
<ol class="breadcrumb">
<li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li>
<li><a data-pjax="true" href="/admin/category"><i class="fa fa-dashboard"></i> 标签</a></li>
<li class="active">修改</li>
</ol>
</section>
<section class="content container-fluid">
<div class="row">
<div class="col-md-6">
<div class="box box-solid">
<div class="box-header with-border"><h3 class="box-title">修改标签</h3></div>
<form action="/admin/tag/update" method="post" class="form-horizontal" onsubmit="return checkCate()">
<input type="hidden" name="tagId" value="${tag.tagId}">
<div class="box-body">
<div class="form-group">
<label for="tagName" class="col-sm-3 control-label">名称：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="tagName" name="tagName" value="${tag.tagName}">
</div>
</div>
<div class="form-group">
<label for="tagUrl" class="col-sm-3 control-label">路径名称：</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="tagUrl" name="tagUrl" value="${tag.tagUrl}">
</div>
</div>
</div>
<div class="box-footer">
<button class="btn btn-default" onclick="window.history.back()">返回</button>
<button type="submit" class="btn btn-primary pull-right">保存</button>
</div>
</form>
</div>
</div>
</div>
</section>
<script src="/static/plugins/toast/js/jquery.toast.min.js"></script>
<script>
function checkCate() {
var name = $('#tagName').val();
var url = $('#tagUrl').val();
var result = true;
if(name==""||url==""){
showMsg("请输入完整信息！","info",2000);
result = false;
}
return result;
}
</script>
</div>
<#include "module/_footer.ftl">
</div>
<@footer></@footer>
</#compress>

61
src/main/resources/templates/admin/admin_tag.ftl
View File

@ -28,25 +28,46 @@
<div class="col-md-5"> <div class="col-md-5">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">添加新标签</h3> <h3 class="box-title">${statusName}标签<#if tag??>[${updateTag.tagName}]</#if></h3>
</div> </div>
<form action="/admin/tag/save" method="post" role="form" onsubmit="return checkTag()"> <#if updateTag??>
<div class="box-body"> <form action="/admin/tag/save" method="post" role="form">
<div class="form-group"> <input type="hidden" name="tagId" value="${updateTag.tagId}">
<label for="tagName">名称</label> <div class="box-body">
<input type="text" class="form-control" id="tagName" name="tagName"> <div class="form-group">
<small>页面上所显示的名称</small> <label for="tagName">名称</label>
<input type="text" class="form-control" id="tagName" name="tagName" value="${updateTag.tagName}">
<small>页面上所显示的名称</small>
</div>
<div class="form-group">
<label for="tagUrl">路径名称</label>
<input type="text" class="form-control" id="tagUrl" name="tagUrl" value="${updateTag.tagUrl}">
<small>*这是文章路径上显示的名称，最好为英文</small>
</div>
</div> </div>
<div class="form-group"> <div class="box-footer">
<label for="tagUrl">路径名称</label> <button type="submit" class="btn btn-primary btn-flat">确定${statusName}</button>
<input type="text" class="form-control" id="tagUrl" name="tagUrl">
<small>*这是文章路径上显示的名称，最好为英文</small>
</div> </div>
</div> </form>
<div class="box-footer"> <#else >
<button type="submit" class="btn btn-primary btn-flat">添加新标签</button> <form action="/admin/tag/save" method="post" role="form" onsubmit="return checkTag()">
</div> <div class="box-body">
</form> <div class="form-group">
<label for="tagName">名称</label>
<input type="text" class="form-control" id="tagName" name="tagName">
<small>页面上所显示的名称</small>
</div>
<div class="form-group">
<label for="tagUrl">路径名称</label>
<input type="text" class="form-control" id="tagUrl" name="tagUrl">
<small>*这是文章路径上显示的名称，最好为英文</small>
</div>
</div>
<div class="box-footer">
<button type="submit" class="btn btn-primary btn-flat">确定${statusName}</button>
</div>
</form>
</#if>
</div> </div>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
@ -71,8 +92,12 @@
<td>${tag.tagUrl}</td> <td>${tag.tagUrl}</td>
<td>2</td> <td>2</td>
<td> <td>
<a class="btn btn-danger btn-xs btn-flat" href="/admin/tag/edit?tagId=${tag.tagId}">修改</a> <#if updateTag ?? && tag.tagId==updateTag.tagId>
<button class="btn btn-primary btn-xs btn-flat" onclick="modelShow('/admin/tag/remove?tagId=${tag.tagId}')">删除</button> <a class="btn btn-primary btn-xs btn-flat" href="#" disabled>正在修改</a>
<#else >
<a data-pjax="true" class="btn btn-primary btn-xs btn-flat" href="/admin/tag/edit?tagId=${tag.tagId}">修改</a>
</#if>
<button class="btn btn-danger btn-xs btn-flat" onclick="modelShow('/admin/tag/remove?tagId=${tag.tagId}')">删除</button>
</td> </td>
</tr> </tr>
</#list> </#list>