From f82c699641f37122e6f15e26ad66834efc617ac5 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Tue, 10 Jul 2018 00:28:42 +0800
Subject: [PATCH] =?UTF-8?q?:apple:=20=E5=8F=91=E5=B8=83=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E6=96=87=E7=AB=A0=E6=98=AF=E5=90=A6=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/ryanc/halo/model/domain/Post.java |  5 +++
 .../ryanc/halo/model/enums/AllowComment.java  | 27 ++++++++++++++
 .../templates/admin/admin_post_md_editor.ftl  | 10 ++++--
 .../themes/anatole/module/comment.ftl         | 36 ++++++++++---------
 .../themes/material/_partial/comment.ftl      | 36 ++++++++++---------
 5 files changed, 77 insertions(+), 37 deletions(-)
 create mode 100644 src/main/java/cc/ryanc/halo/model/enums/AllowComment.java

diff --git a/src/main/java/cc/ryanc/halo/model/domain/Post.java b/src/main/java/cc/ryanc/halo/model/domain/Post.java
index 72b4e95ea..f2f86f501 100755
--- a/src/main/java/cc/ryanc/halo/model/domain/Post.java
+++ b/src/main/java/cc/ryanc/halo/model/domain/Post.java
@@ -125,4 +125,9 @@ public class Post implements Serializable {
      * 文章访问量
      */
     private Long postViews = 0L;
+
+    /**
+     * 是否允许评论
+     */
+    private Integer allowComment = 0;
 }
diff --git a/src/main/java/cc/ryanc/halo/model/enums/AllowComment.java b/src/main/java/cc/ryanc/halo/model/enums/AllowComment.java
new file mode 100644
index 000000000..cc43b7a83
--- /dev/null
+++ b/src/main/java/cc/ryanc/halo/model/enums/AllowComment.java
@@ -0,0 +1,27 @@
+package cc.ryanc.halo.model.enums;
+
+/**
+ * @author : RYAN0UP
+ * @date : 2018/7/9
+ */
+public enum AllowComment {
+    /**
+     * 允许评论
+     */
+    ALLOW(1),
+
+    /**
+     * 不允许评论
+     */
+    DISALLOW(0);
+
+    private Integer code;
+
+    AllowComment(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}
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 626767f3c..07a1915ff 100755
--- a/src/main/resources/templates/admin/admin_post_md_editor.ftl
+++ b/src/main/resources/templates/admin/admin_post_md_editor.ftl
@@ -76,8 +76,11 @@
                             </div>
                         </div>
                         <div class="box-body">
-                            <div>
-                            </div>
+                            <label for="allowComment" class="control-label">开启评论：</label>
+                            <select class="form-control" id="allowComment" name="allowComment">
+                                <option value="1" <#if post?? && post.allowComment?default(1)==1>selected</#if>>是</option>
+                                <option value="0" <#if post?? && post.allowComment?default(1)==0>selected</#if>>否</option>
+                            </select>
                         </div>
                         <div class="box-footer">
                             <button onclick="push(1)" class="btn btn-default btn-sm ">保存草稿</button>
@@ -324,7 +327,8 @@
                         'postContent': editor.getHTML(),
                         'postThumbnail': $('#selectImg')[0].src,
                         'cateList' : cateList.toString(),
-                        'tagList' : $('#tagList').tagEditor('getTags')[0].tags.toString()
+                        'tagList' : $('#tagList').tagEditor('getTags')[0].tags.toString(),
+                        'allowComment' : $('#allowComment').val()
                     },
                     success: function (data) {
                         if(data.code==1){
diff --git a/src/main/resources/templates/themes/anatole/module/comment.ftl b/src/main/resources/templates/themes/anatole/module/comment.ftl
index e5ea0c1da..d6ffc1c0c 100644
--- a/src/main/resources/templates/themes/anatole/module/comment.ftl
+++ b/src/main/resources/templates/themes/anatole/module/comment.ftl
@@ -1,17 +1,19 @@
-<#switch options.comment_system>
-<#case "native">
-    <#include "../../../common/comment/_native_comment.ftl">
-    <#break >
-<#case "valine">
-    <#include "../../../common/comment/_valine_comment.ftl">
-    <#break >
-<#case "disqus">
-    <#include "../../../common/comment/_disqus_comment.ftl">
-    <#break >
-<#case "livere">
-    <#include "../../../common/comment/_livere_comment.ftl">
-    <#break >
-<#case "changyan">
-    <#include "../../../common/comment/_changyan_comment.ftl">
-    <#break >
-</#switch>
\ No newline at end of file
+<#if post.allowComment?default(1)==1>
+    <#switch options.comment_system>
+        <#case "native">
+            <#include "../../../common/comment/_native_comment.ftl">
+            <#break >
+        <#case "valine">
+            <#include "../../../common/comment/_valine_comment.ftl">
+            <#break >
+        <#case "disqus">
+            <#include "../../../common/comment/_disqus_comment.ftl">
+            <#break >
+        <#case "livere">
+            <#include "../../../common/comment/_livere_comment.ftl">
+            <#break >
+        <#case "changyan">
+            <#include "../../../common/comment/_changyan_comment.ftl">
+            <#break >
+    </#switch>
+</#if>
diff --git a/src/main/resources/templates/themes/material/_partial/comment.ftl b/src/main/resources/templates/themes/material/_partial/comment.ftl
index 727528740..d6ffc1c0c 100644
--- a/src/main/resources/templates/themes/material/_partial/comment.ftl
+++ b/src/main/resources/templates/themes/material/_partial/comment.ftl
@@ -1,17 +1,19 @@
-<#switch options.comment_system>
-    <#case "native">
-        <#include "../../../common/comment/_native_comment.ftl">
-        <#break >
-    <#case "valine">
-        <#include "../../../common/comment/_valine_comment.ftl">
-        <#break >
-    <#case "disqus">
-        <#include "../../../common/comment/_disqus_comment.ftl">
-        <#break >
-    <#case "livere">
-        <#include "../../../common/comment/_livere_comment.ftl">
-        <#break >
-    <#case "changyan">
-        <#include "../../../common/comment/_changyan_comment.ftl">
-        <#break >
-</#switch>
\ No newline at end of file
+<#if post.allowComment?default(1)==1>
+    <#switch options.comment_system>
+        <#case "native">
+            <#include "../../../common/comment/_native_comment.ftl">
+            <#break >
+        <#case "valine">
+            <#include "../../../common/comment/_valine_comment.ftl">
+            <#break >
+        <#case "disqus">
+            <#include "../../../common/comment/_disqus_comment.ftl">
+            <#break >
+        <#case "livere">
+            <#include "../../../common/comment/_livere_comment.ftl">
+            <#break >
+        <#case "changyan">
+            <#include "../../../common/comment/_changyan_comment.ftl">
+            <#break >
+    </#switch>
+</#if>