From dff55aca9e6f66037e3719af26de642d1bac1eb0 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 23 Aug 2018 15:46:27 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/ryanc/halo/config/StartupConfig.java   |  2 +-
 .../halo/service/impl/OptionsServiceImpl.java |  2 +-
 .../java/cc/ryanc/halo/utils/HaloUtils.java   | 34 ++-----------------
 .../admin/AttachmentController.java           |  2 +-
 .../controller/admin/BackupController.java    |  2 +-
 .../controller/admin/CommentController.java   |  4 +--
 .../web/controller/admin/PageController.java  |  3 +-
 .../front/FrontCommentController.java         |  4 +--
 .../common/comment/_changyan_comment.ftl      |  4 +--
 .../common/comment/_disqus_comment.ftl        |  4 +--
 .../common/comment/_livere_comment.ftl        |  4 +--
 .../common/comment/_valine_comment.ftl        |  4 +--
 .../templates/common/macro/common_macro.ftl   |  6 ++--
 .../templates/themes/anatole/links.ftl        |  9 +++--
 14 files changed, 29 insertions(+), 55 deletions(-)

diff --git a/src/main/java/cc/ryanc/halo/config/StartupConfig.java b/src/main/java/cc/ryanc/halo/config/StartupConfig.java
index 687203d5b..1a1e22bd4 100755
--- a/src/main/java/cc/ryanc/halo/config/StartupConfig.java
+++ b/src/main/java/cc/ryanc/halo/config/StartupConfig.java
@@ -82,7 +82,7 @@ public class StartupConfig implements ApplicationListener<ApplicationStartedEven
      * 加载OwO表情
      */
     private void loadOwo() {
-        Map<String, String> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>(135);
         map.put("@[nico]", "<img src='/static/plugins/OwO/paopao/nico.png' alt='nico.png' style='vertical-align: middle;'>");
         map.put("@[OK]", "<img src='/static/plugins/OwO/paopao/OK.png' alt='OK.png' style='vertical-align: middle;'>");
         map.put("@[what]", "<img src='/static/plugins/OwO/paopao/what.png' alt='what.png' style='vertical-align: middle;'>");
diff --git a/src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java
index 2aa4f032f..5799a8410 100755
--- a/src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java
@@ -84,7 +84,7 @@ public class OptionsServiceImpl implements OptionsService {
      */
     @Override
     public Map<String, String> findAllOptions() {
-        Map<String, String> options = new HashMap<String, String>();
+        Map<String, String> options = new HashMap<>();
         List<Options> optionsList = optionsRepository.findAll();
         if (null != optionsList) {
             optionsList.forEach(option -> options.put(option.getOptionName(), option.getOptionValue()));
diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
index 16ece369d..f7379d427 100755
--- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
+++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java
@@ -46,36 +46,6 @@ import java.util.*;
 @Slf4j
 public class HaloUtils {
 
-    private static ArrayList<String> FILE_LIST = new ArrayList<>();
-
-    /**
-     * 获取所有附件
-     *
-     * @param filePath filePath
-     * @return ArrayList
-     */
-    public static ArrayList<String> getFiles(String filePath) {
-        try {
-            //获取项目根路径
-            File basePath = new File(ResourceUtils.getURL("classpath:").getPath());
-            //获取目标路径
-            File targetPath = new File(basePath.getAbsolutePath(), filePath);
-            File[] files = targetPath.listFiles();
-            //遍历文件
-            for (File file : files) {
-                if (file.isDirectory()) {
-                    getFiles(filePath + "/" + file.getName());
-                } else {
-                    String abPath = file.getAbsolutePath().substring(file.getAbsolutePath().indexOf("/upload"));
-                    FILE_LIST.add(abPath);
-                }
-            }
-        } catch (Exception e) {
-            log.error("未知错误：{0}", e.getMessage());
-        }
-        return FILE_LIST;
-    }
-
     /**
      * 获取备份文件信息
      *
@@ -205,7 +175,7 @@ public class HaloUtils {
                 }
             }
         } catch (Exception e) {
-            log.error("主题获取失败：", e.getMessage());
+            log.error("主题获取失败：{}", e.getMessage());
         }
         return themes;
     }
@@ -241,7 +211,7 @@ public class HaloUtils {
                 }
             }
         } catch (Exception e) {
-            log.error("未知错误：", e.getMessage());
+            log.error("获取主题模板失败：{}", e.getMessage());
         }
         return tpls;
     }
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
index 458f6863c..3dd466216 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
@@ -130,7 +130,7 @@ public class AttachmentController {
      * @return Map
      */
     private Map<String, Object> uploadAttachment(MultipartFile file, HttpServletRequest request) {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = new HashMap<>(3);
         if (!file.isEmpty()) {
             try {
                 //程序根路径，也就是/resources
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
index 0f392a407..68fa516b6 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
@@ -226,7 +226,7 @@ public class BackupController {
         @Override
         public void run() {
             File file = new File(srcPath);
-            Map<String, Object> content = new HashMap<>();
+            Map<String, Object> content = new HashMap<>(3);
             try {
                 content.put("fileName", file.getName());
                 content.put("createAt", HaloUtils.getCreateTime(srcPath));
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
index 6a67186ed..39f335fe2 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
@@ -221,7 +221,7 @@ public class CommentController extends BaseController {
         public void run() {
             if (StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.SMTP_EMAIL_ENABLE.getProp()), TrueFalseEnum.TRUE.getDesc()) && StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.COMMENT_REPLY_NOTICE.getProp()), TrueFalseEnum.TRUE.getDesc())) {
                 if (Validator.isEmail(lastComment.getCommentAuthorEmail())) {
-                    Map<String, Object> map = new HashMap<>();
+                    Map<String, Object> map = new HashMap<>(8);
                     map.put("blogTitle", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp()));
                     map.put("commentAuthor", lastComment.getCommentAuthor());
                     map.put("pageName", lastComment.getPost().getPostTitle());
@@ -263,7 +263,7 @@ public class CommentController extends BaseController {
             if (StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.SMTP_EMAIL_ENABLE.getProp()), TrueFalseEnum.TRUE.getDesc()) && StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.COMMENT_REPLY_NOTICE.getProp()), TrueFalseEnum.TRUE.getDesc())) {
                 try {
                     if (status == 1 && Validator.isEmail(comment.getCommentAuthorEmail())) {
-                        Map<String, Object> map = new HashMap<>();
+                        Map<String, Object> map = new HashMap<>(6);
                         if (StringUtils.equals(post.getPostType(), PostTypeEnum.POST_TYPE_POST.getDesc())) {
                             map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId());
                         } else {
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 14aca7abf..d681f5f4f 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
@@ -265,8 +265,7 @@ public class PageController {
     @ResponseBody
     public JsonResult checkUrlExists(@PathParam("postUrl") String postUrl) {
         Post post = postService.findByPostUrl(postUrl, PostTypeEnum.POST_TYPE_PAGE.getDesc());
-        // TODO 还没写完
-        if (null != post || StringUtils.equals("archives", postUrl) || StringUtils.equals("galleries", postUrl)) {
+        if (null != post) {
             return new JsonResult(ResultCodeEnum.FAIL.getCode(), "该路径已经存在！");
         }
         return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "");
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
index cc9b89811..8479bbec5 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
@@ -165,7 +165,7 @@ public class FrontCommentController {
             if (StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.SMTP_EMAIL_ENABLE.getProp()), TrueFalseEnum.TRUE.getDesc()) && StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NOTICE.getProp()), TrueFalseEnum.TRUE.getDesc())) {
                 try {
                     //发送邮件到博主
-                    Map<String, Object> map = new HashMap<>();
+                    Map<String, Object> map = new HashMap<>(5);
                     map.put("author", userService.findUser().getUserDisplayName());
                     map.put("pageName", post.getPostTitle());
                     if (StringUtils.equals(post.getPostType(), PostTypeEnum.POST_TYPE_POST.getDesc())) {
@@ -202,7 +202,7 @@ public class FrontCommentController {
             //发送通知给对方
             if (StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.SMTP_EMAIL_ENABLE.getProp()), TrueFalseEnum.TRUE.getDesc()) && StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NOTICE.getProp()), TrueFalseEnum.TRUE.getDesc())) {
                 if (Validator.isEmail(lastComment.getCommentAuthorEmail())) {
-                    Map<String, Object> map = new HashMap<>();
+                    Map<String, Object> map = new HashMap<>(8);
                     map.put("blogTitle", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp()));
                     map.put("commentAuthor", lastComment.getCommentAuthor());
                     map.put("pageName", lastComment.getPost().getPostTitle());
diff --git a/src/main/resources/templates/common/comment/_changyan_comment.ftl b/src/main/resources/templates/common/comment/_changyan_comment.ftl
index 6a41c7462..2028a55f8 100644
--- a/src/main/resources/templates/common/comment/_changyan_comment.ftl
+++ b/src/main/resources/templates/common/comment/_changyan_comment.ftl
@@ -1,4 +1,4 @@
-<!-- changyan comment -->
+<#-- changyan comment -->
 <!--PC和WAP自适应版-->
 <style type="text/css" rel="stylesheet">
     ${options.changyan_css?if_exists}
@@ -11,4 +11,4 @@
         var width = window.innerWidth || document.documentElement.clientWidth;
         if (width < 960) {
             window.document.write('<script id="changyan_mobile_js" charset="utf-8" type="text/javascript" src="https://changyan.sohu.com/upload/mobile/wap-js/changyan_mobile.js?client_id=' + appid + '&conf=' + conf + '"><\/script>'); } else { var loadJs=function(d,a){var c=document.getElementsByTagName("head")[0]||document.head||document.documentElement;var b=document.createElement("script");b.setAttribute("type","text/javascript");b.setAttribute("charset","UTF-8");b.setAttribute("src",d);if(typeof a==="function"){if(window.attachEvent){b.onreadystatechange=function(){var e=b.readyState;if(e==="loaded"||e==="complete"){b.onreadystatechange=null;a()}}}else{b.onload=a}}c.appendChild(b)};loadJs("https://changyan.sohu.com/upload/changyan.js",function(){window.changyan.api.config({appid:appid,conf:conf})}); } })();
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main/resources/templates/common/comment/_disqus_comment.ftl b/src/main/resources/templates/common/comment/_disqus_comment.ftl
index f30a0a5c0..6c6006a60 100644
--- a/src/main/resources/templates/common/comment/_disqus_comment.ftl
+++ b/src/main/resources/templates/common/comment/_disqus_comment.ftl
@@ -1,4 +1,4 @@
-<!--disqus comment-->
+<#--disqus comment-->
 <style type="text/css" rel="stylesheet">
     ${options.disqus_css?if_exists}
 </style>
@@ -22,4 +22,4 @@
         (d.head || d.body).appendChild(s);
     })();
 </script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
\ No newline at end of file
+<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
diff --git a/src/main/resources/templates/common/comment/_livere_comment.ftl b/src/main/resources/templates/common/comment/_livere_comment.ftl
index 3cf38adeb..bc2736f01 100644
--- a/src/main/resources/templates/common/comment/_livere_comment.ftl
+++ b/src/main/resources/templates/common/comment/_livere_comment.ftl
@@ -1,4 +1,4 @@
-<!-- livere_comment -->
+<#-- livere_comment -->
 <style type="text/css" rel="stylesheet">
     ${options.livere_css?if_exists}
 </style>
@@ -16,4 +16,4 @@
         </script>
         <noscript> 为正常使用来必力评论功能请激活JavaScript</noscript>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/resources/templates/common/comment/_valine_comment.ftl b/src/main/resources/templates/common/comment/_valine_comment.ftl
index 8b0618677..e76591ed5 100644
--- a/src/main/resources/templates/common/comment/_valine_comment.ftl
+++ b/src/main/resources/templates/common/comment/_valine_comment.ftl
@@ -1,4 +1,4 @@
-<!-- Valine comment -->
+<#-- Valine comment -->
 <style type="text/css" rel="stylesheet">
     ${options.valine_css?if_exists}
 </style>
@@ -23,4 +23,4 @@
         avatar:'${options.valine_avatar?if_exists}',
         lang:'zh-cn'
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main/resources/templates/common/macro/common_macro.ftl b/src/main/resources/templates/common/macro/common_macro.ftl
index cb94ccc2b..f5cfa3930 100644
--- a/src/main/resources/templates/common/macro/common_macro.ftl
+++ b/src/main/resources/templates/common/macro/common_macro.ftl
@@ -1,14 +1,14 @@
-<!-- 统计代码 -->
+<#-- 统计代码 -->
 <#macro statistics>
     ${options.statistics_code?if_exists}
 </#macro>
 
-<!-- 页脚信息 -->
+<#-- 页脚信息 -->
 <#macro footer_info>
     ${options.blog_footer_info?if_exists}
 </#macro>
 
-<!-- favicon -->
+<#-- favicon -->
 <#macro favicon>
     <#if options.blog_favicon??>
         <link rel="shortcut icon" type="images/x-icon" href="${options.blog_favicon}">
diff --git a/src/main/resources/templates/themes/anatole/links.ftl b/src/main/resources/templates/themes/anatole/links.ftl
index bb6cc2a98..0d6a6a85e 100644
--- a/src/main/resources/templates/themes/anatole/links.ftl
+++ b/src/main/resources/templates/themes/anatole/links.ftl
@@ -14,7 +14,12 @@
                         <@commonTag method="links">
                             <#if links?? && links?size gt 0>
                                 <#list links as link>
-                                <p><a href="${link.linkUrl}" target="_blank" rel="external">${link.linkName}</a> – ${link.linkDesc}</p>
+                                <p>
+                                    <a href="${link.linkUrl}" target="_blank" rel="external">${link.linkName}</a>
+                                    <#if link.linkDesc!=''>
+                                         – ${link.linkDesc}
+                                    </#if>
+                                </p>
                                 </#list>
                             </#if>
                         </@commonTag>
@@ -24,4 +29,4 @@
         </div>
     </div>
 </div>
-<@footer></@footer>
\ No newline at end of file
+<@footer></@footer>