diff --git a/pom.xml b/pom.xml index 58605da1f..6bde0e130 100755 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,12 @@ + + org.springframework.boot + spring-boot-devtools + true + + org.springframework.boot spring-boot-starter-test diff --git a/src/main/java/cc/ryanc/halo/utils/CommentUtil.java b/src/main/java/cc/ryanc/halo/utils/CommentUtil.java index abd748451..44db0792b 100644 --- a/src/main/java/cc/ryanc/halo/utils/CommentUtil.java +++ b/src/main/java/cc/ryanc/halo/utils/CommentUtil.java @@ -1,14 +1,17 @@ package cc.ryanc.halo.utils; -import cc.ryanc.halo.model.domain.Comment; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; + +import cc.ryanc.halo.model.domain.Comment; + /** * 
- *     拼装评论
+ * 拼装评论
  *
* * @author : RYAN0UP @@ -23,6 +26,10 @@ public class CommentUtil { * @return List */ public static List getComments(List commentsRoot) { + if (CollectionUtils.isEmpty(commentsRoot)) { + return Collections.emptyList(); + } + List commentsResult = new ArrayList<>(); for (Comment comment : commentsRoot) { @@ -34,7 +41,7 @@ public class CommentUtil { for (Comment comment : commentsResult) { comment.setChildComments(getChild(comment.getCommentId(), commentsRoot)); } - //集合倒序，最新的评论在最前面 + // 集合倒序，最新的评论在最前面 Collections.reverse(commentsResult); return commentsResult; } @@ -47,6 +54,12 @@ public class CommentUtil { * @return List */ private static List getChild(Long id, List commentsRoot) { + Assert.notNull(id, "comment id must not be null"); + + if (CollectionUtils.isEmpty(commentsRoot)) { + return null; + } + List commentsChild = new ArrayList<>(); for (Comment comment : commentsRoot) { if (comment.getCommentParent() != 0) { diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java index fcb4d5308..1d1a2796f 100755 --- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java +++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java @@ -16,6 +16,8 @@ import com.sun.syndication.io.FeedException; import com.sun.syndication.io.WireFeedOutput; import io.github.biezhi.ome.OhMyEmail; import lombok.extern.slf4j.Slf4j; + +import org.springframework.util.Assert; import org.springframework.util.ResourceUtils; import javax.imageio.ImageIO; @@ -34,7 +36,7 @@ import java.util.*; /** * 
- *     常用工具
+ * 常用工具
  *
* * @author : RYAN0UP @@ -55,7 +57,7 @@ public class HaloUtils { File[] files = srcPath.listFiles(); List backupDtos = new ArrayList<>(); BackupDto backupDto = null; - //遍历文件 + // 遍历文件 if (null != files) { for (File file : files) { if (file.isFile()) { @@ -109,7 +111,8 @@ public class HaloUtils { */ public static Date getCreateTime(String srcPath) { Path path = Paths.get(srcPath); - BasicFileAttributeView basicview = Files.getFileAttributeView(path, BasicFileAttributeView.class, LinkOption.NOFOLLOW_LINKS); + BasicFileAttributeView basicview = Files.getFileAttributeView(path, BasicFileAttributeView.class, + LinkOption.NOFOLLOW_LINKS); BasicFileAttributes attr; try { attr = basicview.readAttributes(); @@ -147,9 +150,9 @@ public class HaloUtils { public static List getThemes() { List themes = new ArrayList<>(); try { - //获取项目根路径 + // 获取项目根路径 File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); - //获取主题路径 + // 获取主题路径 File themesPath = new File(basePath.getAbsolutePath(), "templates/themes"); File[] files = themesPath.listFiles(); if (null != files) { @@ -161,7 +164,8 @@ public class HaloUtils { } theme = new Theme(); theme.setThemeName(file.getName()); - File optionsPath = new File(themesPath.getAbsolutePath(), file.getName() + "/module/options.ftl"); + File optionsPath = new File(themesPath.getAbsolutePath(), + file.getName() + "/module/options.ftl"); if (optionsPath.exists()) { theme.setHasOptions(true); } else { @@ -192,9 +196,9 @@ public class HaloUtils { public static List getTplName(String theme) { List tpls = new ArrayList<>(); try { - //获取项目根路径 + // 获取项目根路径 File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); - //获取主题路径 + // 获取主题路径 File themesPath = new File(basePath.getAbsolutePath(), "templates/themes/" + theme); File modulePath = new File(themesPath.getAbsolutePath(), "module"); File[] baseFiles = themesPath.listFiles(); @@ -220,8 +224,7 @@ public class HaloUtils { } /** - * 获取定制模板 - * 格式 page_xxx + * 获取定制模板 格式 page_xxx * * @return List */ @@ -229,7 +232,7 @@ public class HaloUtils { List tpls = new ArrayList<>(); try { File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); - //获取主题路径 + // 获取主题路径 File themePath = new File(basePath.getAbsolutePath(), "templates/themes/" + theme); File[] themeFiles = themePath.listFiles(); if (null != themeFiles && themeFiles.length > 0) { @@ -284,6 +287,8 @@ public class HaloUtils { * @throws FeedException */ public static String getRss(List posts) throws FeedException { + Assert.notEmpty(posts, "posts must not be empty"); + Channel channel = new Channel("rss_2.0"); if (null == HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp())) { channel.setTitle(""); @@ -318,7 +323,8 @@ public class HaloUtils { value = new String(xmlChar); content.setValue(value); item.setContent(content); - item.setLink(HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl()); + item.setLink( + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl()); item.setPubDate(post.getPostDate()); items.add(item); } @@ -334,12 +340,15 @@ public class HaloUtils { * @return String */ public static String getSiteMap(List posts) { + Assert.notEmpty(posts, "post mut not be empty"); + String head = "\n"; String urlBody = ""; String urlItem; String urlPath = HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/archives/"; for (Post post : posts) { - urlItem = "" + urlPath + post.getPostUrl() + "" + DateUtil.format(post.getPostDate(), "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + "" + ""; + urlItem = "" + urlPath + post.getPostUrl() + "" + + DateUtil.format(post.getPostDate(), "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + "" + ""; urlBody += urlItem; } return head + urlBody + ""; @@ -365,6 +374,8 @@ public class HaloUtils { * @return String */ public static String getHttpResponse(String enterUrl) { + Assert.hasText(enterUrl, "enter url must not be blank"); + BufferedReader in = null; StringBuffer result = null; try { @@ -396,7 +407,6 @@ public class HaloUtils { return null; } - /** * 百度主动推送 * @@ -406,29 +416,33 @@ public class HaloUtils { * @return String */ public static String baiduPost(String blogUrl, String token, String urls) { + Assert.hasText(blogUrl, "blog url must not be blank"); + Assert.hasText(token, "token must not be blank"); + Assert.hasText(urls, "urls must not be blank"); + String url = "http://data.zz.baidu.com/urls?site=" + blogUrl + "&token=" + token; String result = ""; PrintWriter out = null; BufferedReader in = null; try { - //建立URL之间的连接 + // 建立URL之间的连接 URLConnection conn = new URL(url).openConnection(); - //设置通用的请求属性 + // 设置通用的请求属性 conn.setRequestProperty("Host", "data.zz.baidu.com"); conn.setRequestProperty("User-Agent", "curl/7.12.1"); conn.setRequestProperty("Content-Length", "83"); conn.setRequestProperty("Content-Type", "text/plain"); - //发送POST请求必须设置如下两行 + // 发送POST请求必须设置如下两行 conn.setDoInput(true); conn.setDoOutput(true); - //获取conn对应的输出流 + // 获取conn对应的输出流 out = new PrintWriter(conn.getOutputStream()); out.print(urls.trim()); - //进行输出流的缓冲 + // 进行输出流的缓冲 out.flush(); - //通过BufferedReader输入流来读取Url的响应 + // 通过BufferedReader输入流来读取Url的响应 in = new BufferedReader(new InputStreamReader(conn.getInputStream())); String line; while ((line = in.readLine()) != null) { diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl index 7c8134694..2ca151435 100755 --- a/src/main/resources/templates/admin/admin_index.ftl +++ b/src/main/resources/templates/admin/admin_index.ftl @@ -238,7 +238,7 @@ <@spring.message code='common.status.recycle-bin' /> - ${post.postDate?if_exists?string("yyyy-MM-dd HH:mm")} + <@common.timeline datetime="${post.postDate?if_exists}"?datetime /> <#else> @@ -310,7 +310,7 @@ <#break > - ${comment.commentDate?string("yyyy-MM-dd HH:mm")} + <@common.timeline datetime="${comment.commentDate}"?datetime /> <#else> diff --git a/src/main/resources/templates/admin/module/_header.ftl b/src/main/resources/templates/admin/module/_header.ftl index c206cdd53..4dc05b25d 100755 --- a/src/main/resources/templates/admin/module/_header.ftl +++ b/src/main/resources/templates/admin/module/_header.ftl @@ -35,7 +35,7 @@

${comment.commentAuthor} - ${comment.commentDate?string("yyyy/MM/dd HH:mm")} + <@common.timeline datetime="${comment.commentDate}"?datetime />

${comment.commentContent} diff --git a/src/main/resources/templates/admin/module/_macro.ftl b/src/main/resources/templates/admin/module/_macro.ftl index 0b060fe90..2c6cfd914 100644 --- a/src/main/resources/templates/admin/module/_macro.ftl +++ b/src/main/resources/templates/admin/module/_macro.ftl @@ -1,4 +1,5 @@ <#macro head> +<#import "/common/macro/common_macro.ftl" as common> diff --git a/src/main/resources/templates/common/macro/common_macro.ftl b/src/main/resources/templates/common/macro/common_macro.ftl index 896e372c5..6c56888d1 100644 --- a/src/main/resources/templates/common/macro/common_macro.ftl +++ b/src/main/resources/templates/common/macro/common_macro.ftl @@ -31,4 +31,18 @@ <#if options.blog_verification_qihu??> + + +<#-- 时间格式化 几...前 --> +<#macro timeline datetime=.now> + <#assign ct = (.now?long-datetime?long)/1000> + <#if ct gte 31104000>${(ct/31104000)?int}年前 + <#t><#elseif ct gte 2592000>${(ct/2592000)?int}个月前 + <#t><#elseif ct gte 86400*2>${(ct/86400)?int}天前 + <#t><#elseif ct gte 86400>昨天 + <#t><#elseif ct gte 3600>${(ct/3600)?int}小时前 + <#t><#elseif ct gte 60>${(ct/60)?int}分钟前 + <#t><#elseif ct gt 0>${ct?int}秒前 + <#t><#else>刚刚 + \ No newline at end of file