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

🎨 代码优化

pull/33/merge
ruibaby 2018-08-23 15:46:27 +08:00
parent 64a5eb792e
commit dff55aca9e
14 changed files with 29 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cc/ryanc/halo/config/StartupConfig.java
View File

@ -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;'>");

2
src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java
View File

@ -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()));

34
src/main/java/cc/ryanc/halo/utils/HaloUtils.java
View File

@ -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;
}

2
src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
View File

@ -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

2
src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
View File

@ -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));

4
src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
View File

@ -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 {

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

@ -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(), "");

4
src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
View File

@ -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());

2
src/main/resources/templates/common/comment/_changyan_comment.ftl
View File

@ -1,4 +1,4 @@
<!-- changyan comment -->
<#-- changyan comment -->
<!--PC和WAP自适应版-->
<style type="text/css" rel="stylesheet">
${options.changyan_css?if_exists}

2
src/main/resources/templates/common/comment/_disqus_comment.ftl
View File

@ -1,4 +1,4 @@
<!--disqus comment-->
<#--disqus comment-->
<style type="text/css" rel="stylesheet">
${options.disqus_css?if_exists}
</style>

2
src/main/resources/templates/common/comment/_livere_comment.ftl
View File

@ -1,4 +1,4 @@
<!-- livere_comment -->
<#-- livere_comment -->
<style type="text/css" rel="stylesheet">
${options.livere_css?if_exists}
</style>

2
src/main/resources/templates/common/comment/_valine_comment.ftl
View File

@ -1,4 +1,4 @@
<!-- Valine comment -->
<#-- Valine comment -->
<style type="text/css" rel="stylesheet">
${options.valine_css?if_exists}
</style>

6
src/main/resources/templates/common/macro/common_macro.ftl
View File

@ -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}">

7
src/main/resources/templates/themes/anatole/links.ftl
View File

@ -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>