欢迎使用Halo进行创作,删除这篇文章后赶紧开始吧。
\n"); post.setPostSummary("欢迎使用Halo进行创作,删除这篇文章后赶紧开始吧。"); post.setPostStatus(0); - post.setPostDate(new Date()); + post.setPostDate(DateUtil.date()); post.setPostUrl("hello-halo"); post.setUser(user); post.setCategories(categories); @@ -141,7 +142,7 @@ public class InstallController { comment.setCommentAuthorUrl("https://ryanc.cc"); comment.setCommentAuthorIp("127.0.0.1"); comment.setCommentAuthorAvatarMd5("7cc7f29278071bd4dce995612d428834"); - comment.setCommentDate(new Date()); + comment.setCommentDate(DateUtil.date()); comment.setCommentContent("欢迎,欢迎!"); comment.setCommentStatus(0); comment.setCommentAgent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.162 Safari/537.36"); @@ -177,7 +178,7 @@ public class InstallController { LogsRecord.INSTALL, "安装成功,欢迎使用Halo。", HaloUtils.getIpAddr(request), - new Date() + DateUtil.date() ) ); 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 88bd2396f..2cc1597a3 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 @@ -9,6 +9,7 @@ import cc.ryanc.halo.service.MailService; import cc.ryanc.halo.service.PostService; import cc.ryanc.halo.service.UserService; import cc.ryanc.halo.utils.HaloUtils; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.http.HtmlUtil; import lombok.extern.slf4j.Slf4j; @@ -101,7 +102,7 @@ public class FrontCommentController { post = postService.findByPostId(post.getPostId()).get(); comment.setCommentAuthorEmail(HtmlUtil.encode(comment.getCommentAuthorEmail()).toLowerCase()); comment.setPost(post); - comment.setCommentDate(new Date()); + comment.setCommentDate(DateUtil.date()); comment.setCommentAuthorIp(HaloUtils.getIpAddr(request)); comment.setIsAdmin(0); comment.setCommentAuthor(HtmlUtil.encode(comment.getCommentAuthor())); diff --git a/src/main/resources/templates/admin/admin_page_md_editor.ftl b/src/main/resources/templates/admin/admin_page_md_editor.ftl index f8a0e9233..ba6afa74a 100755 --- a/src/main/resources/templates/admin/admin_page_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_page_md_editor.ftl @@ -231,26 +231,38 @@ 'postThumbnail': $('#selectImg')[0].src }, success: function (data) { - $.toast({ - <#if post??> - text: "更新成功!", - <#else> - text: "发表成功!", - #if> - heading: '提示', - icon: 'success', - showHideTransition: 'fade', - allowToastClose: true, - hideAfter: 1000, - stack: 1, - position: 'top-center', - textAlign: 'left', - loader: true, - loaderBg: '#ffffff', - afterHidden: function () { - window.location.href="/admin/page"; - } - }); + if(data.code==1){ + $.toast({ + text: data.msg, + heading: '提示', + icon: 'success', + showHideTransition: 'fade', + allowToastClose: true, + hideAfter: 1000, + stack: 1, + position: 'top-center', + textAlign: 'left', + loader: true, + loaderBg: '#ffffff', + afterHidden: function () { + window.location.href="/admin/page"; + } + }); + }else{ + $.toast({ + text: data.msg, + heading: '提示', + icon: 'error', + showHideTransition: 'fade', + allowToastClose: true, + hideAfter: 1000, + stack: 1, + position: 'top-center', + textAlign: 'left', + loader: true, + loaderBg: '#ffffff' + }); + } } }); } diff --git a/src/main/resources/templates/admin/admin_post.ftl b/src/main/resources/templates/admin/admin_post.ftl index 49cbf4ae7..69177c30d 100755 --- a/src/main/resources/templates/admin/admin_post.ftl +++ b/src/main/resources/templates/admin/admin_post.ftl @@ -95,13 +95,14 @@ <#switch post.postStatus> <#case 0> 查看 - 修改 + 编辑 <#break > <#case 1> - 预览 - 修改 - + 编辑 + + <#break > <#case 2> 还原 diff --git a/src/main/resources/templates/admin/admin_post_md_editor.ftl b/src/main/resources/templates/admin/admin_post_md_editor.ftl index 86d367411..cb7b35c80 100755 --- a/src/main/resources/templates/admin/admin_post_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_post_md_editor.ftl @@ -323,26 +323,38 @@ 'tagList' : $('#tagList').tagEditor('getTags')[0].tags.toString() }, success: function (data) { - $.toast({ - <#if post??> - text: "更新成功!", - <#else> - text: "发表成功!", - #if> - heading: '提示', - icon: 'success', - showHideTransition: 'fade', - allowToastClose: true, - hideAfter: 1000, - stack: 1, - position: 'top-center', - textAlign: 'left', - loader: true, - loaderBg: '#ffffff', - afterHidden: function () { - window.location.href="/admin/posts"; - } - }); + if(data.code==1){ + $.toast({ + text: data.msg, + heading: '提示', + icon: 'success', + showHideTransition: 'fade', + allowToastClose: true, + hideAfter: 1000, + stack: 1, + position: 'top-center', + textAlign: 'left', + loader: true, + loaderBg: '#ffffff', + afterHidden: function () { + window.location.href="/admin/posts"; + } + }); + }else{ + $.toast({ + text: data.msg, + heading: '提示', + icon: 'error', + showHideTransition: 'fade', + allowToastClose: true, + hideAfter: 1000, + stack: 1, + position: 'top-center', + textAlign: 'left', + loader: true, + loaderBg: '#ffffff' + }); + } } }); }