diff --git a/src/main/java/cc/ryanc/halo/config/StartupConfig.java b/src/main/java/cc/ryanc/halo/config/StartupConfig.java index 45420ce41..687203d5b 100755 --- a/src/main/java/cc/ryanc/halo/config/StartupConfig.java +++ b/src/main/java/cc/ryanc/halo/config/StartupConfig.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.config; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.Theme; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.OptionsService; import cc.ryanc.halo.utils.HaloUtils; import cc.ryanc.halo.web.controller.core.BaseController; @@ -48,7 +48,7 @@ public class StartupConfig implements ApplicationListener - * 常用博客设置enum - * - * - * @author : RYAN0UP - * @date : 2018/7/14 - */ -public enum BlogProperties { - - /** - * 博客标题 - */ - BLOG_TITLE("blog_title"), - - /** - * 博客地址 - */ - BLOG_URL("blog_url"), - - /** - * 文章摘要字数 - */ - POST_SUMMARY("post_summary"), - - /** - * 首页文章条数 - */ - INDEX_POSTS("index_posts"), - - /** - * 是否已经安装 - */ - IS_INSTALL("is_install"), - - /** - * RSS显示文章条数 - */ - RSS_POSTS("rss_posts"), - - /** - * API状态 - */ - API_STATUS("api_status"), - - /** - * 邮箱服务器地址 - */ - MAIL_SMTP_HOST("mail_smtp_host"), - - /** - * 邮箱地址 - */ - MAIL_SMTP_USERNAME("mail_smtp_username"), - - /** - * 邮箱密码／授权码 - */ - MAIL_SMTP_PASSWORD("mail_smtp_password"), - - /** - * 发送者名称 - */ - MAIL_FROM_NAME("mail_from_name"), - - /** - * 启用邮件服务 - */ - SMTP_EMAIL_ENABLE("smtp_email_enable"), - - /** - * 邮件回复通知 - */ - COMMENT_REPLY_NOTICE("comment_reply_notice"), - - /** - * 新评论是否需要审核 - */ - NEW_COMMENT_NEED_CHECK("new_comment_need_check"), - - /** - * 新评论通知 - */ - NEW_COMMENT_NOTICE("new_comment_notice"), - - /** - * 邮件审核通过通知 - */ - COMMENT_PASS_NOTICE("comment_pass_notice"), - - /** - * 站点描述 - */ - SEO_DESC("seo_desc"), - - /** - * 博客主题 - */ - THEME("theme"), - - /** - * 博客搭建日期 - */ - BLOG_START("blog_start"), - - /** - * 博客评论系统 - */ - COMMENT_SYSTEM("comment_system"), - - /** - * 仪表盘部件 文章总数 - */ - WIDGET_POSTCOUNT("widget_postcount"), - - /** - * 仪表盘部件 评论总数 - */ - WIDGET_COMMENTCOUNT("widget_commentcount"), - - /** - * 仪表盘部件 附件总数 - */ - WIDGET_ATTACHMENTCOUNT("widget_attachmentcount"), - - /** - * 仪表盘部件 成立天数 - */ - WIDGET_DAYCOUNT("widget_daycount"); - - private String prop; - - BlogProperties(String prop) { - this.prop = prop; - } - - public String getProp() { - return prop; - } -} diff --git a/src/main/java/cc/ryanc/halo/model/enums/CommentStatus.java b/src/main/java/cc/ryanc/halo/model/enums/CommentStatusEnum.java similarity index 86% rename from src/main/java/cc/ryanc/halo/model/enums/CommentStatus.java rename to src/main/java/cc/ryanc/halo/model/enums/CommentStatusEnum.java index bc18e5ec5..738ad9e0d 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/CommentStatus.java +++ b/src/main/java/cc/ryanc/halo/model/enums/CommentStatusEnum.java @@ -8,7 +8,7 @@ package cc.ryanc.halo.model.enums; * @author : RYAN0UP * @date : 2018/7/1 */ -public enum CommentStatus { +public enum CommentStatusEnum { /** * 已发布 @@ -28,7 +28,7 @@ public enum CommentStatus { private Integer code; private String desc; - CommentStatus(Integer code, String desc) { + CommentStatusEnum(Integer code, String desc) { this.code = code; this.desc = desc; } diff --git a/src/main/java/cc/ryanc/halo/model/enums/CommonParams.java b/src/main/java/cc/ryanc/halo/model/enums/CommonParams.java deleted file mode 100644 index 23429614d..000000000 --- a/src/main/java/cc/ryanc/halo/model/enums/CommonParams.java +++ /dev/null @@ -1,42 +0,0 @@ -package cc.ryanc.halo.model.enums; - -/** - * 
- *     常用数字
- *
- * - * @author : RYAN0UP - * @date : 2018/8/1 - */ -public enum CommonParams { - - /** - * 数字10 - */ - TEN(10), - - /** - * 数字5 - */ - FIVE(5), - - /** - * 数字404 - */ - NOT_FOUND(404), - - /** - * 数字1024 - */ - BYTE(1024); - - private Integer value; - - CommonParams(Integer value) { - this.value = value; - } - - public Integer getValue() { - return value; - } -} diff --git a/src/main/java/cc/ryanc/halo/model/enums/PostStatus.java b/src/main/java/cc/ryanc/halo/model/enums/PostStatusEnum.java similarity index 87% rename from src/main/java/cc/ryanc/halo/model/enums/PostStatus.java rename to src/main/java/cc/ryanc/halo/model/enums/PostStatusEnum.java index ed04833c9..15a7831d4 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/PostStatus.java +++ b/src/main/java/cc/ryanc/halo/model/enums/PostStatusEnum.java @@ -8,7 +8,7 @@ package cc.ryanc.halo.model.enums; * @author : RYAN0UP * @date : 2018/7/1 */ -public enum PostStatus { +public enum PostStatusEnum { /** * 已发布 @@ -28,7 +28,7 @@ public enum PostStatus { private Integer code; private String desc; - PostStatus(Integer code, String desc) { + PostStatusEnum(Integer code, String desc) { this.code = code; this.desc = desc; } diff --git a/src/main/java/cc/ryanc/halo/model/enums/PostType.java b/src/main/java/cc/ryanc/halo/model/enums/PostType.java deleted file mode 100644 index 320f24a19..000000000 --- a/src/main/java/cc/ryanc/halo/model/enums/PostType.java +++ /dev/null @@ -1,32 +0,0 @@ -package cc.ryanc.halo.model.enums; - -/** - * 
- *     文章类型enum
- *
- * - * @author : RYAN0UP - * @date : 2018/7/1 - */ -public enum PostType { - - /** - * 文章 - */ - POST_TYPE_POST("post"), - - /** - * 页面 - */ - POST_TYPE_PAGE("page"); - - private String desc; - - PostType(String desc) { - this.desc = desc; - } - - public String getDesc() { - return desc; - } -} diff --git a/src/main/java/cc/ryanc/halo/model/enums/QiniuProperties.java b/src/main/java/cc/ryanc/halo/model/enums/QiniuPropertiesEnum.java similarity index 88% rename from src/main/java/cc/ryanc/halo/model/enums/QiniuProperties.java rename to src/main/java/cc/ryanc/halo/model/enums/QiniuPropertiesEnum.java index 21e3e9260..b6ef2d94e 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/QiniuProperties.java +++ b/src/main/java/cc/ryanc/halo/model/enums/QiniuPropertiesEnum.java @@ -8,7 +8,7 @@ package cc.ryanc.halo.model.enums; * @author : RYAN0UP * @date : 2018/7/14 */ -public enum QiniuProperties { +public enum QiniuPropertiesEnum { /** * 七牛云域名 @@ -32,7 +32,7 @@ public enum QiniuProperties { private String prop; - QiniuProperties(String prop) { + QiniuPropertiesEnum(String prop) { this.prop = prop; } diff --git a/src/main/java/cc/ryanc/halo/model/enums/ResponseStatus.java b/src/main/java/cc/ryanc/halo/model/enums/ResponseStatusEnum.java similarity index 88% rename from src/main/java/cc/ryanc/halo/model/enums/ResponseStatus.java rename to src/main/java/cc/ryanc/halo/model/enums/ResponseStatusEnum.java index 59f6d3b9a..210e1886e 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/ResponseStatus.java +++ b/src/main/java/cc/ryanc/halo/model/enums/ResponseStatusEnum.java @@ -8,7 +8,7 @@ package cc.ryanc.halo.model.enums; * @author : RYAN0UP * @date : 2018/7/1 */ -public enum ResponseStatus { +public enum ResponseStatusEnum { /** * 请求成功 @@ -33,7 +33,7 @@ public enum ResponseStatus { private Integer code; private String msg; - ResponseStatus(Integer code, String msg) { + ResponseStatusEnum(Integer code, String msg) { this.code = code; this.msg = msg; } diff --git a/src/main/java/cc/ryanc/halo/model/enums/ResultCode.java b/src/main/java/cc/ryanc/halo/model/enums/ResultCode.java deleted file mode 100644 index 54bf643db..000000000 --- a/src/main/java/cc/ryanc/halo/model/enums/ResultCode.java +++ /dev/null @@ -1,32 +0,0 @@ -package cc.ryanc.halo.model.enums; - -/** - * 
- *     返回结果enum
- *
- * - * @author : RYAN0UP - * @date : 2018/7/14 - */ -public enum ResultCode { - - /** - * 成功 - */ - SUCCESS(1), - - /** - * 失败 - */ - FAIL(0); - - Integer code; - - ResultCode(Integer code) { - this.code = code; - } - - public Integer getCode() { - return code; - } -} diff --git a/src/main/java/cc/ryanc/halo/model/enums/TrueFalse.java b/src/main/java/cc/ryanc/halo/model/enums/TrueFalseEnum.java similarity index 85% rename from src/main/java/cc/ryanc/halo/model/enums/TrueFalse.java rename to src/main/java/cc/ryanc/halo/model/enums/TrueFalseEnum.java index f78cc8248..e959e5347 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/TrueFalse.java +++ b/src/main/java/cc/ryanc/halo/model/enums/TrueFalseEnum.java @@ -8,7 +8,7 @@ package cc.ryanc.halo.model.enums; * @author : RYAN0UP * @date : 2018/7/16 */ -public enum TrueFalse { +public enum TrueFalseEnum { /** * 真 @@ -22,7 +22,7 @@ public enum TrueFalse { private String desc; - TrueFalse(String desc) { + TrueFalseEnum(String desc) { this.desc = desc; } diff --git a/src/main/java/cc/ryanc/halo/model/tag/ArticleTagDirective.java b/src/main/java/cc/ryanc/halo/model/tag/ArticleTagDirective.java index 6d78b86b3..2554d315c 100644 --- a/src/main/java/cc/ryanc/halo/model/tag/ArticleTagDirective.java +++ b/src/main/java/cc/ryanc/halo/model/tag/ArticleTagDirective.java @@ -1,7 +1,7 @@ package cc.ryanc.halo.model.tag; -import cc.ryanc.halo.model.enums.PostStatus; -import cc.ryanc.halo.model.enums.PostType; +import cc.ryanc.halo.model.enums.PostStatusEnum; +import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.service.PostService; import freemarker.core.Environment; import freemarker.template.*; @@ -34,7 +34,7 @@ public class ArticleTagDirective implements TemplateDirectiveModel { String method = map.get(METHOD_KEY).toString(); switch (method) { case "postsCount": - environment.setVariable("postsCount", builder.build().wrap(postService.findPostByStatus(PostStatus.PUBLISHED.getCode(), PostType.POST_TYPE_POST.getDesc()).size())); + environment.setVariable("postsCount", builder.build().wrap(postService.findPostByStatus(PostStatusEnum.PUBLISHED.getCode(), PostTypeEnum.POST_TYPE_POST.getDesc()).size())); break; case "archives": environment.setVariable("archives", builder.build().wrap(postService.findPostGroupByYearAndMonth())); diff --git a/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java index 6a6c574fe..caed6d170 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java @@ -1,7 +1,7 @@ package cc.ryanc.halo.service.impl; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.MailService; import cc.ryanc.halo.utils.HaloUtils; import freemarker.template.Template; @@ -39,12 +39,12 @@ public class MailServiceImpl implements MailService { public void sendMail(String to, String subject, String content) { //配置邮件服务器 HaloUtils.configMail( - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_HOST.getProp()), - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_USERNAME.getProp()), - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_PASSWORD.getProp())); + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_HOST.getProp()), + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_USERNAME.getProp()), + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_PASSWORD.getProp())); try { OhMyEmail.subject(subject) - .from(HaloConst.OPTIONS.get(BlogProperties.MAIL_FROM_NAME.getProp())) + .from(HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_FROM_NAME.getProp())) .to(to) .text(content) .send(); @@ -65,15 +65,15 @@ public class MailServiceImpl implements MailService { public void sendTemplateMail(String to, String subject, Map content, String templateName) { //配置邮件服务器 HaloUtils.configMail( - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_HOST.getProp()), - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_USERNAME.getProp()), - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_PASSWORD.getProp())); + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_HOST.getProp()), + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_USERNAME.getProp()), + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_PASSWORD.getProp())); String text = ""; try { Template template = freeMarker.getConfiguration().getTemplate(templateName); text = FreeMarkerTemplateUtils.processTemplateIntoString(template, content); OhMyEmail.subject(subject) - .from(HaloConst.OPTIONS.get(BlogProperties.MAIL_FROM_NAME.getProp())) + .from(HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_FROM_NAME.getProp())) .to(to) .html(text) .send(); @@ -95,16 +95,16 @@ public class MailServiceImpl implements MailService { public void sendAttachMail(String to, String subject, Map content, String templateName, String attachSrc) { //配置邮件服务器 HaloUtils.configMail( - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_HOST.getProp()), - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_USERNAME.getProp()), - HaloConst.OPTIONS.get(BlogProperties.MAIL_SMTP_PASSWORD.getProp())); + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_HOST.getProp()), + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_USERNAME.getProp()), + HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_SMTP_PASSWORD.getProp())); File file = new File(attachSrc); String text = ""; try { Template template = freeMarker.getConfiguration().getTemplate(templateName); text = FreeMarkerTemplateUtils.processTemplateIntoString(template, content); OhMyEmail.subject(subject) - .from(HaloConst.OPTIONS.get(BlogProperties.MAIL_FROM_NAME.getProp())) + .from(HaloConst.OPTIONS.get(BlogPropertiesEnum.MAIL_FROM_NAME.getProp())) .to(to) .html(text) .attach(file, file.getName()) diff --git a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java index 69211cd39..d0bb5eccc 100755 --- a/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java @@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.Category; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Tag; import cc.ryanc.halo.model.dto.Archive; -import cc.ryanc.halo.model.enums.PostStatus; -import cc.ryanc.halo.model.enums.PostType; +import cc.ryanc.halo.model.enums.PostStatusEnum; +import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.repository.PostRepository; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.utils.HaloUtils; @@ -101,7 +101,7 @@ public class PostServiceImpl implements PostService { @Override @CacheEvict(value = POSTS_CACHE_NAME, allEntries = true, beforeInvocation = true) public void updateAllSummary(Integer postSummary) { - List posts = this.findAllPosts(PostType.POST_TYPE_POST.getDesc()); + List posts = this.findAllPosts(PostTypeEnum.POST_TYPE_POST.getDesc()); for (Post post : posts) { String text = HtmlUtil.cleanHtmlTag(post.getPostContent()); if (text.length() > postSummary) { @@ -171,7 +171,7 @@ public class PostServiceImpl implements PostService { @Override @Cacheable(value = POSTS_CACHE_NAME, key = "'posts_page_'+#pageable.pageNumber") public Page findPostByStatus(Pageable pageable) { - return postRepository.findPostsByPostStatusAndPostType(PostStatus.PUBLISHED.getCode(), PostType.POST_TYPE_POST.getDesc(), pageable); + return postRepository.findPostsByPostStatusAndPostType(PostStatusEnum.PUBLISHED.getCode(), PostTypeEnum.POST_TYPE_POST.getDesc(), pageable); } /** @@ -241,7 +241,7 @@ public class PostServiceImpl implements PostService { */ @Override public List findByPostDateAfter(Date postDate) { - return postRepository.findByPostDateAfterAndPostStatusAndPostTypeOrderByPostDateDesc(postDate, PostStatus.PUBLISHED.getCode(), PostType.POST_TYPE_POST.getDesc()); + return postRepository.findByPostDateAfterAndPostStatusAndPostTypeOrderByPostDateDesc(postDate, PostStatusEnum.PUBLISHED.getCode(), PostTypeEnum.POST_TYPE_POST.getDesc()); } /** @@ -252,7 +252,7 @@ public class PostServiceImpl implements PostService { */ @Override public List findByPostDateBefore(Date postDate) { - return postRepository.findByPostDateBeforeAndPostStatusAndPostTypeOrderByPostDateAsc(postDate, PostStatus.PUBLISHED.getCode(), PostType.POST_TYPE_POST.getDesc()); + return postRepository.findByPostDateBeforeAndPostStatusAndPostTypeOrderByPostDateAsc(postDate, PostStatusEnum.PUBLISHED.getCode(), PostTypeEnum.POST_TYPE_POST.getDesc()); } @@ -348,7 +348,7 @@ public class PostServiceImpl implements PostService { @Override @CachePut(value = POSTS_CACHE_NAME, key = "'posts_category_'+#category.cateId+'_'+#pageable.pageNumber") public Page findPostByCategories(Category category, Pageable pageable) { - return postRepository.findPostByCategoriesAndPostStatus(category, PostStatus.PUBLISHED.getCode(), pageable); + return postRepository.findPostByCategoriesAndPostStatus(category, PostStatusEnum.PUBLISHED.getCode(), pageable); } /** @@ -362,7 +362,7 @@ public class PostServiceImpl implements PostService { @Override @CachePut(value = POSTS_CACHE_NAME, key = "'posts_tag_'+#tag.tagId+'_'+#pageable.pageNumber") public Page findPostsByTags(Tag tag, Pageable pageable) { - return postRepository.findPostsByTagsAndPostStatus(tag, PostStatus.PUBLISHED.getCode(), pageable); + return postRepository.findPostsByTagsAndPostStatus(tag, PostStatusEnum.PUBLISHED.getCode(), pageable); } /** @@ -385,7 +385,7 @@ public class PostServiceImpl implements PostService { @Override @Cacheable(value = POSTS_CACHE_NAME, key = "'posts_hot'") public List hotPosts() { - return postRepository.findPostsByPostTypeOrderByPostViewsDesc(PostType.POST_TYPE_POST.getDesc()); + return postRepository.findPostsByPostTypeOrderByPostViewsDesc(PostTypeEnum.POST_TYPE_POST.getDesc()); } /** @@ -433,7 +433,7 @@ public class PostServiceImpl implements PostService { */ @Override public Integer getCountByStatus(Integer status) { - return postRepository.countAllByPostStatusAndPostType(status, PostType.POST_TYPE_POST.getDesc()); + return postRepository.countAllByPostStatusAndPostType(status, PostTypeEnum.POST_TYPE_POST.getDesc()); } /** diff --git a/src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java index ab98fd704..fb96e0895 100755 --- a/src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java @@ -1,7 +1,7 @@ package cc.ryanc.halo.service.impl; import cc.ryanc.halo.model.domain.User; -import cc.ryanc.halo.model.enums.TrueFalse; +import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.repository.UserRepository; import cc.ryanc.halo.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -132,7 +132,7 @@ public class UserServiceImpl implements UserService { @Override public User updateUserNormal() { User user = this.findUser(); - user.setLoginEnable(TrueFalse.TRUE.getDesc()); + user.setLoginEnable(TrueFalseEnum.TRUE.getDesc()); user.setLoginError(0); user.setLoginLast(new Date()); userRepository.save(user); diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java index e6f8b76f3..16ece369d 100755 --- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java +++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java @@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.BackupDto; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.Theme; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.CommonParams; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.CommonParamsEnum; import cn.hutool.core.io.FileUtil; import com.sun.syndication.feed.rss.Channel; import com.sun.syndication.feed.rss.Content; @@ -115,17 +115,17 @@ public class HaloUtils { * @return String */ public static String parseSize(long size) { - if (size < CommonParams.NOT_FOUND.getValue()) { + if (size < CommonParamsEnum.NOT_FOUND.getValue()) { return String.valueOf(size) + "B"; } else { size = size / 1024; } - if (size < CommonParams.NOT_FOUND.getValue()) { + if (size < CommonParamsEnum.NOT_FOUND.getValue()) { return String.valueOf(size) + "KB"; } else { size = size / 1024; } - if (size < CommonParams.NOT_FOUND.getValue()) { + if (size < CommonParamsEnum.NOT_FOUND.getValue()) { size = size * 100; return String.valueOf((size / 100)) + "." + String.valueOf((size % 100)) + "MB"; } else { @@ -301,20 +301,20 @@ public class HaloUtils { */ public static String getRss(List posts) throws FeedException { Channel channel = new Channel("rss_2.0"); - if (null == HaloConst.OPTIONS.get(BlogProperties.BLOG_TITLE.getProp())) { + if (null == HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp())) { channel.setTitle(""); } else { - channel.setTitle(HaloConst.OPTIONS.get(BlogProperties.BLOG_TITLE.getProp())); + channel.setTitle(HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp())); } - if (null == HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp())) { + if (null == HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp())) { channel.setLink(""); } else { - channel.setLink(HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp())); + channel.setLink(HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp())); } - if (null == HaloConst.OPTIONS.get(BlogProperties.SEO_DESC.getProp())) { + if (null == HaloConst.OPTIONS.get(BlogPropertiesEnum.SEO_DESC.getProp())) { channel.setDescription(""); } else { - channel.setDescription(HaloConst.OPTIONS.get(BlogProperties.SEO_DESC.getProp())); + channel.setDescription(HaloConst.OPTIONS.get(BlogPropertiesEnum.SEO_DESC.getProp())); } channel.setLanguage("zh-CN"); List items = new ArrayList<>(); @@ -334,7 +334,7 @@ public class HaloUtils { value = new String(xmlChar); content.setValue(value); item.setContent(content); - item.setLink(HaloConst.OPTIONS.get(BlogProperties.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); } @@ -353,7 +353,7 @@ public class HaloUtils { String head = "\n"; String urlBody = ""; String urlItem; - String urlPath = HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/archives/"; + String urlPath = HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/archives/"; for (Post post : posts) { urlItem = "" + urlPath + post.getPostUrl() + "" + getStringDate(post.getPostDate(), "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") + "" + ""; urlBody += urlItem; diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java index 11a6aee3b..9927dec94 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java @@ -7,9 +7,9 @@ import cc.ryanc.halo.model.domain.User; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.dto.LogsRecord; -import cc.ryanc.halo.model.enums.CommonParams; -import cc.ryanc.halo.model.enums.ResultCode; -import cc.ryanc.halo.model.enums.TrueFalse; +import cc.ryanc.halo.model.enums.CommonParamsEnum; +import cc.ryanc.halo.model.enums.ResultCodeEnum; +import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.service.*; import cc.ryanc.halo.web.controller.core.BaseController; import cn.hutool.core.date.DateUnit; @@ -138,8 +138,8 @@ public class AdminController extends BaseController { loginLast = aUser.getLoginLast(); } Long between = DateUtil.between(loginLast, DateUtil.date(), DateUnit.MINUTE); - if (StringUtils.equals(aUser.getLoginEnable(), TrueFalse.FALSE.getDesc()) && (between < CommonParams.TEN.getValue())) { - return new JsonResult(ResultCode.FAIL.getCode(), "已禁止登录，请10分钟后再试"); + if (StringUtils.equals(aUser.getLoginEnable(), TrueFalseEnum.FALSE.getDesc()) && (between < CommonParamsEnum.TEN.getValue())) { + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "已禁止登录，请10分钟后再试"); } //验证用户名和密码 User user = null; @@ -156,13 +156,13 @@ public class AdminController extends BaseController { userService.updateUserNormal(); logsService.saveByLogs(new Logs(LogsRecord.LOGIN, LogsRecord.LOGIN_SUCCESS, ServletUtil.getClientIP(request), DateUtil.date())); log.info("用户[{}]登录成功。", aUser.getUserDisplayName()); - return new JsonResult(ResultCode.SUCCESS.getCode(), "登录成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "登录成功！"); } else { //更新失败次数 Integer errorCount = userService.updateUserLoginError(); //超过五次禁用账户 - if (errorCount >= CommonParams.FIVE.getValue()) { - userService.updateUserLoginEnable(TrueFalse.FALSE.getDesc()); + if (errorCount >= CommonParamsEnum.FIVE.getValue()) { + userService.updateUserLoginEnable(TrueFalseEnum.FALSE.getDesc()); } logsService.saveByLogs( new Logs( @@ -172,7 +172,7 @@ public class AdminController extends BaseController { DateUtil.date() ) ); - return new JsonResult(ResultCode.FAIL.getCode(), "登录失败，你还有" + (5 - errorCount) + "次机会。"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "登录失败，你还有" + (5 - errorCount) + "次机会。"); } } 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 7ef29af3d..458f6863c 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 @@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.Attachment; import cc.ryanc.halo.model.domain.Logs; import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.dto.LogsRecord; -import cc.ryanc.halo.model.enums.PostType; -import cc.ryanc.halo.model.enums.ResultCode; +import cc.ryanc.halo.model.enums.PostTypeEnum; +import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.AttachmentService; import cc.ryanc.halo.service.LogsService; import cc.ryanc.halo.utils.HaloUtils; @@ -87,7 +87,7 @@ public class AttachmentController { Page attachments = attachmentService.findAllAttachments(pageable); model.addAttribute("attachments", attachments); model.addAttribute("id", id); - if (StringUtils.equals(type, PostType.POST_TYPE_POST.getDesc())) { + if (StringUtils.equals(type, PostTypeEnum.POST_TYPE_POST.getDesc())) { return "admin/widget/_attachment-select-post"; } return "admin/widget/_attachment-select"; @@ -226,13 +226,13 @@ public class AttachmentController { ); } else { log.error("删除附件[{}]失败！", delFileName); - return new JsonResult(ResultCode.FAIL.getCode(), "删除失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "删除失败！"); } } } catch (Exception e) { log.error("删除附件[{}]失败:{}", delFileName, e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "删除失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "删除失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "删除成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "删除成功！"); } } 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 21a9b5621..cebf987ac 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 @@ -59,12 +59,12 @@ public class BackupController { @GetMapping public String backup(@RequestParam(value = "type", defaultValue = "resources") String type, Model model) { List backups = null; - if (StringUtils.equals(type, BackupType.RESOURCES.getDesc())) { - backups = HaloUtils.getBackUps(BackupType.RESOURCES.getDesc()); - } else if (StringUtils.equals(type, BackupType.DATABASES.getDesc())) { - backups = HaloUtils.getBackUps(BackupType.DATABASES.getDesc()); - } else if (StringUtils.equals(type, BackupType.POSTS.getDesc())) { - backups = HaloUtils.getBackUps(BackupType.POSTS.getDesc()); + if (StringUtils.equals(type, BackupTypeEnum.RESOURCES.getDesc())) { + backups = HaloUtils.getBackUps(BackupTypeEnum.RESOURCES.getDesc()); + } else if (StringUtils.equals(type, BackupTypeEnum.DATABASES.getDesc())) { + backups = HaloUtils.getBackUps(BackupTypeEnum.DATABASES.getDesc()); + } else if (StringUtils.equals(type, BackupTypeEnum.POSTS.getDesc())) { + backups = HaloUtils.getBackUps(BackupTypeEnum.POSTS.getDesc()); } else { backups = new ArrayList<>(); } @@ -82,14 +82,14 @@ public class BackupController { @GetMapping(value = "doBackup") @ResponseBody public JsonResult doBackup(@RequestParam("type") String type) { - if (StringUtils.equals(BackupType.RESOURCES.getDesc(), type)) { + if (StringUtils.equals(BackupTypeEnum.RESOURCES.getDesc(), type)) { return this.backupResources(); - } else if (StringUtils.equals(BackupType.DATABASES.getDesc(), type)) { + } else if (StringUtils.equals(BackupTypeEnum.DATABASES.getDesc(), type)) { return this.backupDatabase(); - } else if (StringUtils.equals(BackupType.POSTS.getDesc(), type)) { + } else if (StringUtils.equals(BackupTypeEnum.POSTS.getDesc(), type)) { return this.backupPosts(); } else { - return new JsonResult(ResultCode.FAIL.getCode(), "备份失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "备份失败！"); } } @@ -100,7 +100,7 @@ public class BackupController { */ public JsonResult backupDatabase() { try { - if (HaloUtils.getBackUps(BackupType.DATABASES.getDesc()).size() > CommonParams.TEN.getValue()) { + if (HaloUtils.getBackUps(BackupTypeEnum.DATABASES.getDesc()).size() > CommonParamsEnum.TEN.getValue()) { FileUtil.del(System.getProperties().getProperty("user.home") + "/halo/backup/databases/"); } String srcPath = System.getProperties().getProperty("user.home") + "/halo/"; @@ -108,10 +108,10 @@ public class BackupController { //压缩文件 ZipUtil.zip(srcPath + "halo.mv.db", System.getProperties().getProperty("user.home") + "/halo/backup/databases/" + distName + ".zip"); log.info("当前时间：{}，执行了数据库备份。", DateUtil.now()); - return new JsonResult(ResultCode.SUCCESS.getCode(), "备份成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "备份成功！"); } catch (Exception e) { log.error("备份数据库失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "备份失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "备份失败！"); } } @@ -122,7 +122,7 @@ public class BackupController { */ public JsonResult backupResources() { try { - if (HaloUtils.getBackUps(BackupType.RESOURCES.getDesc()).size() > CommonParams.TEN.getValue()) { + if (HaloUtils.getBackUps(BackupTypeEnum.RESOURCES.getDesc()).size() > CommonParamsEnum.TEN.getValue()) { FileUtil.del(System.getProperties().getProperty("user.home") + "/halo/backup/resources/"); } File path = new File(ResourceUtils.getURL("classpath:").getPath()); @@ -131,10 +131,10 @@ public class BackupController { //执行打包 ZipUtil.zip(srcPath, System.getProperties().getProperty("user.home") + "/halo/backup/resources/" + distName + ".zip"); log.info("当前时间：{}，执行了资源文件备份。", DateUtil.now()); - return new JsonResult(ResultCode.SUCCESS.getCode(), "备份成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "备份成功！"); } catch (Exception e) { log.error("备份资源文件失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "备份失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "备份失败！"); } } @@ -144,10 +144,10 @@ public class BackupController { * @return JsonResult */ public JsonResult backupPosts() { - List posts = postService.findAllPosts(PostType.POST_TYPE_POST.getDesc()); - posts.addAll(postService.findAllPosts(PostType.POST_TYPE_PAGE.getDesc())); + List posts = postService.findAllPosts(PostTypeEnum.POST_TYPE_POST.getDesc()); + posts.addAll(postService.findAllPosts(PostTypeEnum.POST_TYPE_PAGE.getDesc())); try { - if (HaloUtils.getBackUps(BackupType.POSTS.getDesc()).size() > CommonParams.TEN.getValue()) { + if (HaloUtils.getBackUps(BackupTypeEnum.POSTS.getDesc()).size() > CommonParamsEnum.TEN.getValue()) { FileUtil.del(System.getProperties().getProperty("user.home") + "/halo/backup/posts/"); } //打包好的文件名 @@ -160,10 +160,10 @@ public class BackupController { ZipUtil.zip(srcPath, srcPath + ".zip"); FileUtil.del(srcPath); log.info("当前时间：{}，执行了文章备份。", DateUtil.now()); - return new JsonResult(ResultCode.SUCCESS.getCode(), "备份成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "备份成功！"); } catch (Exception e) { log.error("备份文章失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "备份失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "备份失败！"); } } @@ -181,9 +181,9 @@ public class BackupController { String srcPath = System.getProperties().getProperty("user.home") + "/halo/backup/" + type + "/" + fileName; try { FileUtil.del(srcPath); - return new JsonResult(ResultCode.SUCCESS.getCode(), "删除成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "删除成功！"); } catch (Exception e) { - return new JsonResult(ResultCode.FAIL.getCode(), "删除失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "删除失败！"); } } @@ -202,13 +202,13 @@ public class BackupController { String srcPath = System.getProperties().getProperty("user.home") + "/halo/backup/" + type + "/" + fileName; User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY); if (null == user.getUserEmail() || StringUtils.equals(user.getUserEmail(), "")) { - return new JsonResult(ResultCode.FAIL.getCode(), "博主邮箱没有配置！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "博主邮箱没有配置！"); } - if (StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.SMTP_EMAIL_ENABLE.getProp()), TrueFalse.FALSE.getDesc())) { - return new JsonResult(ResultCode.FAIL.getCode(), "发信邮箱没有配置！"); + if (StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.SMTP_EMAIL_ENABLE.getProp()), TrueFalseEnum.FALSE.getDesc())) { + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "发信邮箱没有配置！"); } new EmailToAdmin(srcPath, user).start(); - return new JsonResult(ResultCode.SUCCESS.getCode(), "邮件发送成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "邮件发送成功！"); } /** 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 f73558739..1dac2bf62 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 @@ -4,10 +4,10 @@ import cc.ryanc.halo.model.domain.Comment; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.User; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.CommentStatus; -import cc.ryanc.halo.model.enums.PostType; -import cc.ryanc.halo.model.enums.TrueFalse; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.CommentStatusEnum; +import cc.ryanc.halo.model.enums.PostTypeEnum; +import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.MailService; import cc.ryanc.halo.service.PostService; @@ -78,9 +78,9 @@ public class CommentController extends BaseController { Pageable pageable = PageRequest.of(page, size, sort); Page comments = commentService.findAllComments(status, pageable); model.addAttribute("comments", comments); - model.addAttribute("publicCount", commentService.getCountByStatus(CommentStatus.PUBLISHED.getCode())); - model.addAttribute("checkCount", commentService.getCountByStatus(CommentStatus.CHECKING.getCode())); - model.addAttribute("trashCount", commentService.getCountByStatus(CommentStatus.RECYCLE.getCode())); + model.addAttribute("publicCount", commentService.getCountByStatus(CommentStatusEnum.PUBLISHED.getCode())); + model.addAttribute("checkCount", commentService.getCountByStatus(CommentStatusEnum.CHECKING.getCode())); + model.addAttribute("trashCount", commentService.getCountByStatus(CommentStatusEnum.RECYCLE.getCode())); model.addAttribute("status", status); return "admin/admin_comment"; } @@ -97,7 +97,7 @@ public class CommentController extends BaseController { @PathParam("status") String status, @RequestParam(value = "page", defaultValue = "0") Integer page) { try { - commentService.updateCommentStatus(commentId, CommentStatus.RECYCLE.getCode()); + commentService.updateCommentStatus(commentId, CommentStatusEnum.RECYCLE.getCode()); } catch (Exception e) { log.error("删除评论失败：{}", e.getMessage()); } @@ -116,7 +116,7 @@ public class CommentController extends BaseController { public String moveToPublish(@PathParam("commentId") Long commentId, @PathParam("status") Integer status, HttpSession session) { - Comment comment = commentService.updateCommentStatus(commentId, CommentStatus.PUBLISHED.getCode()); + Comment comment = commentService.updateCommentStatus(commentId, CommentStatusEnum.PUBLISHED.getCode()); Post post = comment.getPost(); User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY); @@ -170,7 +170,7 @@ public class CommentController extends BaseController { Comment lastComment = commentService.findCommentById(commentId).get(); //修改被回复的评论的状态 - lastComment.setCommentStatus(CommentStatus.PUBLISHED.getCode()); + lastComment.setCommentStatus(CommentStatusEnum.PUBLISHED.getCode()); commentService.saveByComment(lastComment); //保存评论 @@ -178,7 +178,7 @@ public class CommentController extends BaseController { comment.setPost(post); comment.setCommentAuthor(user.getUserDisplayName()); comment.setCommentAuthorEmail(user.getUserEmail()); - comment.setCommentAuthorUrl(HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp())); + comment.setCommentAuthorUrl(HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp())); comment.setCommentAuthorIp(ServletUtil.getClientIP(request)); comment.setCommentAuthorAvatarMd5(SecureUtil.md5(user.getUserEmail())); comment.setCommentDate(DateUtil.date()); @@ -186,7 +186,7 @@ public class CommentController extends BaseController { comment.setCommentContent(lastContent + OwoUtil.markToImg(HtmlUtil.encode(commentContent))); comment.setCommentAgent(userAgent); comment.setCommentParent(commentId); - comment.setCommentStatus(CommentStatus.PUBLISHED.getCode()); + comment.setCommentStatus(CommentStatusEnum.PUBLISHED.getCode()); comment.setIsAdmin(1); commentService.saveByComment(comment); @@ -219,23 +219,23 @@ public class CommentController extends BaseController { @Override public void run() { - if (StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.SMTP_EMAIL_ENABLE.getProp()), TrueFalse.TRUE.getDesc()) && StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.COMMENT_REPLY_NOTICE.getProp()), TrueFalse.TRUE.getDesc())) { + 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 map = new HashMap<>(); - map.put("blogTitle", HaloConst.OPTIONS.get(BlogProperties.BLOG_TITLE.getProp())); + map.put("blogTitle", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp())); map.put("commentAuthor", lastComment.getCommentAuthor()); map.put("pageName", lastComment.getPost().getPostTitle()); - if (StringUtils.equals(post.getPostType(), PostType.POST_TYPE_POST.getDesc())) { - map.put("pageUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); + 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 { - map.put("pageUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); + map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); } map.put("commentContent", lastComment.getCommentContent()); map.put("replyAuthor", user.getUserDisplayName()); map.put("replyContent", commentContent); - map.put("blogUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp())); + map.put("blogUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp())); mailService.sendTemplateMail( - lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "的评论有了新回复", map, "common/mail/mail_reply.ftl"); + lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论有了新回复", map, "common/mail/mail_reply.ftl"); } } } @@ -260,23 +260,23 @@ public class CommentController extends BaseController { @Override public void run() { - if (StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.SMTP_EMAIL_ENABLE.getProp()), TrueFalse.TRUE.getDesc()) && StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.COMMENT_REPLY_NOTICE.getProp()), TrueFalse.TRUE.getDesc())) { + 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 map = new HashMap<>(); - if (StringUtils.equals(post.getPostType(), PostType.POST_TYPE_POST.getDesc())) { - map.put("pageUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); + 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 { - map.put("pageUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); + map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); } map.put("pageName", post.getPostTitle()); map.put("commentContent", comment.getCommentContent()); - map.put("blogUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp())); - map.put("blogTitle", HaloConst.OPTIONS.get(BlogProperties.BLOG_TITLE.getProp())); + map.put("blogUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp())); + map.put("blogTitle", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp())); map.put("author", user.getUserDisplayName()); mailService.sendTemplateMail( comment.getCommentAuthorEmail(), - "您在" + HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail/mail_passed.ftl"); + "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail/mail_passed.ftl"); } } catch (Exception e) { log.error("邮件服务器未配置：{}", e.getMessage()); diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java index c27d9ade1..2a4558866 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/OptionController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResultCode; +import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.OptionsService; import freemarker.template.Configuration; import lombok.extern.slf4j.Slf4j; @@ -57,10 +57,10 @@ public class OptionController { HaloConst.OPTIONS.clear(); HaloConst.OPTIONS = optionsService.findAllOptions(); log.info("所保存的设置选项列表：" + options); - return new JsonResult(ResultCode.SUCCESS.getCode(), "保存成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "保存成功！"); } catch (Exception e) { log.error("保存设置选项失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "保存失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "保存失败！"); } } } 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 e6d18dba0..14aca7abf 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 @@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.*; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.dto.LogsRecord; -import cc.ryanc.halo.model.enums.PostType; -import cc.ryanc.halo.model.enums.ResultCode; +import cc.ryanc.halo.model.enums.PostTypeEnum; +import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.GalleryService; import cc.ryanc.halo.service.LinkService; import cc.ryanc.halo.service.LogsService; @@ -65,7 +65,7 @@ public class PageController { */ @GetMapping public String pages(Model model) { - List posts = postService.findAllPosts(PostType.POST_TYPE_PAGE.getDesc()); + List posts = postService.findAllPosts(PostTypeEnum.POST_TYPE_PAGE.getDesc()); model.addAttribute("pages", posts); return "admin/admin_page"; } @@ -191,9 +191,9 @@ public class PageController { galleryService.removeByGalleryId(galleryId); } catch (Exception e) { log.error("删除图片失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "删除失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "删除失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "删除成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "删除成功！"); } @@ -222,7 +222,7 @@ public class PageController { //发表用户 User user = (User) session.getAttribute(HaloConst.USER_SESSION_KEY); post.setUser(user); - post.setPostType(PostType.POST_TYPE_PAGE.getDesc()); + post.setPostType(PostTypeEnum.POST_TYPE_PAGE.getDesc()); if (null != post.getPostId()) { post.setPostViews(postService.findByPostId(post.getPostId()).get().getPostViews()); post.setPostDate(postService.findByPostId(post.getPostId()).get().getPostDate()); @@ -234,10 +234,10 @@ public class PageController { } postService.saveByPost(post); logsService.saveByLogs(new Logs(LogsRecord.PUSH_PAGE, post.getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date())); - return new JsonResult(ResultCode.SUCCESS.getCode(), msg); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg); } catch (Exception e) { log.error("保存页面失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "保存失败"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "保存失败"); } } @@ -264,11 +264,11 @@ public class PageController { @GetMapping(value = "/checkUrl") @ResponseBody public JsonResult checkUrlExists(@PathParam("postUrl") String postUrl) { - Post post = postService.findByPostUrl(postUrl, PostType.POST_TYPE_PAGE.getDesc()); + Post post = postService.findByPostUrl(postUrl, PostTypeEnum.POST_TYPE_PAGE.getDesc()); // TODO 还没写完 if (null != post || StringUtils.equals("archives", postUrl) || StringUtils.equals("galleries", postUrl)) { - return new JsonResult(ResultCode.FAIL.getCode(), "该路径已经存在！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "该路径已经存在！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), ""); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), ""); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java index eeece45b1..03bb821dd 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java @@ -4,10 +4,10 @@ import cc.ryanc.halo.model.domain.*; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.dto.LogsRecord; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.PostStatus; -import cc.ryanc.halo.model.enums.PostType; -import cc.ryanc.halo.model.enums.ResultCode; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.PostStatusEnum; +import cc.ryanc.halo.model.enums.PostTypeEnum; +import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.CategoryService; import cc.ryanc.halo.service.LogsService; import cc.ryanc.halo.service.PostService; @@ -94,11 +94,11 @@ public class PostController extends BaseController { @RequestParam(value = "size", defaultValue = "10") Integer size) { Sort sort = new Sort(Sort.Direction.DESC, "postDate"); Pageable pageable = PageRequest.of(page, size, sort); - Page posts = postService.findPostByStatus(status, PostType.POST_TYPE_POST.getDesc(), pageable); + Page posts = postService.findPostByStatus(status, PostTypeEnum.POST_TYPE_POST.getDesc(), pageable); model.addAttribute("posts", posts); - model.addAttribute("publishCount", postService.getCountByStatus(PostStatus.PUBLISHED.getCode())); - model.addAttribute("draftCount", postService.getCountByStatus(PostStatus.DRAFT.getCode())); - model.addAttribute("trashCount", postService.getCountByStatus(PostStatus.RECYCLE.getCode())); + model.addAttribute("publishCount", postService.getCountByStatus(PostStatusEnum.PUBLISHED.getCode())); + model.addAttribute("draftCount", postService.getCountByStatus(PostStatusEnum.DRAFT.getCode())); + model.addAttribute("trashCount", postService.getCountByStatus(PostStatusEnum.RECYCLE.getCode())); model.addAttribute("status", status); return "admin/admin_post"; } @@ -168,8 +168,8 @@ public class PostController extends BaseController { try { //提取摘要 int postSummary = 50; - if (StringUtils.isNotEmpty(HaloConst.OPTIONS.get(BlogProperties.POST_SUMMARY.getProp()))) { - postSummary = Integer.parseInt(HaloConst.OPTIONS.get(BlogProperties.POST_SUMMARY.getProp())); + if (StringUtils.isNotEmpty(HaloConst.OPTIONS.get(BlogPropertiesEnum.POST_SUMMARY.getProp()))) { + postSummary = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.POST_SUMMARY.getProp())); } //文章摘要 String summaryText = HtmlUtil.cleanHtmlTag(post.getPostContent()); @@ -200,10 +200,10 @@ public class PostController extends BaseController { post.setPostUrl(urlFilter(post.getPostUrl())); postService.saveByPost(post); logsService.saveByLogs(new Logs(LogsRecord.PUSH_POST, post.getPostTitle(), ServletUtil.getClientIP(request), DateUtil.date())); - return new JsonResult(ResultCode.SUCCESS.getCode(), msg); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg); } catch (Exception e) { log.error("保存文章失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "保存失败"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "保存失败"); } } @@ -256,9 +256,9 @@ public class PostController extends BaseController { post.setUser(user); } catch (Exception e) { log.error("未知错误：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "保存失败"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "保存失败"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "保存成功", postService.saveByPost(post)); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "保存成功", postService.saveByPost(post)); } @@ -271,7 +271,7 @@ public class PostController extends BaseController { @GetMapping("/throw") public String moveToTrash(@RequestParam("postId") Long postId, @RequestParam("status") Integer status) { try { - postService.updatePostStatus(postId, PostStatus.RECYCLE.getCode()); + postService.updatePostStatus(postId, PostStatusEnum.RECYCLE.getCode()); log.info("编号为" + postId + "的文章已被移到回收站"); } catch (Exception e) { log.error("删除文章到回收站失败：{}", e.getMessage()); @@ -289,7 +289,7 @@ public class PostController extends BaseController { public String moveToPublish(@RequestParam("postId") Long postId, @RequestParam("status") Integer status) { try { - postService.updatePostStatus(postId, PostStatus.PUBLISHED.getCode()); + postService.updatePostStatus(postId, PostStatusEnum.PUBLISHED.getCode()); log.info("编号为" + postId + "的文章已改变为发布状态"); } catch (Exception e) { log.error("发布文章失败：{}", e.getMessage()); @@ -312,7 +312,7 @@ public class PostController extends BaseController { } catch (Exception e) { log.error("删除文章失败：{}", e.getMessage()); } - if (StringUtils.equals(PostType.POST_TYPE_POST.getDesc(), postType)) { + if (StringUtils.equals(PostTypeEnum.POST_TYPE_POST.getDesc(), postType)) { return "redirect:/admin/posts?status=2"; } return "redirect:/admin/page"; @@ -346,9 +346,9 @@ public class PostController extends BaseController { } catch (Exception e) { log.error("更新摘要失败：{}", e.getMessage()); e.printStackTrace(); - return new JsonResult(ResultCode.FAIL.getCode(), "更新失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "更新失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "所有文章摘要更新成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "所有文章摘要更新成功！"); } /** @@ -361,7 +361,7 @@ public class PostController extends BaseController { @ResponseBody public boolean checkUrlExists(@PathParam("postUrl") String postUrl) { postUrl = urlFilter(postUrl); - Post post = postService.findByPostUrl(postUrl, PostType.POST_TYPE_POST.getDesc()); + Post post = postService.findByPostUrl(postUrl, PostTypeEnum.POST_TYPE_POST.getDesc()); return null != post; } @@ -375,10 +375,10 @@ public class PostController extends BaseController { @ResponseBody public JsonResult pushAllToBaidu(@PathParam("baiduToken") String baiduToken) { if (StringUtils.isEmpty(baiduToken)) { - return new JsonResult(ResultCode.FAIL.getCode(), "百度推送Token为空！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "百度推送Token为空！"); } - String blogUrl = HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()); - List posts = postService.findAllPosts(PostType.POST_TYPE_POST.getDesc()); + String blogUrl = HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()); + List posts = postService.findAllPosts(PostTypeEnum.POST_TYPE_POST.getDesc()); StringBuilder urls = new StringBuilder(); for (Post post : posts) { urls.append(blogUrl); @@ -388,8 +388,8 @@ public class PostController extends BaseController { } String result = HaloUtils.baiduPost(blogUrl, baiduToken, urls.toString()); if (StringUtils.isEmpty(result)) { - return new JsonResult(ResultCode.FAIL.getCode(), "推送所有文章成功！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "推送所有文章成功！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "推送成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "推送成功！"); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java index 653bc8ec7..3651c862d 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java @@ -4,8 +4,8 @@ import cc.ryanc.halo.model.domain.Logs; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.JsonResult; import cc.ryanc.halo.model.dto.LogsRecord; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.ResultCode; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.LogsService; import cc.ryanc.halo.service.OptionsService; import cc.ryanc.halo.utils.HaloUtils; @@ -79,17 +79,17 @@ public class ThemeController extends BaseController { HttpServletRequest request) { try { //保存主题设置项 - optionsService.saveOption(BlogProperties.THEME.getProp(), siteTheme); + optionsService.saveOption(BlogPropertiesEnum.THEME.getProp(), siteTheme); //设置主题 BaseController.THEME = siteTheme; log.info("已将主题改变为：{}", siteTheme); logsService.saveByLogs( new Logs(LogsRecord.CHANGE_THEME, "更换为" + siteTheme, ServletUtil.getClientIP(request), DateUtil.date()) ); - return new JsonResult(ResultCode.SUCCESS.getCode(), "主题已设置为" + siteTheme); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "主题已设置为" + siteTheme); } catch (Exception e) { log.error("主题设置失败，当前主题为：{}", siteTheme); - return new JsonResult(ResultCode.FAIL.getCode(), "主题设置失败"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "主题设置失败"); } } @@ -120,13 +120,13 @@ public class ThemeController extends BaseController { HaloConst.THEMES = HaloUtils.getThemes(); } else { log.error("上传主题失败，没有选择文件"); - return new JsonResult(ResultCode.FAIL.getCode(), "请选择上传的主题！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "请选择上传的主题！"); } } catch (Exception e) { log.error("上传主题失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "主题上传失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "主题上传失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "主题上传成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "主题上传成功！"); } /** @@ -208,7 +208,7 @@ public class ThemeController extends BaseController { public JsonResult saveTpl(@RequestParam("tplName") String tplName, @RequestParam("tplContent") String tplContent) { if (StringUtils.isBlank(tplContent)) { - return new JsonResult(ResultCode.FAIL.getCode(), "模板不能为空！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "模板不能为空！"); } try { //获取项目根路径 @@ -219,8 +219,8 @@ public class ThemeController extends BaseController { fileWriter.write(tplContent); } catch (Exception e) { log.error("模板保存失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "模板保存失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "模板保存失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "模板保存成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "模板保存成功！"); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java index 0f0729e3b..220f96e7e 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.model.domain.User; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResultCode; +import cc.ryanc.halo.model.enums.ResultCodeEnum; import cc.ryanc.halo.service.UserService; import cn.hutool.crypto.SecureUtil; import freemarker.template.Configuration; @@ -58,7 +58,7 @@ public class UserController { try { if (result.hasErrors()) { for (ObjectError error : result.getAllErrors()) { - return new JsonResult(ResultCode.FAIL.getCode(), error.getDefaultMessage()); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage()); } } userService.saveByUser(user); @@ -66,9 +66,9 @@ public class UserController { session.invalidate(); } catch (Exception e) { log.error("修改用户资料失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "修改失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "修改失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "修改成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "修改成功！"); } /** @@ -93,12 +93,12 @@ public class UserController { userService.saveByUser(user); session.invalidate(); } else { - return new JsonResult(ResultCode.FAIL.getCode(), "原密码错误！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "原密码错误！"); } } catch (Exception e) { log.error("修改密码失败：{}", e.getMessage()); - return new JsonResult(ResultCode.FAIL.getCode(), "密码修改失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "密码修改失败！"); } - return new JsonResult(ResultCode.SUCCESS.getCode(), "修改密码成功！"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "修改密码成功！"); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java index bd8820d1c..03ee87603 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiArchivesController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.dto.Archive; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.PostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -35,9 +35,9 @@ public class ApiArchivesController { public JsonResult archivesYear() { List archives = postService.findPostGroupByYear(); if (null != archives && archives.size() > 0) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), archives); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), archives); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } @@ -50,9 +50,9 @@ public class ApiArchivesController { public JsonResult archivesYearAndMonth() { List archives = postService.findPostGroupByYearAndMonth(); if (null != archives && archives.size() > 0) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), archives); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), archives); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java index 99012f9c5..a27a107f0 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Category; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.CategoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -36,9 +36,9 @@ public class ApiCategoryController { public JsonResult categories() { List categories = categoryService.findAllCategories(); if (null != categories && categories.size() > 0) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), categories); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), categories); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } @@ -52,9 +52,9 @@ public class ApiCategoryController { public JsonResult categories(@PathVariable("cateUrl") String cateUrl) { Category category = categoryService.findByCateUrl(cateUrl); if (null != category) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), category); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), category); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java index bf715efd8..ebf696148 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Gallery; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.GalleryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -37,9 +37,9 @@ public class ApiGalleryController { public JsonResult galleries() { List galleries = galleryService.findAllGalleries(); if (null != galleries && galleries.size() > 0) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), galleries); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), galleries); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } @@ -53,9 +53,9 @@ public class ApiGalleryController { public JsonResult galleries(@PathVariable("id") Long id) { Optional gallery = galleryService.findByGalleryId(id); if (gallery.isPresent()) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), gallery.get()); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), gallery.get()); } else { - return new JsonResult(ResponseStatus.NOTFOUND.getCode(), ResponseStatus.NOTFOUND.getMsg()); + return new JsonResult(ResponseStatusEnum.NOTFOUND.getCode(), ResponseStatusEnum.NOTFOUND.getMsg()); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java index 24931c9d5..dea40638a 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Link; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.LinkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -35,9 +35,9 @@ public class ApiLinkController { public JsonResult links() { List links = linkService.findAllLinks(); if (null != links && links.size() > 0) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), links); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), links); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiMenuController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiMenuController.java index 529a69f83..965d58e1e 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiMenuController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiMenuController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Menu; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.MenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -35,9 +35,9 @@ public class ApiMenuController { public JsonResult menus() { List menus = menuService.findAllMenus(); if (null != menus && menus.size() > 0) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), menus); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), menus); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java index d392a5a22..f47696dff 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiOptionController.java @@ -1,8 +1,8 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.OptionsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -36,12 +36,12 @@ public class ApiOptionController { public JsonResult options() { Map options = optionsService.findAllOptions(); //去掉隐私元素 - options.remove(BlogProperties.MAIL_SMTP_HOST.getProp()); - options.remove(BlogProperties.MAIL_FROM_NAME.getProp()); - options.remove(BlogProperties.MAIL_SMTP_PASSWORD.getProp()); - options.remove(BlogProperties.MAIL_SMTP_USERNAME.getProp()); - options.remove(BlogProperties.MAIL_SMTP_USERNAME.getProp()); - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), options); + options.remove(BlogPropertiesEnum.MAIL_SMTP_HOST.getProp()); + options.remove(BlogPropertiesEnum.MAIL_FROM_NAME.getProp()); + options.remove(BlogPropertiesEnum.MAIL_SMTP_PASSWORD.getProp()); + options.remove(BlogPropertiesEnum.MAIL_SMTP_USERNAME.getProp()); + options.remove(BlogPropertiesEnum.MAIL_SMTP_USERNAME.getProp()); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), options); } /** @@ -53,6 +53,6 @@ public class ApiOptionController { @GetMapping(value = "/{optionName}") public JsonResult option(@PathVariable(value = "optionName") String optionName) { String optionValue = optionsService.findOneOption(optionName); - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), optionValue); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), optionValue); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java index da6f39960..c5fd050f8 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiPageController.java @@ -2,8 +2,8 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.PostType; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.PostTypeEnum; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.PostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -34,11 +34,11 @@ public class ApiPageController { */ @GetMapping(value = "/{postId}") public JsonResult pages(@PathVariable(value = "postId") Long postId) { - Post post = postService.findByPostId(postId, PostType.POST_TYPE_PAGE.getDesc()); + Post post = postService.findByPostId(postId, PostTypeEnum.POST_TYPE_PAGE.getDesc()); if (null != post) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), post); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), post); } else { - return new JsonResult(ResponseStatus.NOTFOUND.getCode(), ResponseStatus.NOTFOUND.getMsg()); + return new JsonResult(ResponseStatusEnum.NOTFOUND.getCode(), ResponseStatusEnum.NOTFOUND.getMsg()); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java index ec99bd42a..1e66da75a 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiPostController.java @@ -3,10 +3,10 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.PostStatus; -import cc.ryanc.halo.model.enums.PostType; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.PostStatusEnum; +import cc.ryanc.halo.model.enums.PostTypeEnum; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.PostService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -46,24 +46,24 @@ public class ApiPostController { public JsonResult posts(@PathVariable(value = "page") Integer page) { Sort sort = new Sort(Sort.Direction.DESC, "postDate"); Integer size = 10; - if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp()))) { - size = Integer.parseInt(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp())); + if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()))) { + size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp())); } Pageable pageable = PageRequest.of(page - 1, size, sort); - Page posts = postService.findPostByStatus(PostStatus.PUBLISHED.getCode(), PostType.POST_TYPE_POST.getDesc(), pageable); + Page posts = postService.findPostByStatus(PostStatusEnum.PUBLISHED.getCode(), PostTypeEnum.POST_TYPE_POST.getDesc(), pageable); if (null == posts) { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), posts); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), posts); } @GetMapping(value = "/hot") public JsonResult hotPosts() { List posts = postService.hotPosts(); if (null != posts && posts.size() > 0) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), posts); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), posts); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } @@ -75,11 +75,11 @@ public class ApiPostController { */ @GetMapping(value = "/{postId}") public JsonResult posts(@PathVariable(value = "postId") Long postId) { - Post post = postService.findByPostId(postId, PostType.POST_TYPE_POST.getDesc()); + Post post = postService.findByPostId(postId, PostTypeEnum.POST_TYPE_POST.getDesc()); if (null != post) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), post); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), post); } else { - return new JsonResult(ResponseStatus.NOTFOUND.getCode(), ResponseStatus.NOTFOUND.getMsg()); + return new JsonResult(ResponseStatusEnum.NOTFOUND.getCode(), ResponseStatusEnum.NOTFOUND.getMsg()); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java index 54e23981c..6f40da8fc 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.Tag; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.TagService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -36,9 +36,9 @@ public class ApiTagController { public JsonResult tags() { List tags = tagService.findAllTags(); if (null != tags && tags.size() > 0) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), tags); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), tags); } else { - return new JsonResult(ResponseStatus.EMPTY.getCode(), ResponseStatus.EMPTY.getMsg()); + return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); } } @@ -52,9 +52,9 @@ public class ApiTagController { public JsonResult tags(@PathVariable("tagUrl") String tagUrl) { Tag tag = tagService.findByTagUrl(tagUrl); if (null != tag) { - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), tag); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), tag); } else { - return new JsonResult(ResponseStatus.NOTFOUND.getCode(), ResponseStatus.NOTFOUND.getMsg()); + return new JsonResult(ResponseStatusEnum.NOTFOUND.getCode(), ResponseStatusEnum.NOTFOUND.getMsg()); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiUserController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiUserController.java index 7e0534827..e10e9fdb4 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiUserController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiUserController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.api; import cc.ryanc.halo.model.domain.User; import cc.ryanc.halo.model.dto.JsonResult; -import cc.ryanc.halo.model.enums.ResponseStatus; +import cc.ryanc.halo.model.enums.ResponseStatusEnum; import cc.ryanc.halo.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -32,6 +32,6 @@ public class ApiUserController { @GetMapping public JsonResult user() { User user = userService.findUser(); - return new JsonResult(ResponseStatus.SUCCESS.getCode(), ResponseStatus.SUCCESS.getMsg(), user); + return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), user); } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java index 429314ce2..59d4bcd89 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java @@ -1,6 +1,6 @@ package cc.ryanc.halo.web.controller.core; -import cc.ryanc.halo.model.enums.CommonParams; +import cc.ryanc.halo.model.enums.CommonParamsEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.stereotype.Controller; @@ -31,7 +31,7 @@ public class CommonController implements ErrorController { @GetMapping(value = ERROR_PATH) public String handleError(HttpServletRequest request) { Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code"); - if (statusCode.equals(CommonParams.NOT_FOUND.getValue())) { + if (statusCode.equals(CommonParamsEnum.NOT_FOUND.getValue())) { return "redirect:/404"; } else { return "redirect:/500"; @@ -69,4 +69,4 @@ public class CommonController implements ErrorController { public String getErrorPath() { return ERROR_PATH; } -} \ No newline at end of file +} diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java index 4eeacd60d..f76073515 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java @@ -3,9 +3,9 @@ package cc.ryanc.halo.web.controller.core; import cc.ryanc.halo.model.domain.*; import cc.ryanc.halo.model.dto.HaloConst; import cc.ryanc.halo.model.dto.LogsRecord; -import cc.ryanc.halo.model.enums.AllowComment; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.TrueFalse; +import cc.ryanc.halo.model.enums.AllowCommentEnum; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.service.*; import cc.ryanc.halo.utils.HaloUtils; import cn.hutool.core.date.DateUtil; @@ -69,7 +69,7 @@ public class InstallController { @GetMapping public String install(Model model) { try { - if (StringUtils.equals(TrueFalse.TRUE.getDesc(), HaloConst.OPTIONS.get(BlogProperties.IS_INSTALL.getProp()))) { + if (StringUtils.equals(TrueFalseEnum.TRUE.getDesc(), HaloConst.OPTIONS.get(BlogPropertiesEnum.IS_INSTALL.getProp()))) { model.addAttribute("isInstall", true); } else { model.addAttribute("isInstall", false); @@ -102,7 +102,7 @@ public class InstallController { @RequestParam("userPwd") String userPwd, HttpServletRequest request) { try { - if (StringUtils.equals(TrueFalse.TRUE.getDesc(), HaloConst.OPTIONS.get(BlogProperties.IS_INSTALL.getProp()))) { + if (StringUtils.equals(TrueFalseEnum.TRUE.getDesc(), HaloConst.OPTIONS.get(BlogPropertiesEnum.IS_INSTALL.getProp()))) { return false; } //创建新的用户 @@ -137,7 +137,7 @@ public class InstallController { post.setPostUrl("hello-halo"); post.setUser(user); post.setCategories(categories); - post.setAllowComment(AllowComment.ALLOW.getCode()); + post.setAllowComment(AllowCommentEnum.ALLOW.getCode()); postService.saveByPost(post); //第一个评论 @@ -155,28 +155,28 @@ public class InstallController { comment.setIsAdmin(0); commentService.saveByComment(comment); - optionsService.saveOption(BlogProperties.IS_INSTALL.getProp(), TrueFalse.TRUE.getDesc()); + optionsService.saveOption(BlogPropertiesEnum.IS_INSTALL.getProp(), TrueFalseEnum.TRUE.getDesc()); //保存博客标题和博客地址设置 - optionsService.saveOption(BlogProperties.BLOG_TITLE.getProp(), blogTitle); - optionsService.saveOption(BlogProperties.BLOG_URL.getProp(), blogUrl); + optionsService.saveOption(BlogPropertiesEnum.BLOG_TITLE.getProp(), blogTitle); + optionsService.saveOption(BlogPropertiesEnum.BLOG_URL.getProp(), blogUrl); //设置默认主题 - optionsService.saveOption(BlogProperties.THEME.getProp(), "anatole"); + optionsService.saveOption(BlogPropertiesEnum.THEME.getProp(), "anatole"); //建立网站时间 - optionsService.saveOption(BlogProperties.BLOG_START.getProp(), HaloUtils.getStringDate("yyyy-MM-dd")); + optionsService.saveOption(BlogPropertiesEnum.BLOG_START.getProp(), HaloUtils.getStringDate("yyyy-MM-dd")); //默认评论系统 - optionsService.saveOption(BlogProperties.COMMENT_SYSTEM.getProp(), "native"); + optionsService.saveOption(BlogPropertiesEnum.COMMENT_SYSTEM.getProp(), "native"); //默认不配置邮件系统 - optionsService.saveOption(BlogProperties.SMTP_EMAIL_ENABLE.getProp(), TrueFalse.FALSE.getDesc()); + optionsService.saveOption(BlogPropertiesEnum.SMTP_EMAIL_ENABLE.getProp(), TrueFalseEnum.FALSE.getDesc()); //新评论，审核通过，回复，默认不通知 - optionsService.saveOption(BlogProperties.NEW_COMMENT_NOTICE.getProp(), TrueFalse.FALSE.getDesc()); - optionsService.saveOption(BlogProperties.COMMENT_PASS_NOTICE.getProp(), TrueFalse.FALSE.getDesc()); - optionsService.saveOption(BlogProperties.COMMENT_REPLY_NOTICE.getProp(), TrueFalse.FALSE.getDesc()); + optionsService.saveOption(BlogPropertiesEnum.NEW_COMMENT_NOTICE.getProp(), TrueFalseEnum.FALSE.getDesc()); + optionsService.saveOption(BlogPropertiesEnum.COMMENT_PASS_NOTICE.getProp(), TrueFalseEnum.FALSE.getDesc()); + optionsService.saveOption(BlogPropertiesEnum.COMMENT_REPLY_NOTICE.getProp(), TrueFalseEnum.FALSE.getDesc()); //更新日志 logsService.saveByLogs( diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java index 05e07a807..451a91eee 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java @@ -68,7 +68,7 @@ public class FrontArchiveController extends BaseController { //所有文章数据，分页，material主题适用 Sort sort = new Sort(Sort.Direction.DESC, "postDate"); Pageable pageable = PageRequest.of(page - 1, 5, sort); - Page posts = postService.findPostByStatus(PostStatus.PUBLISHED.getCode(), PostType.POST_TYPE_POST.getDesc(), pageable); + Page posts = postService.findPostByStatus(PostStatusEnum.PUBLISHED.getCode(), PostTypeEnum.POST_TYPE_POST.getDesc(), pageable); if (null == posts) { return this.renderNotFound(); } @@ -105,8 +105,8 @@ public class FrontArchiveController extends BaseController { */ @GetMapping(value = "{postUrl}") public String getPost(@PathVariable String postUrl, Model model) { - Post post = postService.findByPostUrl(postUrl, PostType.POST_TYPE_POST.getDesc()); - if (null == post || !post.getPostStatus().equals(PostStatus.PUBLISHED.getCode())) { + Post post = postService.findByPostUrl(postUrl, PostTypeEnum.POST_TYPE_POST.getDesc()); + if (null == post || !post.getPostStatus().equals(PostStatusEnum.PUBLISHED.getCode())) { return this.renderNotFound(); } //获得当前文章的发布日期 @@ -123,10 +123,10 @@ public class FrontArchiveController extends BaseController { model.addAttribute("afterPost", afterPosts.get(afterPosts.size() - 1)); } List comments = null; - if (StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.NEW_COMMENT_NEED_CHECK.getProp()), TrueFalse.TRUE.getDesc()) || HaloConst.OPTIONS.get(BlogProperties.NEW_COMMENT_NEED_CHECK.getProp()) == null) { - comments = commentService.findCommentsByPostAndCommentStatus(post, CommentStatus.PUBLISHED.getCode()); + if (StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()), TrueFalseEnum.TRUE.getDesc()) || HaloConst.OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()) == null) { + comments = commentService.findCommentsByPostAndCommentStatus(post, CommentStatusEnum.PUBLISHED.getCode()); } else { - comments = commentService.findCommentsByPostAndCommentStatusNot(post, CommentStatus.RECYCLE.getCode()); + comments = commentService.findCommentsByPostAndCommentStatusNot(post, CommentStatusEnum.RECYCLE.getCode()); } model.addAttribute("post", post); model.addAttribute("comments", CommentUtil.getComments(comments)); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java index 56a9b581b..5424503e9 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java @@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.front; import cc.ryanc.halo.model.domain.Category; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.CategoryService; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.web.controller.core.BaseController; @@ -82,8 +82,8 @@ public class FrontCategoryController extends BaseController { } Sort sort = new Sort(Sort.Direction.DESC, "postDate"); Integer size = 10; - if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp()))) { - size = Integer.parseInt(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp())); + if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()))) { + size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp())); } Pageable pageable = PageRequest.of(page - 1, size, sort); Page posts = postService.findPostByCategories(category, pageable); 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 142a893ad..e697bc7e6 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 @@ -71,7 +71,7 @@ public class FrontCommentController { Optional post = postService.findByPostId(postId); Sort sort = new Sort(Sort.Direction.DESC, "commentDate"); Pageable pageable = PageRequest.of(0, 999, sort); - List comments = commentService.findCommentsByPostAndCommentStatus(post.get(), pageable, CommentStatus.PUBLISHED.getCode()).getContent(); + List comments = commentService.findCommentsByPostAndCommentStatus(post.get(), pageable, CommentStatusEnum.PUBLISHED.getCode()).getContent(); return CommentUtil.getComments(comments); } @@ -88,7 +88,7 @@ public class FrontCommentController { @RequestParam(value = "post") Post post) { Sort sort = new Sort(Sort.Direction.DESC, "commentDate"); Pageable pageable = PageRequest.of(page - 1, 10, sort); - List comments = commentService.findCommentsByPostAndCommentStatus(post, pageable, CommentStatus.PUBLISHED.getCode()).getContent(); + List comments = commentService.findCommentsByPostAndCommentStatus(post, pageable, CommentStatusEnum.PUBLISHED.getCode()).getContent(); return comments; } @@ -108,7 +108,7 @@ public class FrontCommentController { HttpServletRequest request) { if (result.hasErrors()) { for (ObjectError error : result.getAllErrors()) { - return new JsonResult(ResultCode.FAIL.getCode(), error.getDefaultMessage()); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage()); } } try { @@ -138,13 +138,13 @@ public class FrontCommentController { } else { new EmailToAdmin(comment, post).start(); } - if (StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.NEW_COMMENT_NEED_CHECK.getProp()), TrueFalse.TRUE.getDesc()) || HaloConst.OPTIONS.get(BlogProperties.NEW_COMMENT_NEED_CHECK.getProp()) == null) { - return new JsonResult(ResultCode.SUCCESS.getCode(), "你的评论已经提交，待博主审核之后可显示。"); + if (StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()), TrueFalseEnum.TRUE.getDesc()) || HaloConst.OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()) == null) { + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "你的评论已经提交，待博主审核之后可显示。"); } else { - return new JsonResult(ResultCode.SUCCESS.getCode(), "你的评论已经提交，刷新后即可显示。"); + return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), "你的评论已经提交，刷新后即可显示。"); } } catch (Exception e) { - return new JsonResult(ResultCode.FAIL.getCode(), "评论失败！"); + return new JsonResult(ResultCodeEnum.FAIL.getCode(), "评论失败！"); } } @@ -162,16 +162,16 @@ public class FrontCommentController { @Override public void run() { - if (StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.SMTP_EMAIL_ENABLE.getProp()), TrueFalse.TRUE.getDesc()) && StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.NEW_COMMENT_NOTICE.getProp()), TrueFalse.TRUE.getDesc())) { + 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 map = new HashMap<>(); map.put("author", userService.findUser().getUserDisplayName()); map.put("pageName", post.getPostTitle()); - if (StringUtils.equals(post.getPostType(), PostType.POST_TYPE_POST.getDesc())) { - map.put("pageUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); + 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 { - map.put("pageUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); + map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); } map.put("visitor", comment.getCommentAuthor()); map.put("commentContent", comment.getCommentContent()); @@ -200,23 +200,23 @@ public class FrontCommentController { @Override public void run() { //发送通知给对方 - if (StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.SMTP_EMAIL_ENABLE.getProp()), TrueFalse.TRUE.getDesc()) && StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.NEW_COMMENT_NOTICE.getProp()), TrueFalse.TRUE.getDesc())) { + 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 map = new HashMap<>(); - map.put("blogTitle", HaloConst.OPTIONS.get(BlogProperties.BLOG_TITLE.getProp())); + map.put("blogTitle", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp())); map.put("commentAuthor", lastComment.getCommentAuthor()); map.put("pageName", lastComment.getPost().getPostTitle()); - if (StringUtils.equals(post.getPostType(), PostType.POST_TYPE_POST.getDesc())) { - map.put("pageUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); + 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 { - map.put("pageUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); + map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId()); } map.put("commentContent", lastComment.getCommentContent()); map.put("replyAuthor", comment.getCommentAuthor()); map.put("replyContent", comment.getCommentContent()); - map.put("blogUrl", HaloConst.OPTIONS.get(BlogProperties.BLOG_URL.getProp())); + map.put("blogUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp())); mailService.sendTemplateMail( - lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogProperties.BLOG_TITLE.getProp()) + "的评论有了新回复", map, "common/mail/mail_reply.ftl"); + lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp()) + "的评论有了新回复", map, "common/mail/mail_reply.ftl"); } } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java index e40960686..dfc1dccbe 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java @@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.front; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.web.controller.core.BaseController; import lombok.extern.slf4j.Slf4j; @@ -66,8 +66,8 @@ public class FrontIndexController extends BaseController { //默认显示10条 Integer size = 10; //尝试加载设置选项，用于设置显示条数 - if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp()))) { - size = Integer.parseInt(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp())); + if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()))) { + size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp())); } //所有文章数据，分页 Pageable pageable = PageRequest.of(page - 1, size, sort); @@ -92,8 +92,8 @@ public class FrontIndexController extends BaseController { //默认显示10条 Integer size = 10; //尝试加载设置选项，用于设置显示条数 - if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp()))) { - size = Integer.parseInt(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp())); + if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()))) { + size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp())); } //文章数据，只获取文章，没有分页 diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java index 903db1369..7cdd76ecc 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontOthersController.java @@ -2,8 +2,8 @@ package cc.ryanc.halo.web.controller.front; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.PostType; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.PostTypeEnum; import cc.ryanc.halo.service.PostService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -39,14 +39,14 @@ public class FrontOthersController { @GetMapping(value = {"feed", "feed.xml", "atom", "atom.xml"}, produces = "application/xml;charset=UTF-8") @ResponseBody public String feed() { - String rssPosts = HaloConst.OPTIONS.get(BlogProperties.RSS_POSTS.getProp()); + String rssPosts = HaloConst.OPTIONS.get(BlogPropertiesEnum.RSS_POSTS.getProp()); if (StringUtils.isBlank(rssPosts)) { rssPosts = "20"; } //获取文章列表并根据时间排序 Sort sort = new Sort(Sort.Direction.DESC, "postDate"); Pageable pageable = PageRequest.of(0, Integer.parseInt(rssPosts), sort); - Page postsPage = postService.findPostByStatus(0, PostType.POST_TYPE_POST.getDesc(), pageable); + Page postsPage = postService.findPostByStatus(0, PostTypeEnum.POST_TYPE_POST.getDesc(), pageable); List posts = postsPage.getContent(); return postService.buildRss(posts); } @@ -62,7 +62,7 @@ public class FrontOthersController { //获取文章列表并根据时间排序 Sort sort = new Sort(Sort.Direction.DESC, "postDate"); Pageable pageable = PageRequest.of(0, 999, sort); - Page postsPage = postService.findPostByStatus(0, PostType.POST_TYPE_POST.getDesc(), pageable); + Page postsPage = postService.findPostByStatus(0, PostTypeEnum.POST_TYPE_POST.getDesc(), pageable); List posts = postsPage.getContent(); return postService.buildSiteMap(posts); } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java index 60dae0ab3..ae7c510a2 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java @@ -4,10 +4,10 @@ import cc.ryanc.halo.model.domain.Comment; import cc.ryanc.halo.model.domain.Gallery; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.CommentStatus; -import cc.ryanc.halo.model.enums.PostType; -import cc.ryanc.halo.model.enums.TrueFalse; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.CommentStatusEnum; +import cc.ryanc.halo.model.enums.PostTypeEnum; +import cc.ryanc.halo.model.enums.TrueFalseEnum; import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.GalleryService; import cc.ryanc.halo.service.PostService; @@ -73,15 +73,15 @@ public class FrontPageController extends BaseController { */ @GetMapping(value = "/p/{postUrl}") public String getPage(@PathVariable(value = "postUrl") String postUrl, Model model) { - Post post = postService.findByPostUrl(postUrl, PostType.POST_TYPE_PAGE.getDesc()); + Post post = postService.findByPostUrl(postUrl, PostTypeEnum.POST_TYPE_PAGE.getDesc()); if (null == post) { return this.renderNotFound(); } List comments = null; - if (StringUtils.equals(HaloConst.OPTIONS.get(BlogProperties.NEW_COMMENT_NEED_CHECK.getProp()), TrueFalse.TRUE.getDesc()) || HaloConst.OPTIONS.get(BlogProperties.NEW_COMMENT_NEED_CHECK.getProp()) == null) { - comments = commentService.findCommentsByPostAndCommentStatus(post, CommentStatus.PUBLISHED.getCode()); + if (StringUtils.equals(HaloConst.OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()), TrueFalseEnum.TRUE.getDesc()) || HaloConst.OPTIONS.get(BlogPropertiesEnum.NEW_COMMENT_NEED_CHECK.getProp()) == null) { + comments = commentService.findCommentsByPostAndCommentStatus(post, CommentStatusEnum.PUBLISHED.getCode()); } else { - comments = commentService.findCommentsByPostAndCommentStatusNot(post, CommentStatus.RECYCLE.getCode()); + comments = commentService.findCommentsByPostAndCommentStatusNot(post, CommentStatusEnum.RECYCLE.getCode()); } model.addAttribute("post", post); model.addAttribute("comments", CommentUtil.getComments(comments)); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java index 472bb7f49..f9c35efd6 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java @@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.front; import cc.ryanc.halo.model.domain.Post; import cc.ryanc.halo.model.domain.Tag; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.service.TagService; import cc.ryanc.halo.web.controller.core.BaseController; @@ -78,8 +78,8 @@ public class FrontTagController extends BaseController { } Sort sort = new Sort(Sort.Direction.DESC, "postDate"); Integer size = 10; - if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp()))) { - size = Integer.parseInt(HaloConst.OPTIONS.get(BlogProperties.INDEX_POSTS.getProp())); + if (!StringUtils.isBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()))) { + size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp())); } Pageable pageable = PageRequest.of(page - 1, size, sort); Page posts = postService.findPostsByTags(tag, pageable); diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java index fbbbf93d4..f793ed0fb 100644 --- a/src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java +++ b/src/main/java/cc/ryanc/halo/web/interceptor/ApiInterceptor.java @@ -1,8 +1,8 @@ package cc.ryanc.halo.web.interceptor; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.TrueFalse; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.TrueFalseEnum; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse; public class ApiInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - if (StringUtils.equals(TrueFalse.TRUE.getDesc(), HaloConst.OPTIONS.get(BlogProperties.API_STATUS.getProp()))) { + if (StringUtils.equals(TrueFalseEnum.TRUE.getDesc(), HaloConst.OPTIONS.get(BlogPropertiesEnum.API_STATUS.getProp()))) { return true; } response.sendRedirect("/404"); diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java index dca89322c..f75ac8434 100644 --- a/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java +++ b/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java @@ -1,8 +1,8 @@ package cc.ryanc.halo.web.interceptor; import cc.ryanc.halo.model.dto.HaloConst; -import cc.ryanc.halo.model.enums.BlogProperties; -import cc.ryanc.halo.model.enums.TrueFalse; +import cc.ryanc.halo.model.enums.BlogPropertiesEnum; +import cc.ryanc.halo.model.enums.TrueFalseEnum; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @@ -24,7 +24,7 @@ public class InstallInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception { - if (StringUtils.equals(TrueFalse.TRUE.getDesc(), HaloConst.OPTIONS.get(BlogProperties.IS_INSTALL.getProp()))) { + if (StringUtils.equals(TrueFalseEnum.TRUE.getDesc(), HaloConst.OPTIONS.get(BlogPropertiesEnum.IS_INSTALL.getProp()))) { return true; } response.sendRedirect("/install");