v1.3.6阶段提交，cherry-pick

app/Http/Admin/Views/course/chapters.volt

@@ -55,7 +55,7 @@
             <tr>
                 <td>{{ item.id }}</td>
                 <td>
-                    <a href="{{ child_url }}">{{ item.title }}</a>
+                    <a href="{{ child_url }}"><i class="layui-icon layui-icon-add-circle"></i> {{ item.title }}</a>
                     <span class="layui-badge layui-bg-green">章</span>
                 </td>
                 <td>{{ item.lesson_count }}</td>

app/Http/Home/Views/answer/add.volt

@@ -12,19 +12,19 @@
     <div class="layout-main">
         <div class="writer-content wrap">
             <form class="layui-form" method="POST" action="{{ url({'for':'home.answer.create'}) }}">
-                <div class="layui-form-item">
+                <div class="layui-form-item first-form-item">
-                    <div class="layui-input-block" style="margin:0;">
+                    <div class="layui-input-block">
-                        <input class="layui-input" type="text" name="title" value="{{ question.title }}" readonly="readonly">
+                        <input class="layui-input" type="text" name="title" value="{{ question.title }}" disabled="disabled">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <div class="layui-input-block" style="margin:0;">
+                    <div class="layui-input-block">
                         <div id="vditor"></div>
                         <textarea name="content" class="layui-hide" id="vditor-textarea"></textarea>
                     </div>
                 </div>
                 <div class="layui-form-item center">
-                    <div class="layui-input-block" style="margin:0;">
+                    <div class="layui-input-block">
                         <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">发布回答</button>
                         <input type="hidden" name="question_id" value="{{ question.id }}">
                     </div>

app/Http/Home/Views/answer/edit.volt

@@ -12,19 +12,19 @@
     <div class="layout-main">
         <div class="writer-content wrap">
             <form class="layui-form" method="POST" action="{{ url({'for':'home.answer.update','id':answer.id}) }}">
-                <div class="layui-form-item">
+                <div class="layui-form-item first-form-item">
-                    <div class="layui-input-block" style="margin:0;">
+                    <div class="layui-input-block">
-                        <input class="layui-input" type="text" name="title" value="{{ question.title }}" readonly="readonly">
+                        <input class="layui-input" type="text" name="title" value="{{ question.title }}" disabled="disabled">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <div class="layui-input-block" style="margin:0;">
+                    <div class="layui-input-block">
                         <div id="vditor"></div>
                         <textarea name="content" class="layui-hide" id="vditor-textarea">{{ answer.content }}</textarea>
                     </div>
                 </div>
                 <div class="layui-form-item center">
-                    <div class="layui-input-block" style="margin:0;">
+                    <div class="layui-input-block">
                         <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">发布回答</button>
                     </div>
                 </div>

app/Http/Home/Views/article/edit.volt

@@ -16,10 +16,10 @@
         </span>
     </div>
 
-    <form class="layui-form" method="POST" action="{{ action_url }}">
     <div class="layout-main">
+        <form class="layui-form" method="POST" action="{{ action_url }}">
             <div class="writer-content wrap">
-                <div class="layui-form-item">
+                <div class="layui-form-item first-form-item">
                     <div class="layui-input-block">
                         <input class="layui-input" type="text" name="title" value="{{ article.title }}" placeholder="请输入标题..." lay-verify="required">
                     </div>
@@ -31,7 +31,6 @@
                     </div>
                 </div>
             </div>
-        </div>
             <div id="layer-publish" style="display:none;">
                 <div class="writer-sidebar">
                     <div class="layui-form-item">
@@ -82,6 +81,7 @@
                 </div>
             </div>
         </form>
+    </div>
 
 {% endblock %}
 

app/Http/Home/Views/question/edit.volt

@@ -15,10 +15,10 @@
         </span>
     </div>
 
+    <div class="layout-main">
         <form class="layui-form" method="POST" action="{{ action_url }}">
-        <div class="layout-main clearfix">
             <div class="writer-content wrap">
-                <div class="layui-form-item">
+                <div class="layui-form-item first-form-item">
                     <div class="layui-input-block">
                         <input class="layui-input" type="text" name="title" value="{{ question.title }}" placeholder="请输入标题..." lay-verify="required">
                     </div>
@@ -30,7 +30,6 @@
                     </div>
                 </div>
             </div>
-        </div>
             <div id="layer-publish" style="display:none;">
                 <div class="writer-sidebar">
                     <div class="layui-form-item">
@@ -48,6 +47,7 @@
                 </div>
             </div>
         </form>
+    </div>
 
 {% endblock %}
 

app/Http/Home/Views/user/console/answers.volt

@@ -35,13 +35,12 @@
                         </thead>
                         <tbody>
                         {% for item in pager.items %}
-                            {% set question_url = url({'for':'home.question.show','id':item.question.id}) %}
+                            {% set show_url = url({'for':'home.answer.show','id':item.id}) %}
-                            {% set answer_url = url({'for':'home.answer.show','id':item.id}) %}
                             {% set edit_url = url({'for':'home.answer.edit','id':item.id}) %}
                             {% set delete_url = url({'for':'home.answer.delete','id':item.id}) %}
                             <tr>
                                 <td>
-                                    <p>提问：<a href="{{ question_url }}" target="_blank">{{ item.question.title }}</a></p>
+                                    <p>提问：<a href="{{ show_url }}" target="_blank">{{ item.question.title }}</a></p>
                                     <p>回答：{{ substr(item.summary,0,32) }}</p>
                                     <p class="meta">
                                         创建：<span class="layui-badge layui-bg-gray">{{ item.create_time|time_ago }}</span>
@@ -50,7 +49,6 @@
                                 </td>
                                 <td>{{ item.like_count }}</td>
                                 <td>
-                                    <a href="{{ answer_url }}" class="layui-btn layui-btn-xs">详情</a>
                                     <a href="{{ edit_url }}" class="layui-btn layui-btn-xs layui-bg-blue">修改</a>
                                     <a href="javascript:" class="layui-btn layui-btn-xs layui-bg-red kg-delete" data-url="{{ delete_url }}">删除</a>
                                 </td>

app/Models/User.php

@@ -136,6 +136,13 @@ class User extends Model
      */
     public $answer_count;
 
+    /**
+     * 评论数
+     *
+     * @var int
+     */
+    public $comment_count;
+
     /**
      * 收藏数
      *

app/Repos/User.php

@@ -5,6 +5,7 @@ namespace App\Repos;
 use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
 use App\Models\Answer as AnswerModel;
 use App\Models\Article as ArticleModel;
+use App\Models\Comment as CommentModel;
 use App\Models\CourseUser as CourseUserModel;
 use App\Models\ImUser as ImUserModel;
 use App\Models\Notification as NotificationModel;
@@ -197,6 +198,14 @@ class User extends Repository
         ]);
     }
 
+    public function countComments($userId)
+    {
+        return (int)CommentModel::count([
+            'conditions' => 'owner_id = ?1 AND published = ?2',
+            'bind' => [1 => $userId, 2 => CommentModel::PUBLISH_APPROVED],
+        ]);
+    }
+
     public function countUnreadNotifications($userId)
     {
         return (int)NotificationModel::count([

app/Services/Logic/Answer/AnswerCreate.php

@@ -12,14 +12,12 @@ use App\Services\Logic\Notice\System\QuestionAnswered as QuestionAnsweredNotice;
 use App\Services\Logic\Point\History\AnswerPost as AnswerPostPointHistory;
 use App\Services\Logic\QuestionTrait;
 use App\Services\Logic\Service as LogicService;
-use App\Traits\Client as ClientTrait;
 use App\Validators\Answer as AnswerValidator;
 use App\Validators\UserLimit as UserLimitValidator;
 
 class AnswerCreate extends LogicService
 {
 
-    use ClientTrait;
     use QuestionTrait;
     use AnswerTrait;
     use AnswerDataTrait;
@@ -74,11 +72,6 @@ class AnswerCreate extends LogicService
         return $answer;
     }
 
-    protected function getPublishStatus(UserModel $user)
-    {
-        return $user->answer_count > 2 ? AnswerModel::PUBLISH_APPROVED : AnswerModel::PUBLISH_PENDING;
-    }
-
     protected function incrUserDailyAnswerCount(UserModel $user)
     {
         $this->eventsManager->fire('UserDailyCounter:incrAnswerCount', $this, $user);

app/Services/Logic/Answer/AnswerDataTrait.php

@@ -3,6 +3,7 @@
 namespace App\Services\Logic\Answer;
 
 use App\Models\Answer as AnswerModel;
+use App\Models\User as UserModel;
 use App\Traits\Client as ClientTrait;
 use App\Validators\Answer as AnswerValidator;
 
@@ -25,6 +26,11 @@ trait AnswerDataTrait
         return $data;
     }
 
+    protected function getPublishStatus(UserModel $user)
+    {
+        return $user->answer_count > 2 ? AnswerModel::PUBLISH_APPROVED : AnswerModel::PUBLISH_PENDING;
+    }
+
     protected function saveDynamicAttrs(AnswerModel $answer)
     {
         $answer->cover = kg_parse_first_content_image($answer->content);

app/Services/Logic/Article/ArticleCreate.php

@@ -50,11 +50,6 @@ class ArticleCreate extends LogicService
         return $article;
     }
 
-    protected function getPublishStatus(UserModel $user)
-    {
-        return $user->article_count > 100 ? ArticleModel::PUBLISH_APPROVED : ArticleModel::PUBLISH_PENDING;
-    }
-
     protected function incrUserDailyArticleCount(UserModel $user)
     {
         $this->eventsManager->fire('UserDailyCounter:incrArticleCount', $this, $user);

app/Services/Logic/Article/ArticleDataTrait.php

@@ -5,6 +5,7 @@ namespace App\Services\Logic\Article;
 use App\Library\Utils\Word as WordUtil;
 use App\Models\Article as ArticleModel;
 use App\Models\ArticleTag as ArticleTagModel;
+use App\Models\User as UserModel;
 use App\Repos\ArticleTag as ArticleTagRepo;
 use App\Repos\Tag as TagRepo;
 use App\Traits\Client as ClientTrait;
@@ -51,6 +52,11 @@ trait ArticleDataTrait
         return $data;
     }
 
+    protected function getPublishStatus(UserModel $user)
+    {
+        return $user->article_count > 100 ? ArticleModel::PUBLISH_APPROVED : ArticleModel::PUBLISH_PENDING;
+    }
+
     protected function saveDynamicAttrs(ArticleModel $article)
     {
         $article->cover = kg_parse_first_content_image($article->content);

app/Services/Logic/Comment/AfterCreateTrait.php

@@ -4,6 +4,7 @@ namespace App\Services\Logic\Comment;
 
 use App\Models\Answer as AnswerModel;
 use App\Models\Article as ArticleModel;
+use App\Models\Chapter as ChapterModel;
 use App\Models\Comment as CommentModel;
 use App\Models\Question as QuestionModel;
 use App\Models\User as UserModel;
@@ -17,24 +18,38 @@ trait AfterCreateTrait
 
     use CountTrait;
 
+    protected function incrItemCommentCount($item, CommentModel $comment, UserModel $user)
+    {
+        if ($comment->published != CommentModel::PUBLISH_APPROVED) return;
+
+        if ($item instanceof ChapterModel) {
+            $this->incrChapterCommentCount($item);
+        } elseif ($item instanceof ArticleModel) {
+            $this->incrArticleCommentCount($item);
+        } elseif ($item instanceof QuestionModel) {
+            $this->incrQuestionCommentCount($item);
+        } elseif ($item instanceof AnswerModel) {
+            $this->incrAnswerCommentCount($item);
+        }
+
+        $this->incrUserCommentCount($user);
+    }
+
     protected function handleNoticeAndPoint($item, CommentModel $comment, UserModel $user)
     {
         if ($comment->published != CommentModel::PUBLISH_APPROVED) return;
 
         if ($item instanceof ArticleModel) {
-            $this->incrArticleCommentCount($item);
             if ($user->id != $item->owner_id) {
                 $this->handleArticleCommentedNotice($item, $comment);
                 $this->handleCommentPostPoint($comment);
             }
         } elseif ($item instanceof QuestionModel) {
-            $this->incrQuestionCommentCount($item);
             if ($user->id != $item->owner_id) {
                 $this->handleQuestionCommentedNotice($item, $comment);
                 $this->handleCommentPostPoint($comment);
             }
         } elseif ($item instanceof AnswerModel) {
-            $this->incrAnswerCommentCount($item);
             if ($user->id != $item->owner_id) {
                 $this->handleAnswerCommentedNotice($item, $comment);
                 $this->handleCommentPostPoint($comment);

app/Services/Logic/Comment/CommentCreate.php

@@ -4,7 +4,6 @@ namespace App\Services\Logic\Comment;
 
 use App\Models\Comment as CommentModel;
 use App\Services\Logic\Service as LogicService;
-use App\Traits\Client as ClientTrait;
 use App\Validators\Comment as CommentValidator;
 use App\Validators\UserLimit as UserLimitValidator;
 
@@ -12,8 +11,8 @@ class CommentCreate extends LogicService
 {
 
     use AfterCreateTrait;
+    use CommentDataTrait;
     use CountTrait;
-    use ClientTrait;
 
     public function handle()
     {
@@ -31,26 +30,19 @@ class CommentCreate extends LogicService
 
         $comment = new CommentModel();
 
-        $data = [
+        $data = $this->handlePostData($post);
-            'item_id' => $post['item_id'],
-            'item_type' => $post['item_type'],
-            'owner_id' => $user->id,
-        ];
 
-        $data['content'] = $validator->checkContent($post['content']);
+        $data['item_id'] = $post['item_id'];
-        $data['client_type'] = $this->getClientType();
+        $data['item_type'] = $post['item_type'];
-        $data['client_ip'] = $this->getClientIp();
+        $data['owner_id'] = $user->id;
-
+        $data['published'] = $this->getPublishStatus($user);
-        /**
-         * @todo 引入自动审核机制
-         */
-        $data['published'] = CommentModel::PUBLISH_APPROVED;
 
         $comment->create($data);
 
         $this->incrUserDailyCommentCount($user);
 
         if ($comment->published == CommentModel::PUBLISH_APPROVED) {
+            $this->incrItemCommentCount($item, $comment, $user);
             $this->handleNoticeAndPoint($item, $comment, $user);
         }
 

app/Services/Logic/Comment/CommentDataTrait.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Services\Logic\Comment;
+
+use App\Models\Comment as CommentModel;
+use App\Models\User as UserModel;
+use App\Traits\Client as ClientTrait;
+use App\Validators\Comment as CommentValidator;
+
+trait CommentDataTrait
+{
+
+    use ClientTrait;
+
+    protected function handlePostData($post)
+    {
+        $data = [];
+
+        $data['client_type'] = $this->getClientType();
+        $data['client_ip'] = $this->getClientIp();
+
+        $validator = new CommentValidator();
+
+        $data['content'] = $validator->checkContent($post['content']);
+
+        return $data;
+    }
+
+    protected function getPublishStatus(UserModel $user)
+    {
+        $case1 = $user->article_count > 2;
+        $case2 = $user->question_count > 2;
+        $case3 = $user->answer_count > 2;
+        $case4 = $user->comment_count > 2;
+
+        $status = CommentModel::PUBLISH_PENDING;
+
+        if ($case1 || $case2 || $case3 || $case4) {
+            $status = CommentModel::PUBLISH_APPROVED;
+        }
+
+        return $status;
+    }
+
+}

app/Services/Logic/Comment/CommentReply.php

@@ -5,7 +5,6 @@ namespace App\Services\Logic\Comment;
 use App\Models\Comment as CommentModel;
 use App\Services\Logic\CommentTrait;
 use App\Services\Logic\Service as LogicService;
-use App\Traits\Client as ClientTrait;
 use App\Validators\Comment as CommentValidator;
 use App\Validators\UserLimit as UserLimitValidator;
 
@@ -13,9 +12,9 @@ class CommentReply extends LogicService
 {
 
     use AfterCreateTrait;
+    use CommentDataTrait;
     use CommentTrait;
     use CountTrait;
-    use ClientTrait;
 
     public function handle($id)
     {
@@ -33,12 +32,13 @@ class CommentReply extends LogicService
 
         $validator = new CommentValidator();
 
-        $data = [
+        $data = $this->handlePostData($post);
-            'parent_id' => $parent->id,
+
-            'item_id' => $comment->item_id,
+        $data['parent_id'] = $parent->id;
-            'item_type' => $comment->item_type,
+        $data['item_id'] = $comment->item_id;
-            'owner_id' => $user->id,
+        $data['item_type'] = $comment->item_type;
-        ];
+        $data['owner_id'] = $user->id;
+        $data['published'] = $this->getPublishStatus($user);
 
         $item = $validator->checkItem($comment->item_id, $comment->item_type);
 
@@ -51,15 +51,6 @@ class CommentReply extends LogicService
             $data['to_user_id'] = $comment->owner_id;
         }
 
-        $data['content'] = $validator->checkContent($post['content']);
-        $data['client_type'] = $this->getClientType();
-        $data['client_ip'] = $this->getClientIp();
-
-        /**
-         * @todo 引入自动审核机制
-         */
-        $data['published'] = CommentModel::PUBLISH_APPROVED;
-
         $reply = new CommentModel();
 
         $reply->create($data);
@@ -68,6 +59,7 @@ class CommentReply extends LogicService
 
         if ($reply->published == CommentModel::PUBLISH_APPROVED) {
             $this->incrCommentReplyCount($parent);
+            $this->incrItemCommentCount($item, $reply, $user);
             $this->handleNoticeAndPoint($item, $reply, $user);
         }
 

app/Services/Logic/Comment/CountTrait.php

@@ -56,6 +56,13 @@ trait CountTrait
         $answer->update();
     }
 
+    protected function incrUserCommentCount(UserModel $user)
+    {
+        $user->comment_count += 1;
+
+        $user->update();
+    }
+
     protected function decrCommentReplyCount(CommentModel $comment)
     {
         if ($comment->reply_count > 0) {
@@ -98,11 +105,19 @@ trait CountTrait
     protected function decrAnswerCommentCount(AnswerModel $answer)
     {
         if ($answer->comment_count > 0) {
-            $answer->comment_count += 1;
+            $answer->comment_count -= 1;
             $answer->update();
         }
     }
 
+    protected function decrUserCommentCount(UserModel $user)
+    {
+        if ($user->comment_count > 0) {
+            $user->comment_count -= 1;
+            $user->update();
+        }
+    }
+
     protected function incrUserDailyCommentCount(UserModel $user)
     {
         /**

app/Services/Logic/Question/QuestionCreate.php

@@ -45,11 +45,6 @@ class QuestionCreate extends LogicService
         return $question;
     }
 
-    protected function getPublishStatus(UserModel $user)
-    {
-        return $user->question_count > 100 ? QuestionModel::PUBLISH_APPROVED : QuestionModel::PUBLISH_PENDING;
-    }
-
     protected function incrUserDailyQuestionCount(UserModel $user)
     {
         $this->eventsManager->fire('UserDailyCounter:incrQuestionCount', $this, $user);

app/Services/Logic/Question/QuestionDataTrait.php

@@ -4,6 +4,7 @@ namespace App\Services\Logic\Question;
 
 use App\Models\Question as QuestionModel;
 use App\Models\QuestionTag as QuestionTagModel;
+use App\Models\User as UserModel;
 use App\Repos\QuestionTag as QuestionTagRepo;
 use App\Repos\Tag as TagRepo;
 use App\Traits\Client as ClientTrait;
@@ -37,6 +38,11 @@ trait QuestionDataTrait
         return $data;
     }
 
+    protected function getPublishStatus(UserModel $user)
+    {
+        return $user->question_count > 100 ? QuestionModel::PUBLISH_APPROVED : QuestionModel::PUBLISH_PENDING;
+    }
+
     protected function saveDynamicAttrs(QuestionModel $question)
     {
         $question->cover = kg_parse_first_content_image($question->content);

db/migrations/20210602034627.php

@@ -0,0 +1,34 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+final class V20210602034627 extends AbstractMigration
+{
+
+    public function up()
+    {
+        $this->modifyUserTable();
+    }
+
+    public function down()
+    {
+        $this->table('kg_user')
+            ->removeColumn('comment_count')
+            ->save();
+    }
+
+    protected function modifyUserTable()
+    {
+        $this->table('kg_user')
+            ->addColumn('comment_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '评论数量',
+                'after' => 'answer_count',
+            ])->save();
+    }
+
+}

public/static/home/css/common.css

@@ -132,20 +132,20 @@
     list-style: decimal;
 }
 
+.writer-sidebar {
+    padding: 20px;
+}
+
+.writer-content .first-form-item {
+    margin-top: 10px;
+}
+
 .writer-content .layui-input-block,
 .writer-sidebar .layui-input-block,
 .report-form .layui-input-block {
     margin-left: 0;
 }
 
-.writer-content {
-    padding-top: 30px;
-}
-
-.writer-sidebar {
-    padding: 20px;
-}
-
 .writer-sidebar .layui-form-label,
 .report-form .layui-form-label {
     float: none;
@@ -1972,7 +1972,7 @@
 }
 
 .layui-table p {
-    line-height: 1.8em;
+    line-height: 2em;
 }
 
 .layui-table .center {