diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51ce29a7..965bfae9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+### [v1.3.4](https://gitee.com/koogua/course-tencent-cloud/releases/v1.3.4)(2021-05-13)
+
+### 更新
+
+- 前台增加问答功能
+- 优化标签功能
+- 优化文章功能以及全文搜索
+- 优化课程评价，咨询，文章等相关统计
+- 后台增加提问和回答审核功能
+- 后台增加查看用户在线记录 修正后台编辑角色权限错误
+- 优化前台界面
+
 ### [v1.3.3](https://gitee.com/koogua/course-tencent-cloud/releases/v1.3.3)(2021-04-30)
 
 ### 更新
diff --git a/app/Builders/AnswerList.php b/app/Builders/AnswerList.php
new file mode 100644
index 00000000..4633f7b6
--- /dev/null
+++ b/app/Builders/AnswerList.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Builders;
+
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+
+class AnswerList extends Builder
+{
+
+    public function handleQuestions(array $answers)
+    {
+        $questions = $this->getQuestions($answers);
+
+        foreach ($answers as $key => $answer) {
+            $answers[$key]['question'] = $questions[$answer['question_id']] ?? new \stdClass();
+        }
+
+        return $answers;
+    }
+
+    public function handleUsers(array $answers)
+    {
+        $users = $this->getUsers($answers);
+
+        foreach ($answers as $key => $answer) {
+            $answers[$key]['owner'] = $users[$answer['owner_id']] ?? new \stdClass();
+        }
+
+        return $answers;
+    }
+
+    public function getQuestions(array $answers)
+    {
+        $ids = kg_array_column($answers, 'question_id');
+
+        $questionRepo = new QuestionRepo();
+
+        $questions = $questionRepo->findByIds($ids, ['id', 'title']);
+
+        $result = [];
+
+        foreach ($questions->toArray() as $question) {
+            $result[$question['id']] = $question;
+        }
+
+        return $result;
+    }
+
+    public function getUsers(array $answers)
+    {
+        $ids = kg_array_column($answers, 'owner_id');
+
+        $userRepo = new UserRepo();
+
+        $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']);
+
+        $baseUrl = kg_cos_url();
+
+        $result = [];
+
+        foreach ($users->toArray() as $user) {
+            $user['avatar'] = $baseUrl . $user['avatar'];
+            $result[$user['id']] = $user;
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Builders/ArticleFavoriteList.php b/app/Builders/ArticleFavoriteList.php
index 20e856a6..b81a55d7 100644
--- a/app/Builders/ArticleFavoriteList.php
+++ b/app/Builders/ArticleFavoriteList.php
@@ -4,6 +4,7 @@ namespace App\Builders;
 
 use App\Repos\Article as ArticleRepo;
 use App\Repos\User as UserRepo;
+use Phalcon\Text;
 
 class ArticleFavoriteList extends Builder
 {
@@ -38,7 +39,8 @@ class ArticleFavoriteList extends Builder
 
         $columns = [
             'id', 'title', 'cover',
-            'view_count', 'like_count', 'comment_count', 'favorite_count',
+            'view_count', 'like_count',
+            'comment_count', 'favorite_count',
         ];
 
         $articles = $articleRepo->findByIds($ids, $columns);
@@ -48,7 +50,11 @@ class ArticleFavoriteList extends Builder
         $result = [];
 
         foreach ($articles->toArray() as $article) {
-            $article['cover'] = $baseUrl . $article['cover'];
+
+            if (!empty($article['cover']) && !Text::startsWith($article['cover'], 'http')) {
+                $article['cover'] = $baseUrl . $article['cover'];
+            }
+
             $result[$article['id']] = $article;
         }
 
diff --git a/app/Builders/QuestionFavoriteList.php b/app/Builders/QuestionFavoriteList.php
new file mode 100644
index 00000000..0f2cba55
--- /dev/null
+++ b/app/Builders/QuestionFavoriteList.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Builders;
+
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use Phalcon\Text;
+
+class QuestionFavoriteList extends Builder
+{
+
+    public function handleQuestions(array $relations)
+    {
+        $questions = $this->getQuestions($relations);
+
+        foreach ($relations as $key => $value) {
+            $relations[$key]['question'] = $questions[$value['question_id']] ?? new \stdClass();
+        }
+
+        return $relations;
+    }
+
+    public function handleUsers(array $relations)
+    {
+        $users = $this->getUsers($relations);
+
+        foreach ($relations as $key => $value) {
+            $relations[$key]['user'] = $users[$value['user_id']] ?? new \stdClass();
+        }
+
+        return $relations;
+    }
+
+    public function getQuestions(array $relations)
+    {
+        $ids = kg_array_column($relations, 'question_id');
+
+        $questionRepo = new QuestionRepo();
+
+        $columns = [
+            'id', 'title', 'cover',
+            'view_count', 'like_count',
+            'answer_count', 'favorite_count',
+        ];
+
+        $questions = $questionRepo->findByIds($ids, $columns);
+
+        $baseUrl = kg_cos_url();
+
+        $result = [];
+
+        foreach ($questions->toArray() as $question) {
+
+            if (!empty($question['cover']) && !Text::startsWith($question['cover'], 'http')) {
+                $question['cover'] = $baseUrl . $question['cover'];
+            }
+
+            $result[$question['id']] = $question;
+        }
+
+        return $result;
+    }
+
+    public function getUsers(array $relations)
+    {
+        $ids = kg_array_column($relations, 'user_id');
+
+        $userRepo = new UserRepo();
+
+        $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']);
+
+        $baseUrl = kg_cos_url();
+
+        $result = [];
+
+        foreach ($users->toArray() as $user) {
+            $user['avatar'] = $baseUrl . $user['avatar'];
+            $result[$user['id']] = $user;
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Builders/QuestionList.php b/app/Builders/QuestionList.php
new file mode 100644
index 00000000..3987fac9
--- /dev/null
+++ b/app/Builders/QuestionList.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Builders;
+
+use App\Caches\CategoryList as CategoryListCache;
+use App\Models\Category as CategoryModel;
+use App\Repos\User as UserRepo;
+
+class QuestionList extends Builder
+{
+
+    public function handleQuestions(array $questions)
+    {
+        foreach ($questions as $key => $question) {
+            $questions[$key]['tags'] = json_decode($question['tags'], true);
+        }
+
+        return $questions;
+    }
+
+    public function handleCategories(array $articles)
+    {
+        $categories = $this->getCategories();
+
+        foreach ($articles as $key => $article) {
+            $articles[$key]['category'] = $categories[$article['category_id']] ?? new \stdClass();
+        }
+
+        return $articles;
+    }
+
+    public function handleUsers(array $questions)
+    {
+        $users = $this->getUsers($questions);
+
+        foreach ($questions as $key => $question) {
+            $questions[$key]['owner'] = $users[$question['owner_id']] ?? new \stdClass();
+            $questions[$key]['last_replier'] = $users[$question['last_replier_id']] ?? new \stdClass();
+        }
+
+        return $questions;
+    }
+
+    public function getCategories()
+    {
+        $cache = new CategoryListCache();
+
+        $items = $cache->get(CategoryModel::TYPE_QUESTION);
+
+        if (empty($items)) return [];
+
+        $result = [];
+
+        foreach ($items as $item) {
+            $result[$item['id']] = [
+                'id' => $item['id'],
+                'name' => $item['name'],
+            ];
+        }
+
+        return $result;
+    }
+
+    public function getUsers($questions)
+    {
+        $ownerIds = kg_array_column($questions, 'owner_id');
+        $lastReplierIds = kg_array_column($questions, 'last_replier_id');
+        $ids = array_merge($ownerIds, $lastReplierIds);
+
+        $userRepo = new UserRepo();
+
+        $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']);
+
+        $baseUrl = kg_cos_url();
+
+        $result = [];
+
+        foreach ($users->toArray() as $user) {
+            $user['avatar'] = $baseUrl . $user['avatar'];
+            $result[$user['id']] = $user;
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Builders/TagFollowList.php b/app/Builders/TagFollowList.php
new file mode 100644
index 00000000..c4b83377
--- /dev/null
+++ b/app/Builders/TagFollowList.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Builders;
+
+use App\Repos\Tag as TagRepo;
+use App\Repos\User as UserRepo;
+
+class TagFollowList extends Builder
+{
+
+    public function handleTags(array $relations)
+    {
+        $tags = $this->getTags($relations);
+
+        foreach ($relations as $key => $value) {
+            $relations[$key]['tag'] = $tags[$value['tag_id']] ?? new \stdClass();
+        }
+
+        return $relations;
+    }
+
+    public function handleUsers(array $relations)
+    {
+        $users = $this->getUsers($relations);
+
+        foreach ($relations as $key => $value) {
+            $relations[$key]['user'] = $users[$value['user_id']] ?? new \stdClass();
+        }
+
+        return $relations;
+    }
+
+    public function getTags(array $relations)
+    {
+        $ids = kg_array_column($relations, 'tag_id');
+
+        $tagRepo = new TagRepo();
+
+        $columns = ['id', 'name', 'alias', 'icon', 'follow_count'];
+
+        $tags = $tagRepo->findByIds($ids, $columns);
+
+        $baseUrl = kg_cos_url();
+
+        $result = [];
+
+        foreach ($tags->toArray() as $tag) {
+            $tag['icon'] = $baseUrl . $tag['icon'];
+            $result[$tag['id']] = $tag;
+        }
+
+        return $result;
+    }
+
+    public function getUsers(array $relations)
+    {
+        $ids = kg_array_column($relations, 'user_id');
+
+        $userRepo = new UserRepo();
+
+        $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']);
+
+        $baseUrl = kg_cos_url();
+
+        $result = [];
+
+        foreach ($users->toArray() as $user) {
+            $user['avatar'] = $baseUrl . $user['avatar'];
+            $result[$user['id']] = $user;
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Caches/HotQuestionList.php b/app/Caches/HotQuestionList.php
new file mode 100644
index 00000000..22d115af
--- /dev/null
+++ b/app/Caches/HotQuestionList.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Caches;
+
+use App\Models\Question as QuestionModel;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class HotQuestionList extends Cache
+{
+
+    protected $lifetime = 1 * 86400;
+
+    public function getLifetime()
+    {
+        $tomorrow = strtotime('tomorrow');
+
+        return $tomorrow - time();
+    }
+
+    public function getKey($id = null)
+    {
+        return 'hot_question_list';
+    }
+
+    public function getContent($id = null)
+    {
+        $questions = $this->findWeeklyHotQuestions();
+
+        if ($questions->count() > 0) {
+            return $this->handleQuestions($questions);
+        }
+
+        $questions = $this->findMonthlyHotQuestions();
+
+        if ($questions->count() > 0) {
+            return $this->handleQuestions($questions);
+        }
+
+        $questions = $this->findYearlyHotQuestions();
+
+        if ($questions->count() > 0) {
+            return $this->handleQuestions($questions);
+        }
+
+        return [];
+    }
+
+    /**
+     * @param QuestionModel[] $questions
+     * @return array
+     */
+    protected function handleQuestions($questions)
+    {
+        $result = [];
+
+        foreach ($questions as $question) {
+            $result[] = [
+                'id' => $question->id,
+                'title' => $question->title,
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param int $limit
+     * @return ResultsetInterface|Resultset|QuestionModel[]
+     */
+    protected function findWeeklyHotQuestions($limit = 10)
+    {
+        $createTime = strtotime('monday this week');
+
+        return $this->findHotQuestions($createTime, $limit);
+    }
+
+    /**
+     * @param int $limit
+     * @return ResultsetInterface|Resultset|QuestionModel[]
+     */
+    protected function findMonthlyHotQuestions($limit = 10)
+    {
+        $createTime = strtotime(date('Y-m-01'));
+
+        return $this->findHotQuestions($createTime, $limit);
+    }
+
+    /**
+     * @param int $limit
+     * @return ResultsetInterface|Resultset|QuestionModel[]
+     */
+    protected function findYearlyHotQuestions($limit = 10)
+    {
+        $createTime = strtotime(date('Y-01-01'));
+
+        return $this->findHotQuestions($createTime, $limit);
+    }
+
+    /**
+     * @param int $createTime
+     * @param int $limit
+     * @return ResultsetInterface|Resultset|QuestionModel[]
+     */
+    protected function findHotQuestions($createTime, $limit = 10)
+    {
+        return QuestionModel::query()
+            ->where('create_time > :create_time:', ['create_time' => $createTime])
+            ->orderBy('score DESC')
+            ->limit($limit)
+            ->execute();
+    }
+
+}
diff --git a/app/Caches/MaxAnswerId.php b/app/Caches/MaxAnswerId.php
new file mode 100644
index 00000000..02320473
--- /dev/null
+++ b/app/Caches/MaxAnswerId.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Caches;
+
+use App\Models\Answer as AnswerModel;
+
+class MaxAnswerId extends Cache
+{
+
+    protected $lifetime = 365 * 86400;
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return 'max_answer_id';
+    }
+
+    public function getContent($id = null)
+    {
+        $answer = AnswerModel::findFirst(['order' => 'id DESC']);
+
+        return $answer->id ?? 0;
+    }
+
+}
diff --git a/app/Caches/MaxQuestionId.php b/app/Caches/MaxQuestionId.php
new file mode 100644
index 00000000..71b92f58
--- /dev/null
+++ b/app/Caches/MaxQuestionId.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Caches;
+
+use App\Models\Question as QuestionModel;
+
+class MaxQuestionId extends Cache
+{
+
+    protected $lifetime = 365 * 86400;
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return 'max_question_id';
+    }
+
+    public function getContent($id = null)
+    {
+        $question = QuestionModel::findFirst(['order' => 'id DESC']);
+
+        return $question->id ?? 0;
+    }
+
+}
diff --git a/app/Caches/Question.php b/app/Caches/Question.php
new file mode 100644
index 00000000..b536fe37
--- /dev/null
+++ b/app/Caches/Question.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Caches;
+
+use App\Repos\Question as QuestionRepo;
+
+class Question extends Cache
+{
+
+    protected $lifetime = 1 * 86400;
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return "question:{$id}";
+    }
+
+    public function getContent($id = null)
+    {
+        $questionRepo = new QuestionRepo();
+
+        $question = $questionRepo->findById($id);
+
+        return $question ?: null;
+    }
+
+}
diff --git a/app/Caches/ArticleRelatedList.php b/app/Caches/TaggedArticleList.php
similarity index 75%
rename from app/Caches/ArticleRelatedList.php
rename to app/Caches/TaggedArticleList.php
index 78c97f4b..722e484d 100644
--- a/app/Caches/ArticleRelatedList.php
+++ b/app/Caches/TaggedArticleList.php
@@ -5,11 +5,9 @@ namespace App\Caches;
 use App\Models\Article as ArticleModel;
 use App\Repos\Article as ArticleRepo;
 
-class ArticleRelatedList extends Cache
+class TaggedArticleList extends Cache
 {
 
-    protected $articleId;
-
     protected $limit = 5;
 
     protected $lifetime = 1 * 86400;
@@ -21,25 +19,15 @@ class ArticleRelatedList extends Cache
 
     public function getKey($id = null)
     {
-        return "article_related_list:{$id}";
+        return "tagged_article_list:{$id}";
     }
 
     public function getContent($id = null)
     {
-        $this->articleId = $id;
-
         $articleRepo = new ArticleRepo();
 
-        $article = $articleRepo->findById($id);
-
-        if (empty($article->tags)) return [];
-
-        $tagIds = kg_array_column($article->tags, 'id');
-
-        $randKey = array_rand($tagIds);
-
         $where = [
-            'tag_id' => $tagIds[$randKey],
+            'tag_id' => $id,
             'published' => ArticleModel::PUBLISH_APPROVED,
         ];
 
@@ -61,7 +49,7 @@ class ArticleRelatedList extends Cache
         $count = 0;
 
         foreach ($articles as $article) {
-            if ($article->id != $this->articleId && $count < $this->limit) {
+            if ($count < $this->limit) {
                 $result[] = [
                     'id' => $article->id,
                     'title' => $article->title,
diff --git a/app/Caches/TaggedQuestionList.php b/app/Caches/TaggedQuestionList.php
new file mode 100644
index 00000000..e1bb7c2a
--- /dev/null
+++ b/app/Caches/TaggedQuestionList.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Caches;
+
+use App\Models\Question as QuestionModel;
+use App\Repos\Question as QuestionRepo;
+
+class TaggedQuestionList extends Cache
+{
+
+    protected $limit = 5;
+
+    protected $lifetime = 1 * 86400;
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return "tagged_question_list:{$id}";
+    }
+
+    public function getContent($id = null)
+    {
+
+        $questionRepo = new QuestionRepo();
+
+        $where = [
+            'tag_id' => $id,
+            'published' => QuestionModel::PUBLISH_APPROVED,
+        ];
+
+        $pager = $questionRepo->paginate($where);
+
+        if ($pager->total_items == 0) return [];
+
+        return $this->handleContent($pager->items);
+    }
+
+    /**
+     * @param QuestionModel[] $questions
+     * @return array
+     */
+    public function handleContent($questions)
+    {
+        $result = [];
+
+        $count = 0;
+
+        foreach ($questions as $question) {
+            if ($count < $this->limit) {
+                $result[] = [
+                    'id' => $question->id,
+                    'title' => $question->title,
+                    'view_count' => $question->view_count,
+                    'like_count' => $question->like_count,
+                    'answer_count' => $question->answer_count,
+                    'favorite_count' => $question->favorite_count,
+                ];
+                $count++;
+            }
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Caches/TopAnswererList.php b/app/Caches/TopAnswererList.php
new file mode 100644
index 00000000..c4f0aaf9
--- /dev/null
+++ b/app/Caches/TopAnswererList.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Caches;
+
+use App\Models\Article as ArticleModel;
+use App\Models\ArticleLike as ArticleLikeModel;
+use App\Repos\User as UserRepo;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class TopAnswererList extends Cache
+{
+
+    protected $lifetime = 1 * 86400;
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return 'question_top_answerer_list';
+    }
+
+    public function getContent($id = null)
+    {
+        $rankings = $this->findWeeklyAuthorRankings();
+
+        if ($rankings->count() > 0) {
+            $userIds = kg_array_column($rankings->toArray(), 'author_id');
+            return $this->handleUsers($userIds);
+        }
+
+        $randOwners = $this->findRandArticleOwners();
+
+        if ($randOwners->count() > 0) {
+            $userIds = kg_array_column($randOwners->toArray(), 'owner_id');
+            return $this->handleUsers($userIds);
+        }
+
+        return [];
+    }
+
+    protected function handleUsers($userIds)
+    {
+        $userRepo = new UserRepo();
+
+        $users = $userRepo->findByIds($userIds);
+
+        $result = [];
+
+        foreach ($users as $user) {
+            $result[] = [
+                'id' => $user->id,
+                'name' => $user->name,
+                'avatar' => $user->avatar,
+                'title' => $user->title,
+                'about' => $user->about,
+                'vip' => $user->vip,
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param int $limit
+     * @return ResultsetInterface|Resultset
+     */
+    protected function findRandArticleOwners($limit = 10)
+    {
+        return ArticleModel::query()
+            ->columns(['owner_id'])
+            ->orderBy('RAND()')
+            ->limit($limit)
+            ->execute();
+    }
+
+    /**
+     * @param int $limit
+     * @return ResultsetInterface|Resultset
+     */
+    protected function findWeeklyAuthorRankings($limit = 10)
+    {
+        $createTime = strtotime('monday this week');
+
+        $columns = [
+            'author_id' => 'a.owner_id',
+            'like_count' => 'count(al.user_id)',
+        ];
+
+        return $this->modelsManager->createBuilder()
+            ->columns($columns)
+            ->addFrom(ArticleLikeModel::class, 'al')
+            ->join(ArticleModel::class, 'al.article_id = a.id', 'a')
+            ->where('al.create_time > :create_time:', ['create_time' => $createTime])
+            ->groupBy('author_id')
+            ->orderBy('like_count DESC')
+            ->limit($limit)->getQuery()->execute();
+    }
+
+}
diff --git a/app/Console/Tasks/ArticleIndexTask.php b/app/Console/Tasks/ArticleIndexTask.php
index addf2e4f..5528fbe0 100644
--- a/app/Console/Tasks/ArticleIndexTask.php
+++ b/app/Console/Tasks/ArticleIndexTask.php
@@ -118,7 +118,7 @@ class ArticleIndexTask extends Task
     protected function findArticles()
     {
         return ArticleModel::query()
-            ->where('published = 1')
+            ->where('published = :published:', ['published' => ArticleModel::PUBLISH_APPROVED])
             ->execute();
     }
 
diff --git a/app/Console/Tasks/QuestionIndexTask.php b/app/Console/Tasks/QuestionIndexTask.php
new file mode 100644
index 00000000..b6bfbc6a
--- /dev/null
+++ b/app/Console/Tasks/QuestionIndexTask.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Console\Tasks;
+
+use App\Models\Question as QuestionModel;
+use App\Services\Search\QuestionDocument;
+use App\Services\Search\QuestionSearcher;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class QuestionIndexTask extends Task
+{
+
+    /**
+     * 搜索测试
+     *
+     * @command: php console.php question_index search {query}
+     * @param array $params
+     * @throws \XSException
+     */
+    public function searchAction($params)
+    {
+        $query = $params[0] ?? null;
+
+        if (!$query) {
+            exit('please special a query word' . PHP_EOL);
+        }
+
+        $result = $this->searchQuestions($query);
+
+        var_export($result);
+    }
+
+    /**
+     * 清空索引
+     *
+     * @command: php console.php question_index clean
+     */
+    public function cleanAction()
+    {
+        $this->cleanQuestionIndex();
+    }
+
+    /**
+     * 重建索引
+     *
+     * @command: php console.php question_index rebuild
+     */
+    public function rebuildAction()
+    {
+        $this->rebuildQuestionIndex();
+    }
+
+    /**
+     * 清空索引
+     */
+    protected function cleanQuestionIndex()
+    {
+        $handler = new QuestionSearcher();
+
+        $index = $handler->getXS()->getIndex();
+
+        echo '------ start clean question index ------' . PHP_EOL;
+
+        $index->clean();
+
+        echo '------ end clean question index ------' . PHP_EOL;
+    }
+
+    /**
+     * 重建索引
+     */
+    protected function rebuildQuestionIndex()
+    {
+        $questions = $this->findQuestions();
+
+        if ($questions->count() == 0) return;
+
+        $handler = new QuestionSearcher();
+
+        $documenter = new QuestionDocument();
+
+        $index = $handler->getXS()->getIndex();
+
+        echo '------ start rebuild question index ------' . PHP_EOL;
+
+        $index->beginRebuild();
+
+        foreach ($questions as $question) {
+            $document = $documenter->setDocument($question);
+            $index->add($document);
+        }
+
+        $index->endRebuild();
+
+        echo '------ end rebuild question index ------' . PHP_EOL;
+    }
+
+    /**
+     * 搜索文章
+     *
+     * @param string $query
+     * @return array
+     * @throws \XSException
+     */
+    protected function searchQuestions($query)
+    {
+        $handler = new QuestionSearcher();
+
+        return $handler->search($query);
+    }
+
+    /**
+     * 查找文章
+     *
+     * @return ResultsetInterface|Resultset|QuestionModel[]
+     */
+    protected function findQuestions()
+    {
+        return QuestionModel::query()
+            ->where('published = :published:', ['published' => QuestionModel::PUBLISH_APPROVED])
+            ->execute();
+    }
+
+}
diff --git a/app/Console/Tasks/SitemapTask.php b/app/Console/Tasks/SitemapTask.php
index ad686103..a86751c8 100644
--- a/app/Console/Tasks/SitemapTask.php
+++ b/app/Console/Tasks/SitemapTask.php
@@ -8,6 +8,7 @@ use App\Models\Course as CourseModel;
 use App\Models\Help as HelpModel;
 use App\Models\ImGroup as ImGroupModel;
 use App\Models\Page as PageModel;
+use App\Models\Question as QuestionModel;
 use App\Models\Topic as TopicModel;
 use App\Models\User as UserModel;
 use App\Services\Service as AppService;
@@ -37,6 +38,7 @@ class SitemapTask extends Task
         $this->addIndex();
         $this->addCourses();
         $this->addArticles();
+        $this->addQuestions();
         $this->addTeachers();
         $this->addTopics();
         $this->addImGroups();
@@ -66,7 +68,11 @@ class SitemapTask extends Task
         /**
          * @var Resultset|CourseModel[] $courses
          */
-        $courses = CourseModel::query()->where('published = 1')->execute();
+        $courses = CourseModel::query()
+            ->where('published = 1')
+            ->orderBy('id DESC')
+            ->limit(500)
+            ->execute();
 
         if ($courses->count() == 0) return;
 
@@ -81,7 +87,11 @@ class SitemapTask extends Task
         /**
          * @var Resultset|ArticleModel[] $articles
          */
-        $articles = ArticleModel::query()->where('published = 1')->execute();
+        $articles = ArticleModel::query()
+            ->where('published = :published:', ['published' => ArticleModel::PUBLISH_APPROVED])
+            ->orderBy('id DESC')
+            ->limit(500)
+            ->execute();
 
         if ($articles->count() == 0) return;
 
@@ -91,6 +101,25 @@ class SitemapTask extends Task
         }
     }
 
+    protected function addQuestions()
+    {
+        /**
+         * @var Resultset|QuestionModel[] $questions
+         */
+        $questions = QuestionModel::query()
+            ->where('published = :published:', ['published' => QuestionModel::PUBLISH_APPROVED])
+            ->orderBy('id DESC')
+            ->limit(500)
+            ->execute();
+
+        if ($questions->count() == 0) return;
+
+        foreach ($questions as $question) {
+            $loc = sprintf('%s/question/%s', $this->siteUrl, $question->id);
+            $this->sitemap->addItem($loc, 0.8);
+        }
+    }
+
     protected function addTeachers()
     {
         /**
diff --git a/app/Console/Tasks/SyncArticleIndexTask.php b/app/Console/Tasks/SyncArticleIndexTask.php
index ace75ba4..dbd0ea51 100644
--- a/app/Console/Tasks/SyncArticleIndexTask.php
+++ b/app/Console/Tasks/SyncArticleIndexTask.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Tasks;
 
+use App\Models\Article as ArticleModel;
 use App\Repos\Article as ArticleRepo;
 use App\Services\Search\ArticleDocument;
 use App\Services\Search\ArticleSearcher;
@@ -38,7 +39,7 @@ class SyncArticleIndexTask extends Task
 
             $doc = $document->setDocument($article);
 
-            if ($article->published == 1) {
+            if ($article->published == ArticleModel::PUBLISH_APPROVED) {
                 $index->update($doc);
             } else {
                 $index->del($article->id);
diff --git a/app/Console/Tasks/SyncArticleScoreTask.php b/app/Console/Tasks/SyncArticleScoreTask.php
new file mode 100644
index 00000000..b6ee3376
--- /dev/null
+++ b/app/Console/Tasks/SyncArticleScoreTask.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Tasks;
+
+use App\Repos\Article as ArticleRepo;
+use App\Services\Sync\ArticleScore as ArticleScoreSync;
+use App\Services\Utils\ArticleScore as ArticleScoreService;
+
+class SyncArticleScoreTask extends Task
+{
+
+    public function mainAction()
+    {
+        $redis = $this->getRedis();
+
+        $key = $this->getSyncKey();
+
+        $articleIds = $redis->sRandMember($key, 1000);
+
+        if (!$articleIds) return;
+
+        $articleRepo = new ArticleRepo();
+
+        $articles = $articleRepo->findByIds($articleIds);
+
+        if ($articles->count() == 0) return;
+
+        $service = new ArticleScoreService();
+
+        foreach ($articles as $article) {
+            $service->handle($article);
+        }
+
+        $redis->sRem($key, ...$articleIds);
+    }
+
+    protected function getSyncKey()
+    {
+        $sync = new ArticleScoreSync();
+
+        return $sync->getSyncKey();
+    }
+
+}
diff --git a/app/Console/Tasks/SyncCourseScoreTask.php b/app/Console/Tasks/SyncCourseScoreTask.php
index 3a789633..b5cf1901 100644
--- a/app/Console/Tasks/SyncCourseScoreTask.php
+++ b/app/Console/Tasks/SyncCourseScoreTask.php
@@ -3,8 +3,8 @@
 namespace App\Console\Tasks;
 
 use App\Repos\Course as CourseRepo;
-use App\Services\CourseStat as CourseStatService;
 use App\Services\Sync\CourseScore as CourseScoreSync;
+use App\Services\Utils\CourseScore as CourseScoreService;
 
 class SyncCourseScoreTask extends Task
 {
@@ -25,10 +25,10 @@ class SyncCourseScoreTask extends Task
 
         if ($courses->count() == 0) return;
 
-        $statService = new CourseStatService();
+        $service = new CourseScoreService();
 
         foreach ($courses as $course) {
-            $statService->updateScore($course->id);
+            $service->handle($course);
         }
 
         $redis->sRem($key, ...$courseIds);
diff --git a/app/Console/Tasks/SyncQuestionIndexTask.php b/app/Console/Tasks/SyncQuestionIndexTask.php
new file mode 100644
index 00000000..6c99a6a5
--- /dev/null
+++ b/app/Console/Tasks/SyncQuestionIndexTask.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Console\Tasks;
+
+use App\Models\Question as QuestionModel;
+use App\Repos\Question as QuestionRepo;
+use App\Services\Search\QuestionDocument;
+use App\Services\Search\QuestionSearcher;
+use App\Services\Sync\QuestionIndex as QuestionIndexSync;
+
+class SyncQuestionIndexTask extends Task
+{
+
+    public function mainAction()
+    {
+        $redis = $this->getRedis();
+
+        $key = $this->getSyncKey();
+
+        $questionIds = $redis->sRandMember($key, 1000);
+
+        if (!$questionIds) return;
+
+        $questionRepo = new QuestionRepo();
+
+        $questions = $questionRepo->findByIds($questionIds);
+
+        if ($questions->count() == 0) return;
+
+        $document = new QuestionDocument();
+
+        $handler = new QuestionSearcher();
+
+        $index = $handler->getXS()->getIndex();
+
+        $index->openBuffer();
+
+        foreach ($questions as $question) {
+
+            $doc = $document->setDocument($question);
+
+            if ($question->published == QuestionModel::PUBLISH_APPROVED) {
+                $index->update($doc);
+            } else {
+                $index->del($question->id);
+            }
+        }
+
+        $index->closeBuffer();
+
+        $redis->sRem($key, ...$questionIds);
+    }
+
+    protected function getSyncKey()
+    {
+        $sync = new QuestionIndexSync();
+
+        return $sync->getSyncKey();
+    }
+
+}
diff --git a/app/Console/Tasks/SyncQuestionScoreTask.php b/app/Console/Tasks/SyncQuestionScoreTask.php
new file mode 100644
index 00000000..44bc0086
--- /dev/null
+++ b/app/Console/Tasks/SyncQuestionScoreTask.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Tasks;
+
+use App\Repos\Question as QuestionRepo;
+use App\Services\Sync\QuestionScore as QuestionScoreSync;
+use App\Services\Utils\QuestionScore as QuestionScoreService;
+
+class SyncQuestionScoreTask extends Task
+{
+
+    public function mainAction()
+    {
+        $redis = $this->getRedis();
+
+        $key = $this->getSyncKey();
+
+        $questionIds = $redis->sRandMember($key, 1000);
+
+        if (!$questionIds) return;
+
+        $questionRepo = new QuestionRepo();
+
+        $questions = $questionRepo->findByIds($questionIds);
+
+        if ($questions->count() == 0) return;
+
+        $service = new QuestionScoreService();
+
+        foreach ($questions as $question) {
+            $service->handle($question);
+        }
+
+        $redis->sRem($key, ...$questionIds);
+    }
+
+    protected function getSyncKey()
+    {
+        $sync = new QuestionScoreSync();
+
+        return $sync->getSyncKey();
+    }
+
+}
diff --git a/app/Http/Admin/Controllers/AnswerController.php b/app/Http/Admin/Controllers/AnswerController.php
new file mode 100644
index 00000000..e22ca8f3
--- /dev/null
+++ b/app/Http/Admin/Controllers/AnswerController.php
@@ -0,0 +1,201 @@
+<?php
+
+namespace App\Http\Admin\Controllers;
+
+use App\Http\Admin\Services\Answer as AnswerService;
+use App\Http\Admin\Services\Question as QuestionService;
+
+/**
+ * @RoutePrefix("/admin/answer")
+ */
+class AnswerController extends Controller
+{
+
+    /**
+     * @Get("/search", name="admin.answer.search")
+     */
+    public function searchAction()
+    {
+        $answerService = new AnswerService();
+
+        $publishTypes = $answerService->getPublishTypes();
+
+        $this->view->setVar('publish_types', $publishTypes);
+    }
+
+    /**
+     * @Get("/list", name="admin.answer.list")
+     */
+    public function listAction()
+    {
+        $answerService = new AnswerService();
+
+        $pager = $answerService->getAnswers();
+
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/add", name="admin.answer.add")
+     */
+    public function addAction()
+    {
+        $id = $this->request->getQuery('question_id', 'int', 0);
+
+        $questionService = new QuestionService();
+
+        $question = $questionService->getQuestion($id);
+
+        $referer = $this->request->getHTTPReferer();
+
+        $this->view->setVar('question', $question);
+        $this->view->setVar('referer', $referer);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/edit", name="admin.answer.edit")
+     */
+    public function editAction($id)
+    {
+        $answerService = new AnswerService();
+
+        $answer = $answerService->getAnswer($id);
+
+        $questionService = new QuestionService();
+
+        $question = $questionService->getQuestion($answer->question_id);
+
+        $referer = $this->request->getHTTPReferer();
+
+        $this->view->setVar('referer', $referer);
+        $this->view->setVar('question', $question);
+        $this->view->setVar('answer', $answer);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/show", name="admin.answer.show")
+     */
+    public function showAction($id)
+    {
+        $answerService = new AnswerService();
+
+        $answer = $answerService->getAnswer($id);
+
+        $this->view->setVar('answer', $answer);
+    }
+
+    /**
+     * @Post("/create", name="admin.answer.create")
+     */
+    public function createAction()
+    {
+        $answerService = new AnswerService();
+
+        $answerService->createAnswer();
+
+        $location = $this->request->getPost('referer');
+
+        if (empty($location)) {
+            $location = $this->url->get(['for' => 'admin.question.list']);
+        }
+
+        $content = [
+            'location' => $location,
+            'msg' => '回答问题成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="admin.answer.update")
+     */
+    public function updateAction($id)
+    {
+        $answerService = new AnswerService();
+
+        $answerService->updateAnswer($id);
+
+        $location = $this->request->getPost('referer');
+
+        if (empty($location)) {
+            $location = $this->url->get(['for' => 'admin.answer.list']);
+        }
+
+        $content = [
+            'location' => $location,
+            'msg' => '更新回答成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="admin.answer.delete")
+     */
+    public function deleteAction($id)
+    {
+        $answerService = new AnswerService();
+
+        $answerService->deleteAnswer($id);
+
+        $content = [
+            'location' => $this->request->getHTTPReferer(),
+            'msg' => '删除回答成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/restore", name="admin.answer.restore")
+     */
+    public function restoreAction($id)
+    {
+        $answerService = new AnswerService();
+
+        $answerService->restoreAnswer($id);
+
+        $content = [
+            'location' => $this->request->getHTTPReferer(),
+            'msg' => '还原回答成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Route("/{id:[0-9]+}/review", name="admin.answer.review")
+     */
+    public function reviewAction($id)
+    {
+        $answerService = new AnswerService();
+
+        $answer = $answerService->getAnswer($id);
+
+        if ($this->request->isPost()) {
+
+            $answerService->reviewAnswer($id);
+
+            $location = $this->url->get(['for' => 'admin.mod.answers']);
+
+            $content = [
+                'location' => $location,
+                'msg' => '审核回答成功',
+            ];
+
+            return $this->jsonSuccess($content);
+        }
+
+        $reasons = $answerService->getReasons();
+
+        $questionService = new QuestionService();
+
+        $question = $questionService->getQuestion($answer->question_id);
+
+        $this->view->setVar('reasons', $reasons);
+        $this->view->setVar('question', $question);
+        $this->view->setVar('answer', $answer);
+    }
+
+}
diff --git a/app/Http/Admin/Controllers/ArticleController.php b/app/Http/Admin/Controllers/ArticleController.php
index 7fd4a3b4..26080afb 100644
--- a/app/Http/Admin/Controllers/ArticleController.php
+++ b/app/Http/Admin/Controllers/ArticleController.php
@@ -54,19 +54,6 @@ class ArticleController extends Controller
         $this->view->setVar('pager', $pager);
     }
 
-    /**
-     * @Get("/list/pending", name="admin.article.pending_list")
-     */
-    public function pendingListAction()
-    {
-        $articleService = new ArticleService();
-
-        $pager = $articleService->getPendingArticles();
-
-        $this->view->pick('article/pending_list');
-        $this->view->setVar('pager', $pager);
-    }
-
     /**
      * @Get("/add", name="admin.article.add")
      */
@@ -106,10 +93,8 @@ class ArticleController extends Controller
     {
         $articleService = new ArticleService();
 
-        $rejectOptions = $articleService->getRejectOptions();
         $article = $articleService->getArticle($id);
 
-        $this->view->setVar('reject_options', $rejectOptions);
         $this->view->setVar('article', $article);
     }
 
@@ -184,22 +169,31 @@ class ArticleController extends Controller
     }
 
     /**
-     * @Post("/{id:[0-9]+}/review", name="admin.article.review")
+     * @Route("/{id:[0-9]+}/review", name="admin.article.review")
      */
     public function reviewAction($id)
     {
         $articleService = new ArticleService();
 
-        $articleService->reviewArticle($id);
+        if ($this->request->isPost()) {
 
-        $location = $this->url->get(['for' => 'admin.article.pending_list']);
+            $articleService->reviewArticle($id);
 
-        $content = [
-            'location' => $location,
-            'msg' => '审核文章成功',
-        ];
+            $location = $this->url->get(['for' => 'admin.mod.articles']);
 
-        return $this->jsonSuccess($content);
+            $content = [
+                'location' => $location,
+                'msg' => '审核文章成功',
+            ];
+
+            return $this->jsonSuccess($content);
+        }
+
+        $reasons = $articleService->getReasons();
+        $article = $articleService->getArticle($id);
+
+        $this->view->setVar('reasons', $reasons);
+        $this->view->setVar('article', $article);
     }
 
 }
diff --git a/app/Http/Admin/Controllers/ModerationController.php b/app/Http/Admin/Controllers/ModerationController.php
index 75c81808..0ec36a01 100644
--- a/app/Http/Admin/Controllers/ModerationController.php
+++ b/app/Http/Admin/Controllers/ModerationController.php
@@ -22,4 +22,28 @@ class ModerationController extends Controller
         $this->view->setVar('pager', $pager);
     }
 
+    /**
+     * @Get("/questions", name="admin.mod.questions")
+     */
+    public function questionsAction()
+    {
+        $modService = new ModerationService();
+
+        $pager = $modService->getQuestions();
+
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/answers", name="admin.mod.answers")
+     */
+    public function answersAction()
+    {
+        $modService = new ModerationService();
+
+        $pager = $modService->getAnswers();
+
+        $this->view->setVar('pager', $pager);
+    }
+
 }
diff --git a/app/Http/Admin/Controllers/QuestionController.php b/app/Http/Admin/Controllers/QuestionController.php
new file mode 100644
index 00000000..ef92e49d
--- /dev/null
+++ b/app/Http/Admin/Controllers/QuestionController.php
@@ -0,0 +1,195 @@
+<?php
+
+namespace App\Http\Admin\Controllers;
+
+use App\Http\Admin\Services\Question as QuestionService;
+use App\Models\Category as CategoryModel;
+
+/**
+ * @RoutePrefix("/admin/question")
+ */
+class QuestionController extends Controller
+{
+
+    /**
+     * @Get("/category", name="admin.question.category")
+     */
+    public function categoryAction()
+    {
+        $location = $this->url->get(
+            ['for' => 'admin.category.list'],
+            ['type' => CategoryModel::TYPE_ARTICLE]
+        );
+
+        $this->response->redirect($location);
+    }
+
+    /**
+     * @Get("/search", name="admin.question.search")
+     */
+    public function searchAction()
+    {
+        $questionService = new QuestionService();
+
+        $publishTypes = $questionService->getPublishTypes();
+        $categories = $questionService->getCategories();
+        $xmTags = $questionService->getXmTags(0);
+
+        $this->view->setVar('publish_types', $publishTypes);
+        $this->view->setVar('categories', $categories);
+        $this->view->setVar('xm_tags', $xmTags);
+    }
+
+    /**
+     * @Get("/list", name="admin.question.list")
+     */
+    public function listAction()
+    {
+        $questionService = new QuestionService();
+
+        $pager = $questionService->getQuestions();
+
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/add", name="admin.question.add")
+     */
+    public function addAction()
+    {
+        $questionService = new QuestionService();
+
+        $categories = $questionService->getCategories();
+
+        $this->view->setVar('categories', $categories);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/edit", name="admin.question.edit")
+     */
+    public function editAction($id)
+    {
+        $questionService = new QuestionService();
+
+        $publishTypes = $questionService->getPublishTypes();
+        $categories = $questionService->getCategories();
+        $question = $questionService->getQuestion($id);
+        $xmTags = $questionService->getXmTags($id);
+
+        $this->view->setVar('publish_types', $publishTypes);
+        $this->view->setVar('categories', $categories);
+        $this->view->setVar('question', $question);
+        $this->view->setVar('xm_tags', $xmTags);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/show", name="admin.question.show")
+     */
+    public function showAction($id)
+    {
+        $questionService = new QuestionService();
+
+        $question = $questionService->getQuestion($id);
+
+        $this->view->setVar('question', $question);
+    }
+
+    /**
+     * @Post("/create", name="admin.question.create")
+     */
+    public function createAction()
+    {
+        $questionService = new QuestionService();
+
+        $question = $questionService->createQuestion();
+
+        $location = $this->url->get([
+            'for' => 'admin.question.edit',
+            'id' => $question->id,
+        ]);
+
+        $content = [
+            'location' => $location,
+            'msg' => '创建问题成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="admin.question.update")
+     */
+    public function updateAction($id)
+    {
+        $questionService = new QuestionService();
+
+        $questionService->updateQuestion($id);
+
+        $content = ['msg' => '更新问题成功'];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="admin.question.delete")
+     */
+    public function deleteAction($id)
+    {
+        $questionService = new QuestionService();
+
+        $questionService->deleteQuestion($id);
+
+        $content = [
+            'location' => $this->request->getHTTPReferer(),
+            'msg' => '删除问题成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/restore", name="admin.question.restore")
+     */
+    public function restoreAction($id)
+    {
+        $questionService = new QuestionService();
+
+        $questionService->restoreQuestion($id);
+
+        $content = [
+            'location' => $this->request->getHTTPReferer(),
+            'msg' => '还原问题成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Route("/{id:[0-9]+}/review", name="admin.question.review")
+     */
+    public function reviewAction($id)
+    {
+        $questionService = new QuestionService();
+
+        if ($this->request->isPost()) {
+
+            $questionService->reviewQuestion($id);
+
+            $location = $this->url->get(['for' => 'admin.mod.questions']);
+
+            $content = [
+                'location' => $location,
+                'msg' => '审核问题成功',
+            ];
+
+            return $this->jsonSuccess($content);
+        }
+
+        $reasons = $questionService->getReasons();
+        $question = $questionService->getQuestion($id);
+
+        $this->view->setVar('reasons', $reasons);
+        $this->view->setVar('question', $question);
+    }
+
+}
diff --git a/app/Http/Admin/Controllers/UploadController.php b/app/Http/Admin/Controllers/UploadController.php
index 25edb530..b34c5f3a 100644
--- a/app/Http/Admin/Controllers/UploadController.php
+++ b/app/Http/Admin/Controllers/UploadController.php
@@ -53,6 +53,27 @@ class UploadController extends Controller
         return $this->jsonSuccess(['data' => $data]);
     }
 
+    /**
+     * @Post("/icon/img", name="admin.upload.icon_img")
+     */
+    public function uploadIconImageAction()
+    {
+        $service = new StorageService();
+
+        $file = $service->uploadIconImage();
+
+        if (!$file) {
+            return $this->jsonError(['msg' => '上传文件失败']);
+        }
+
+        $data = [
+            'src' => $service->getImageUrl($file->path),
+            'title' => $file->name,
+        ];
+
+        return $this->jsonSuccess(['data' => $data]);
+    }
+
     /**
      * @Post("/cover/img", name="admin.upload.cover_img")
      */
@@ -127,7 +148,6 @@ class UploadController extends Controller
 
         $items['user_avatar'] = $service->uploadDefaultUserAvatar();
         $items['group_avatar'] = $service->uploadDefaultGroupAvatar();
-        $items['article_cover'] = $service->uploadDefaultArticleCover();
         $items['course_cover'] = $service->uploadDefaultCourseCover();
         $items['package_cover'] = $service->uploadDefaultPackageCover();
         $items['gift_cover'] = $service->uploadDefaultGiftCover();
diff --git a/app/Http/Admin/Controllers/UserController.php b/app/Http/Admin/Controllers/UserController.php
index 5d106768..b53e405d 100644
--- a/app/Http/Admin/Controllers/UserController.php
+++ b/app/Http/Admin/Controllers/UserController.php
@@ -94,6 +94,18 @@ class UserController extends Controller
         $this->view->setVar('admin_roles', $adminRoles);
     }
 
+    /**
+     * @Get("/{id:[0-9]+}/online", name="admin.user.online")
+     */
+    public function onlineAction($id)
+    {
+        $userService = new UserService();
+
+        $pager = $userService->getOnlineLogs($id);
+
+        $this->view->setVar('pager', $pager);
+    }
+
     /**
      * @Post("/{id:[0-9]+}/update", name="admin.user.update")
      */
diff --git a/app/Http/Admin/Services/Answer.php b/app/Http/Admin/Services/Answer.php
new file mode 100644
index 00000000..b1fd1263
--- /dev/null
+++ b/app/Http/Admin/Services/Answer.php
@@ -0,0 +1,295 @@
+<?php
+
+namespace App\Http\Admin\Services;
+
+use App\Builders\AnswerList as AnswerListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Answer as AnswerModel;
+use App\Models\Question as QuestionModel;
+use App\Models\Reason as ReasonModel;
+use App\Models\User as UserModel;
+use App\Repos\Answer as AnswerRepo;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Notice\System\AnswerApproved as AnswerApprovedNotice;
+use App\Services\Logic\Notice\System\AnswerRejected as AnswerRejectedNotice;
+use App\Services\Logic\Notice\System\QuestionAnswered as QuestionAnsweredNotice;
+use App\Services\Logic\Point\History\AnswerPost as AnswerPostPointHistory;
+use App\Validators\Answer as AnswerValidator;
+
+class Answer extends Service
+{
+
+    public function getPublishTypes()
+    {
+        return AnswerModel::publishTypes();
+    }
+
+    public function getReasons()
+    {
+        return ReasonModel::answerRejectOptions();
+    }
+
+    public function getAnswers()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['deleted'] = $params['deleted'] ?? 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $answerRepo = new AnswerRepo();
+
+        $pager = $answerRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleAnswers($pager);
+    }
+
+    public function getAnswer($id)
+    {
+        return $this->findOrFail($id);
+    }
+
+    public function createAnswer()
+    {
+        $post = $this->request->getPost();
+
+        $user = $this->getLoginUser();
+
+        $validator = new AnswerValidator();
+
+        $question = $validator->checkQuestion($post['question_id']);
+
+        $answer = new AnswerModel();
+
+        $answer->owner_id = $user->id;
+        $answer->question_id = $question->id;
+        $answer->published = AnswerModel::PUBLISH_APPROVED;
+        $answer->content = $validator->checkContent($post['content']);
+
+        $answer->create();
+
+        $this->recountQuestionAnswers($question);
+        $this->recountUserAnswers($user);
+        $this->handleAnswerPostPoint($answer);
+        $this->handleQuestionAnsweredNotice($answer);
+
+        return $answer;
+    }
+
+    public function updateAnswer($id)
+    {
+        $answer = $this->findOrFail($id);
+
+        $post = $this->request->getPost();
+
+        $validator = new AnswerValidator();
+
+        $data = [];
+
+        if (isset($post['content'])) {
+            $data['content'] = $validator->checkContent($post['content']);
+        }
+
+        if (isset($post['published'])) {
+
+            $data['published'] = $validator->checkPublishStatus($post['published']);
+
+            $question = $this->findQuestion($answer->question_id);
+
+            $this->recountQuestionAnswers($question);
+
+            $user = $this->findUser($answer->owner_id);
+
+            $this->recountUserAnswers($user);
+        }
+
+        $answer->update($data);
+
+        return $answer;
+    }
+
+    public function deleteAnswer($id)
+    {
+        $answer = $this->findOrFail($id);
+
+        $answer->deleted = 1;
+
+        $answer->update();
+
+        $question = $this->findQuestion($answer->question_id);
+
+        $this->recountQuestionAnswers($question);
+
+        $owner = $this->findUser($answer->owner_id);
+
+        $this->recountUserAnswers($owner);
+
+        return $answer;
+    }
+
+    public function restoreAnswer($id)
+    {
+        $answer = $this->findOrFail($id);
+
+        $answer->deleted = 0;
+
+        $answer->update();
+
+        $question = $this->findQuestion($answer->question_id);
+
+        $this->recountQuestionAnswers($question);
+
+        $owner = $this->findUser($answer->owner_id);
+
+        $this->recountUserAnswers($owner);
+
+        return $answer;
+    }
+
+    public function reviewAnswer($id)
+    {
+        $type = $this->request->getPost('type', ['trim', 'string']);
+        $reason = $this->request->getPost('reason', ['trim', 'string']);
+
+        $answer = $this->findOrFail($id);
+
+        $validator = new AnswerValidator();
+
+        if ($type == 'approve') {
+            $answer->published = AnswerModel::PUBLISH_APPROVED;
+        } elseif ($type == 'reject') {
+            $validator->checkRejectReason($reason);
+            $answer->published = AnswerModel::PUBLISH_REJECTED;
+        }
+
+        $answer->update();
+
+        $question = $this->findQuestion($answer->question_id);
+
+        $this->recountQuestionAnswers($question);
+
+        $owner = $this->findUser($answer->owner_id);
+
+        $this->recountUserAnswers($owner);
+
+        $sender = $this->getLoginUser();
+
+        if ($type == 'approve') {
+
+            $this->handleAnswerPostPoint($answer);
+            $this->handleAnswerApprovedNotice($answer, $sender);
+
+            $this->eventsManager->fire('Answer:afterApprove', $this, $answer);
+
+        } elseif ($type == 'reject') {
+
+            $options = ReasonModel::answerRejectOptions();
+
+            if (array_key_exists($reason, $options)) {
+                $reason = $options[$reason];
+            }
+
+            $this->handleAnswerRejectedNotice($answer, $sender, $reason);
+
+            $this->eventsManager->fire('Answer:afterReject', $this, $answer);
+        }
+
+        return $answer;
+    }
+
+    protected function findOrFail($id)
+    {
+        $validator = new AnswerValidator();
+
+        return $validator->checkAnswer($id);
+    }
+
+    protected function findQuestion($id)
+    {
+        $questionRepo = new QuestionRepo();
+
+        return $questionRepo->findById($id);
+    }
+
+    protected function findUser($id)
+    {
+        $userRepo = new UserRepo();
+
+        return $userRepo->findById($id);
+    }
+
+    protected function handleAnswers($pager)
+    {
+        if ($pager->total_items > 0) {
+
+            $builder = new AnswerListBuilder();
+
+            $items = $pager->items->toArray();
+
+            $pipeA = $builder->handleQuestions($items);
+            $pipeB = $builder->handleUsers($pipeA);
+            $pipeC = $builder->objects($pipeB);
+
+            $pager->items = $pipeC;
+        }
+
+        return $pager;
+    }
+
+    protected function recountQuestionAnswers(QuestionModel $question)
+    {
+        $questionRepo = new QuestionRepo();
+
+        $answerCount = $questionRepo->countAnswers($question->id);
+
+        $question->answer_count = $answerCount;
+
+        $question->update();
+    }
+
+    protected function recountUserAnswers(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $answerCount = $userRepo->countAnswers($user->id);
+
+        $user->answer_count = $answerCount;
+
+        $user->update();
+    }
+
+    protected function handleQuestionAnsweredNotice(AnswerModel $answer)
+    {
+        $notice = new QuestionAnsweredNotice();
+
+        $notice->handle($answer);
+    }
+
+    protected function handleAnswerApprovedNotice(AnswerModel $answer, UserModel $sender)
+    {
+        $notice = new AnswerApprovedNotice();
+
+        $notice->handle($answer, $sender);
+    }
+
+    protected function handleAnswerRejectedNotice(AnswerModel $answer, UserModel $sender, $reason)
+    {
+        $notice = new AnswerRejectedNotice();
+
+        $notice->handle($answer, $sender, $reason);
+
+    }
+
+    protected function handleAnswerPostPoint(AnswerModel $answer)
+    {
+        $service = new AnswerPostPointHistory();
+
+        $service->handle($answer);
+    }
+
+}
diff --git a/app/Http/Admin/Services/Article.php b/app/Http/Admin/Services/Article.php
index 98674a74..fa39df84 100644
--- a/app/Http/Admin/Services/Article.php
+++ b/app/Http/Admin/Services/Article.php
@@ -7,15 +7,14 @@ use App\Caches\Article as ArticleCache;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Library\Utils\Word as WordUtil;
 use App\Models\Article as ArticleModel;
-use App\Models\ArticleTag as ArticleTagModel;
 use App\Models\Category as CategoryModel;
 use App\Models\Reason as ReasonModel;
 use App\Models\User as UserModel;
 use App\Repos\Article as ArticleRepo;
-use App\Repos\ArticleTag as ArticleTagRepo;
 use App\Repos\Category as CategoryRepo;
 use App\Repos\Tag as TagRepo;
 use App\Repos\User as UserRepo;
+use App\Services\Logic\Article\ArticleDataTrait;
 use App\Services\Logic\Notice\System\ArticleApproved as ArticleApprovedNotice;
 use App\Services\Logic\Notice\System\ArticleRejected as ArticleRejectedNotice;
 use App\Services\Logic\Point\History\ArticlePost as ArticlePostPointHistory;
@@ -25,20 +24,13 @@ use App\Validators\Article as ArticleValidator;
 class Article extends Service
 {
 
-    public function getArticleModel()
-    {
-        $article = new ArticleModel();
-
-        $article->afterFetch();
-
-        return $article;
-    }
+    use ArticleDataTrait;
 
     public function getXmTags($id)
     {
         $tagRepo = new TagRepo();
 
-        $allTags = $tagRepo->findAll(['published' => 1], 'priority');
+        $allTags = $tagRepo->findAll(['published' => 1]);
 
         if ($allTags->count() == 0) return [];
 
@@ -86,7 +78,7 @@ class Article extends Service
         return ArticleModel::sourceTypes();
     }
 
-    public function getRejectOptions()
+    public function getReasons()
     {
         return ReasonModel::articleRejectOptions();
     }
@@ -132,13 +124,14 @@ class Article extends Service
 
         $article = new ArticleModel();
 
+        $article->published = ArticleModel::PUBLISH_APPROVED;
         $article->owner_id = $user->id;
         $article->category_id = $category->id;
         $article->title = $title;
 
         $article->create();
 
-        $this->incrUserArticleCount($user);
+        $this->recountUserArticles($user);
 
         $this->eventsManager->fire('Article:afterCreate', $this, $article);
 
@@ -164,14 +157,6 @@ class Article extends Service
             $data['title'] = $validator->checkTitle($post['title']);
         }
 
-        if (isset($post['cover'])) {
-            $data['cover'] = $validator->checkCover($post['cover']);
-        }
-
-        if (isset($post['summary'])) {
-            $data['summary'] = $validator->checkSummary($post['summary']);
-        }
-
         if (isset($post['content'])) {
             $data['content'] = $validator->checkContent($post['content']);
             $data['word_count'] = WordUtil::getWordCount($data['content']);
@@ -184,8 +169,8 @@ class Article extends Service
             }
         }
 
-        if (isset($post['allow_comment'])) {
-            $data['allow_comment'] = $post['allow_comment'];
+        if (isset($post['closed'])) {
+            $data['closed'] = $validator->checkCloseStatus($post['closed']);
         }
 
         if (isset($post['private'])) {
@@ -197,7 +182,12 @@ class Article extends Service
         }
 
         if (isset($post['published'])) {
+
             $data['published'] = $validator->checkPublishStatus($post['published']);
+
+            $owner = $this->findUser($article->owner_id);
+
+            $this->recountUserArticles($owner);
         }
 
         if (isset($post['xm_tag_ids'])) {
@@ -225,7 +215,7 @@ class Article extends Service
 
         $owner = $userRepo->findById($article->owner_id);
 
-        $this->decrUserArticleCount($owner);
+        $this->recountUserArticles($owner);
 
         $this->rebuildArticleIndex($article);
 
@@ -246,7 +236,7 @@ class Article extends Service
 
         $owner = $userRepo->findById($article->owner_id);
 
-        $this->incrUserArticleCount($owner);
+        $this->recountUserArticles($owner);
 
         $this->rebuildArticleIndex($article);
 
@@ -262,14 +252,25 @@ class Article extends Service
 
         $article = $this->findOrFail($id);
 
+        $validator = new ArticleValidator();
+
         if ($type == 'approve') {
+
             $article->published = ArticleModel::PUBLISH_APPROVED;
+
         } elseif ($type == 'reject') {
+
+            $validator->checkRejectReason($reason);
+
             $article->published = ArticleModel::PUBLISH_REJECTED;
         }
 
         $article->update();
 
+        $owner = $this->findUser($article->owner_id);
+
+        $this->recountUserArticles($owner);
+
         $sender = $this->getLoginUser();
 
         if ($type == 'approve') {
@@ -309,59 +310,11 @@ class Article extends Service
         return $validator->checkArticle($id);
     }
 
-    protected function saveTags(ArticleModel $article, $tagIds)
+    protected function findUser($id)
     {
-        $originTagIds = [];
+        $userRepo = new UserRepo();
 
-        /**
-         * 修改数据后，afterFetch设置的属性会失效，重新执行
-         */
-        $article->afterFetch();
-
-        if ($article->tags) {
-            $originTagIds = kg_array_column($article->tags, 'id');
-        }
-
-        $newTagIds = $tagIds ? explode(',', $tagIds) : [];
-        $addedTagIds = array_diff($newTagIds, $originTagIds);
-
-        if ($addedTagIds) {
-            foreach ($addedTagIds as $tagId) {
-                $articleTag = new ArticleTagModel();
-                $articleTag->article_id = $article->id;
-                $articleTag->tag_id = $tagId;
-                $articleTag->create();
-            }
-        }
-
-        $deletedTagIds = array_diff($originTagIds, $newTagIds);
-
-        if ($deletedTagIds) {
-            $articleTagRepo = new ArticleTagRepo();
-            foreach ($deletedTagIds as $tagId) {
-                $articleTag = $articleTagRepo->findArticleTag($article->id, $tagId);
-                if ($articleTag) {
-                    $articleTag->delete();
-                }
-            }
-        }
-
-        $articleTags = [];
-
-        if ($newTagIds) {
-            $tagRepo = new TagRepo();
-            $tags = $tagRepo->findByIds($newTagIds);
-            if ($tags->count() > 0) {
-                $articleTags = [];
-                foreach ($tags as $tag) {
-                    $articleTags[] = ['id' => $tag->id, 'name' => $tag->name];
-                }
-            }
-        }
-
-        $article->tags = $articleTags;
-
-        $article->update();
+        return $userRepo->findById($id);
     }
 
     protected function handleArticles($pager)
@@ -383,21 +336,17 @@ class Article extends Service
         return $pager;
     }
 
-    protected function incrUserArticleCount(UserModel $user)
+    protected function recountUserArticles(UserModel $user)
     {
-        $user->article_count += 1;
+        $userRepo = new UserRepo();
+
+        $articleCount = $userRepo->countArticles($user->id);
+
+        $user->article_count = $articleCount;
 
         $user->update();
     }
 
-    protected function decrUserArticleCount(UserModel $user)
-    {
-        if ($user->article_count > 0) {
-            $user->article_count -= 1;
-            $user->update();
-        }
-    }
-
     protected function rebuildArticleCache(ArticleModel $article)
     {
         $cache = new ArticleCache();
diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php
index 1c7871e3..b62914ae 100644
--- a/app/Http/Admin/Services/AuthNode.php
+++ b/app/Http/Admin/Services/AuthNode.php
@@ -272,12 +272,6 @@ class AuthNode extends Service
                             'type' => 'button',
                             'route' => 'admin.article.edit',
                         ],
-                        [
-                            'id' => '1-7-6',
-                            'title' => '文章分类',
-                            'type' => 'menu',
-                            'route' => 'admin.article.category',
-                        ],
                         [
                             'id' => '1-7-5',
                             'title' => '删除文章',
@@ -288,7 +282,7 @@ class AuthNode extends Service
                             'id' => '1-7-9',
                             'title' => '文章详情',
                             'type' => 'button',
-                            'route' => 'admin.article.review',
+                            'route' => 'admin.article.show',
                         ],
                         [
                             'id' => '1-7-10',
@@ -298,6 +292,104 @@ class AuthNode extends Service
                         ],
                     ],
                 ],
+                [
+                    'id' => '1-10',
+                    'title' => '问题管理',
+                    'type' => 'menu',
+                    'children' => [
+                        [
+                            'id' => '1-10-1',
+                            'title' => '问题列表',
+                            'type' => 'menu',
+                            'route' => 'admin.question.list',
+                        ],
+                        [
+                            'id' => '1-10-2',
+                            'title' => '搜索问题',
+                            'type' => 'menu',
+                            'route' => 'admin.question.search',
+                        ],
+                        [
+                            'id' => '1-10-3',
+                            'title' => '添加问题',
+                            'type' => 'menu',
+                            'route' => 'admin.question.add',
+                        ],
+                        [
+                            'id' => '1-10-4',
+                            'title' => '编辑问题',
+                            'type' => 'button',
+                            'route' => 'admin.question.edit',
+                        ],
+                        [
+                            'id' => '1-10-5',
+                            'title' => '删除问题',
+                            'type' => 'button',
+                            'route' => 'admin.question.delete',
+                        ],
+                        [
+                            'id' => '1-10-9',
+                            'title' => '问题详情',
+                            'type' => 'button',
+                            'route' => 'admin.question.show',
+                        ],
+                        [
+                            'id' => '1-10-10',
+                            'title' => '审核问题',
+                            'type' => 'button',
+                            'route' => 'admin.question.review',
+                        ],
+                    ],
+                ],
+                [
+                    'id' => '1-11',
+                    'title' => '回答管理',
+                    'type' => 'menu',
+                    'children' => [
+                        [
+                            'id' => '1-11-1',
+                            'title' => '回答列表',
+                            'type' => 'menu',
+                            'route' => 'admin.answer.list',
+                        ],
+                        [
+                            'id' => '1-11-2',
+                            'title' => '搜索回答',
+                            'type' => 'menu',
+                            'route' => 'admin.answer.search',
+                        ],
+                        [
+                            'id' => '1-11-3',
+                            'title' => '添加答案',
+                            'type' => 'button',
+                            'route' => 'admin.answer.add',
+                        ],
+                        [
+                            'id' => '1-11-4',
+                            'title' => '编辑回答',
+                            'type' => 'button',
+                            'route' => 'admin.answer.edit',
+                        ],
+                        [
+                            'id' => '1-11-5',
+                            'title' => '删除回答',
+                            'type' => 'button',
+                            'route' => 'admin.answer.delete',
+                        ],
+                        [
+                            'id' => '1-11-9',
+                            'title' => '回答详情',
+                            'type' => 'button',
+                            'route' => 'admin.answer.show',
+                        ],
+                        [
+                            'id' => '1-11-10',
+                            'title' => '审核回答',
+                            'type' => 'button',
+                            'route' => 'admin.answer.review',
+                        ],
+                    ],
+                ],
                 [
                     'id' => '1-8',
                     'title' => '标签管理',
@@ -387,6 +479,18 @@ class AuthNode extends Service
                             'type' => 'menu',
                             'route' => 'admin.mod.articles',
                         ],
+                        [
+                            'id' => '2-10-2',
+                            'title' => '问题列表',
+                            'type' => 'menu',
+                            'route' => 'admin.mod.questions',
+                        ],
+                        [
+                            'id' => '2-10-3',
+                            'title' => '回答列表',
+                            'type' => 'menu',
+                            'route' => 'admin.mod.answers',
+                        ],
                     ],
                 ],
                 [
@@ -542,6 +646,12 @@ class AuthNode extends Service
                             'type' => 'menu',
                             'route' => 'admin.slide.list',
                         ],
+                        [
+                            'id' => '2-5-5',
+                            'title' => '搜索轮播',
+                            'type' => 'menu',
+                            'route' => 'admin.slide.search',
+                        ],
                         [
                             'id' => '2-5-2',
                             'title' => '添加轮播',
@@ -560,12 +670,6 @@ class AuthNode extends Service
                             'type' => 'button',
                             'route' => 'admin.slide.delete',
                         ],
-                        [
-                            'id' => '2-5-5',
-                            'title' => '搜索轮播',
-                            'type' => 'menu',
-                            'route' => 'admin.slide.search',
-                        ],
                     ],
                 ],
                 [
@@ -851,7 +955,13 @@ class AuthNode extends Service
                             'title' => '编辑用户',
                             'type' => 'button',
                             'route' => 'admin.user.edit',
-                        ]
+                        ],
+                        [
+                            'id' => '4-1-5',
+                            'title' => '在线记录',
+                            'type' => 'button',
+                            'route' => 'admin.user.online',
+                        ],
                     ],
                 ],
                 [
diff --git a/app/Http/Admin/Services/Consult.php b/app/Http/Admin/Services/Consult.php
index 667b99a7..cb93d9a5 100644
--- a/app/Http/Admin/Services/Consult.php
+++ b/app/Http/Admin/Services/Consult.php
@@ -4,7 +4,10 @@ namespace App\Http\Admin\Services;
 
 use App\Builders\ConsultList as ConsultListBuilder;
 use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Chapter as ChapterModel;
 use App\Models\Consult as ConsultModel;
+use App\Models\Course as CourseModel;
+use App\Repos\Chapter as ChapterRepo;
 use App\Repos\Consult as ConsultRepo;
 use App\Repos\Course as CourseRepo;
 use App\Services\Logic\Notice\ConsultReply as ConsultReplyNotice;
@@ -74,6 +77,7 @@ class Consult extends Service
 
         if (isset($post['published'])) {
             $data['published'] = $validator->checkPublishStatus($post['published']);
+            $this->handleItemConsults($consult);
         }
 
         $consult->update($data);
@@ -93,13 +97,7 @@ class Consult extends Service
 
         $consult->update();
 
-        $courseRepo = new CourseRepo();
-
-        $course = $courseRepo->findById($consult->course_id);
-
-        $course->consult_count -= 1;
-
-        $course->update();
+        $this->handleItemConsults($consult);
     }
 
     public function restoreConsult($id)
@@ -110,13 +108,20 @@ class Consult extends Service
 
         $consult->update();
 
-        $courseRepo = new CourseRepo();
+        $this->handleItemConsults($consult);
+    }
 
-        $course = $courseRepo->findById($consult->course_id);
+    protected function handleItemConsults(ConsultModel $consult)
+    {
+        if ($consult->course_id > 0) {
+            $course = $this->findCourse($consult->course_id);
+            $this->recountCourseConsults($course);
+        }
 
-        $course->consult_count += 1;
-
-        $course->update();
+        if ($consult->chapter_id > 0) {
+            $chapter = $this->findChapter($consult->chapter_id);
+            $this->recountChapterConsults($chapter);
+        }
     }
 
     protected function handleReplyNotice(ConsultModel $consult)
@@ -133,6 +138,42 @@ class Consult extends Service
         return $validator->checkConsult($id);
     }
 
+    protected function findCourse($id)
+    {
+        $courseRepo = new CourseRepo();
+
+        return $courseRepo->findById($id);
+    }
+
+    protected function findChapter($id)
+    {
+        $chapterRepo = new ChapterRepo();
+
+        return $chapterRepo->findById($id);
+    }
+
+    protected function recountCourseConsults(CourseModel $course)
+    {
+        $courseRepo = new CourseRepo();
+
+        $consultCount = $courseRepo->countConsults($course->id);
+
+        $course->consult_count = $consultCount;
+
+        $course->update();
+    }
+
+    protected function recountChapterConsults(ChapterModel $chapter)
+    {
+        $chapterRepo = new ChapterRepo();
+
+        $consultCount = $chapterRepo->countConsults($chapter->id);
+
+        $chapter->consult_count = $consultCount;
+
+        $chapter->update();
+    }
+
     protected function handleConsults($pager)
     {
         if ($pager->total_items > 0) {
diff --git a/app/Http/Admin/Services/Moderation.php b/app/Http/Admin/Services/Moderation.php
index 68b69cc0..fbf3cfa7 100644
--- a/app/Http/Admin/Services/Moderation.php
+++ b/app/Http/Admin/Services/Moderation.php
@@ -2,10 +2,16 @@
 
 namespace App\Http\Admin\Services;
 
+use App\Builders\AnswerList as AnswerListBuilder;
 use App\Builders\ArticleList as ArticleListBuilder;
+use App\Builders\QuestionList as QuestionListBuilder;
 use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Answer as AnswerModel;
 use App\Models\Article as ArticleModel;
+use App\Models\Question as QuestionModel;
+use App\Repos\Answer as AnswerRepo;
 use App\Repos\Article as ArticleRepo;
+use App\Repos\Question as QuestionRepo;
 
 class Moderation extends Service
 {
@@ -30,6 +36,46 @@ class Moderation extends Service
         return $this->handleArticles($pager);
     }
 
+    public function getQuestions()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['published'] = QuestionModel::PUBLISH_PENDING;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $questionRepo = new QuestionRepo();
+
+        $pager = $questionRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleQuestions($pager);
+    }
+
+    public function getAnswers()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['published'] = AnswerModel::PUBLISH_PENDING;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $answerRepo = new AnswerRepo();
+
+        $pager = $answerRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleAnswers($pager);
+    }
+
     protected function handleArticles($pager)
     {
         if ($pager->total_items > 0) {
@@ -49,4 +95,41 @@ class Moderation extends Service
         return $pager;
     }
 
+    protected function handleQuestions($pager)
+    {
+        if ($pager->total_items > 0) {
+
+            $builder = new QuestionListBuilder();
+
+            $items = $pager->items->toArray();
+
+            $pipeA = $builder->handleQuestions($items);
+            $pipeB = $builder->handleCategories($pipeA);
+            $pipeC = $builder->handleUsers($pipeB);
+            $pipeD = $builder->objects($pipeC);
+
+            $pager->items = $pipeD;
+        }
+
+        return $pager;
+    }
+
+    protected function handleAnswers($pager)
+    {
+        if ($pager->total_items > 0) {
+
+            $builder = new AnswerListBuilder();
+
+            $items = $pager->items->toArray();
+
+            $pipeA = $builder->handleQuestions($items);
+            $pipeB = $builder->handleUsers($pipeA);
+            $pipeC = $builder->objects($pipeB);
+
+            $pager->items = $pipeC;
+        }
+
+        return $pager;
+    }
+
 }
diff --git a/app/Http/Admin/Services/Question.php b/app/Http/Admin/Services/Question.php
new file mode 100644
index 00000000..eda8ffd3
--- /dev/null
+++ b/app/Http/Admin/Services/Question.php
@@ -0,0 +1,349 @@
+<?php
+
+namespace App\Http\Admin\Services;
+
+use App\Builders\QuestionList as QuestionListBuilder;
+use App\Caches\Question as QuestionCache;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Category as CategoryModel;
+use App\Models\Question as QuestionModel;
+use App\Models\Reason as ReasonModel;
+use App\Models\User as UserModel;
+use App\Repos\Category as CategoryRepo;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\Tag as TagRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Notice\System\QuestionApproved as QuestionApprovedNotice;
+use App\Services\Logic\Notice\System\QuestionRejected as QuestionRejectedNotice;
+use App\Services\Logic\Point\History\QuestionPost as QuestionPostPointHistory;
+use App\Services\Logic\Question\QuestionDataTrait;
+use App\Services\Sync\QuestionIndex as QuestionIndexSync;
+use App\Validators\Question as QuestionValidator;
+
+class Question extends Service
+{
+
+    use QuestionDataTrait;
+
+    public function getXmTags($id)
+    {
+        $tagRepo = new TagRepo();
+
+        $allTags = $tagRepo->findAll(['published' => 1]);
+
+        if ($allTags->count() == 0) return [];
+
+        $questionTagIds = [];
+
+        if ($id > 0) {
+            $question = $this->findOrFail($id);
+            if (!empty($question->tags)) {
+                $questionTagIds = kg_array_column($question->tags, 'id');
+            }
+        }
+
+        $list = [];
+
+        foreach ($allTags as $tag) {
+            $selected = in_array($tag->id, $questionTagIds);
+            $list[] = [
+                'name' => $tag->name,
+                'value' => $tag->id,
+                'selected' => $selected,
+            ];
+        }
+
+        return $list;
+    }
+
+    public function getCategories()
+    {
+        $categoryRepo = new CategoryRepo();
+
+        return $categoryRepo->findAll([
+            'type' => CategoryModel::TYPE_ARTICLE,
+            'level' => 1,
+            'published' => 1,
+        ]);
+    }
+
+    public function getPublishTypes()
+    {
+        return QuestionModel::publishTypes();
+    }
+
+    public function getReasons()
+    {
+        return ReasonModel::questionRejectOptions();
+    }
+
+    public function getQuestions()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        if (!empty($params['xm_tag_ids'])) {
+            $params['tag_id'] = explode(',', $params['xm_tag_ids']);
+        }
+
+        $params['deleted'] = $params['deleted'] ?? 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $questionRepo = new QuestionRepo();
+
+        $pager = $questionRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleQuestions($pager);
+    }
+
+    public function getQuestion($id)
+    {
+        return $this->findOrFail($id);
+    }
+
+    public function createQuestion()
+    {
+        $post = $this->request->getPost();
+
+        $user = $this->getLoginUser();
+
+        $validator = new QuestionValidator();
+
+        $title = $validator->checkTitle($post['title']);
+
+        $question = new QuestionModel();
+
+        $question->published = QuestionModel::PUBLISH_APPROVED;
+        $question->owner_id = $user->id;
+        $question->title = $title;
+
+        $question->create();
+
+        $this->recountUserQuestions($user);
+
+        $this->eventsManager->fire('Question:afterCreate', $this, $question);
+
+        return $question;
+    }
+
+    public function updateQuestion($id)
+    {
+        $post = $this->request->getPost();
+
+        $question = $this->findOrFail($id);
+
+        $validator = new QuestionValidator();
+
+        $data = [];
+
+        if (isset($post['category_id'])) {
+            $category = $validator->checkCategory($post['category_id']);
+            $data['category_id'] = $category->id;
+        }
+
+        if (isset($post['title'])) {
+            $data['title'] = $validator->checkTitle($post['title']);
+        }
+
+        if (isset($post['content'])) {
+            $data['content'] = $validator->checkContent($post['content']);
+        }
+
+        if (isset($post['anonymous'])) {
+            $data['anonymous'] = $validator->checkAnonymousStatus($post['anonymous']);
+        }
+
+        if (isset($post['closed'])) {
+            $data['closed'] = $validator->checkCloseStatus($post['closed']);
+        }
+
+        if (isset($post['published'])) {
+
+            $data['published'] = $validator->checkPublishStatus($post['published']);
+
+            $owner = $this->findUser($question->owner_id);
+
+            $this->recountUserQuestions($owner);
+        }
+
+        if (isset($post['xm_tag_ids'])) {
+            $this->saveTags($question, $post['xm_tag_ids']);
+        }
+
+        $question->update($data);
+
+        $this->rebuildQuestionIndex($question);
+
+        $this->eventsManager->fire('Question:afterUpdate', $this, $question);
+
+        return $question;
+    }
+
+    public function deleteQuestion($id)
+    {
+        $question = $this->findOrFail($id);
+
+        $question->deleted = 1;
+
+        $question->update();
+
+        $userRepo = new UserRepo();
+
+        $owner = $userRepo->findById($question->owner_id);
+
+        $this->recountUserQuestions($owner);
+
+        $this->rebuildQuestionIndex($question);
+
+        $this->eventsManager->fire('Question:afterDelete', $this, $question);
+
+        return $question;
+    }
+
+    public function restoreQuestion($id)
+    {
+        $question = $this->findOrFail($id);
+
+        $question->deleted = 0;
+
+        $question->update();
+
+        $userRepo = new UserRepo();
+
+        $owner = $userRepo->findById($question->owner_id);
+
+        $this->recountUserQuestions($owner);
+
+        $this->rebuildQuestionIndex($question);
+
+        $this->eventsManager->fire('Question:afterRestore', $this, $question);
+
+        return $question;
+    }
+
+    public function reviewQuestion($id)
+    {
+        $type = $this->request->getPost('type', ['trim', 'string']);
+        $reason = $this->request->getPost('reason', ['trim', 'string']);
+
+        $question = $this->findOrFail($id);
+
+        $validator = new QuestionValidator();
+
+        if ($type == 'approve') {
+            $question->published = QuestionModel::PUBLISH_APPROVED;
+        } elseif ($type == 'reject') {
+            $validator->checkRejectReason($reason);
+            $question->published = QuestionModel::PUBLISH_REJECTED;
+        }
+
+        $question->update();
+
+        $owner = $this->findUser($question->owner_id);
+
+        $this->recountUserQuestions($owner);
+
+        $sender = $this->getLoginUser();
+
+        if ($type == 'approve') {
+
+            $this->rebuildQuestionIndex($question);
+
+            $this->handlePostPoint($question);
+
+            $notice = new QuestionApprovedNotice();
+
+            $notice->handle($question, $sender);
+
+            $this->eventsManager->fire('Question:afterApprove', $this, $question);
+
+        } elseif ($type == 'reject') {
+
+            $options = ReasonModel::questionRejectOptions();
+
+            if (array_key_exists($reason, $options)) {
+                $reason = $options[$reason];
+            }
+
+            $notice = new QuestionRejectedNotice();
+
+            $notice->handle($question, $sender, $reason);
+
+            $this->eventsManager->fire('Question:afterReject', $this, $question);
+        }
+
+        return $question;
+    }
+
+    protected function findOrFail($id)
+    {
+        $validator = new QuestionValidator();
+
+        return $validator->checkQuestion($id);
+    }
+
+    protected function findUser($id)
+    {
+        $userRepo = new UserRepo();
+
+        return $userRepo->findById($id);
+    }
+
+    protected function handleQuestions($pager)
+    {
+        if ($pager->total_items > 0) {
+
+            $builder = new QuestionListBuilder();
+
+            $items = $pager->items->toArray();
+
+            $pipeA = $builder->handleQuestions($items);
+            $pipeB = $builder->handleCategories($pipeA);
+            $pipeC = $builder->handleUsers($pipeB);
+            $pipeD = $builder->objects($pipeC);
+
+            $pager->items = $pipeD;
+        }
+
+        return $pager;
+    }
+
+    protected function recountUserQuestions(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $questionCount = $userRepo->countQuestions($user->id);
+
+        $user->question_count = $questionCount;
+
+        $user->update();
+    }
+
+    protected function rebuildQuestionCache(QuestionModel $question)
+    {
+        $cache = new QuestionCache();
+
+        $cache->rebuild($question->id);
+    }
+
+    protected function rebuildQuestionIndex(QuestionModel $question)
+    {
+        $sync = new QuestionIndexSync();
+
+        $sync->addItem($question->id);
+    }
+
+    protected function handlePostPoint(QuestionModel $question)
+    {
+        if ($question->published != QuestionModel::PUBLISH_APPROVED) return;
+
+        $service = new QuestionPostPointHistory();
+
+        $service->handle($question);
+    }
+
+}
diff --git a/app/Http/Admin/Services/Review.php b/app/Http/Admin/Services/Review.php
index 5ae43fb6..e04c41fb 100644
--- a/app/Http/Admin/Services/Review.php
+++ b/app/Http/Admin/Services/Review.php
@@ -4,6 +4,7 @@ namespace App\Http\Admin\Services;
 
 use App\Builders\ReviewList as ReviewListBuilder;
 use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Course as CourseModel;
 use App\Repos\Course as CourseRepo;
 use App\Repos\Review as ReviewRepo;
 use App\Services\CourseStat as CourseStatService;
@@ -47,6 +48,8 @@ class Review extends Service
     {
         $review = $this->findOrFail($id);
 
+        $course = $this->findCourse($review->course_id);
+
         $post = $this->request->getPost();
 
         $validator = new ReviewValidator();
@@ -71,11 +74,12 @@ class Review extends Service
 
         if (isset($post['published'])) {
             $data['published'] = $validator->checkPublishStatus($post['published']);
+            $this->recountCourseReviews($course);
         }
 
         $review->update($data);
 
-        $this->updateCourseRating($review->course_id);
+        $this->updateCourseRating($course);
 
         return $review;
     }
@@ -88,7 +92,9 @@ class Review extends Service
 
         $review->update();
 
-        $this->decrCourseReviewCount($review->course_id);
+        $course = $this->findCourse($review->course_id);
+
+        $this->recountCourseReviews($course);
     }
 
     public function restoreReview($id)
@@ -99,7 +105,9 @@ class Review extends Service
 
         $review->update();
 
-        $this->incrCourseReviewCount($review->course_id);
+        $course = $this->findCourse($review->course_id);
+
+        $this->recountCourseReviews($course);
     }
 
     protected function findOrFail($id)
@@ -109,33 +117,29 @@ class Review extends Service
         return $validator->checkReview($id);
     }
 
-    protected function incrCourseReviewCount($courseId)
+    protected function findCourse($id)
     {
         $courseRepo = new CourseRepo();
 
-        $course = $courseRepo->findById($courseId);
+        return $courseRepo->findById($id);
+    }
 
-        $course->review_count -= 1;
+    protected function recountCourseReviews(CourseModel $course)
+    {
+        $courseRepo = new CourseRepo();
+
+        $reviewCount = $courseRepo->countReviews($course->id);
+
+        $course->review_count = $reviewCount;
 
         $course->update();
     }
 
-    protected function decrCourseReviewCount($courseId)
-    {
-        $courseRepo = new CourseRepo();
-
-        $course = $courseRepo->findById($courseId);
-
-        $course->review_count += 1;
-
-        $course->update();
-    }
-
-    protected function updateCourseRating($courseId)
+    protected function updateCourseRating(CourseModel $course)
     {
         $service = new CourseStatService();
 
-        $service->updateRating($courseId);
+        $service->updateRating($course->id);
     }
 
     protected function handleReviews($pager)
diff --git a/app/Http/Admin/Services/Tag.php b/app/Http/Admin/Services/Tag.php
index b0a75ef5..584a8086 100644
--- a/app/Http/Admin/Services/Tag.php
+++ b/app/Http/Admin/Services/Tag.php
@@ -19,7 +19,7 @@ class Tag extends Service
 
         $params['deleted'] = $params['deleted'] ?? 0;
 
-        $sort = 'priority';
+        $sort = $pagerQuery->getSort();
         $page = $pagerQuery->getPage();
         $limit = $pagerQuery->getLimit();
 
@@ -42,7 +42,7 @@ class Tag extends Service
         $tag = new TagModel();
 
         $tag->name = $validator->checkName($post['name']);
-        $tag->published = $validator->checkPublishStatus($post['published']);
+        $tag->priority = $validator->checkPriority($post['priority']);
 
         $tag->create();
 
@@ -68,6 +68,10 @@ class Tag extends Service
             }
         }
 
+        if (isset($post['icon'])) {
+            $data['icon'] = $validator->checkIcon($post['icon']);
+        }
+
         if (isset($post['priority'])) {
             $data['priority'] = $validator->checkPriority($post['priority']);
         }
diff --git a/app/Http/Admin/Services/User.php b/app/Http/Admin/Services/User.php
index 7ebf83c9..ac95ca4e 100644
--- a/app/Http/Admin/Services/User.php
+++ b/app/Http/Admin/Services/User.php
@@ -10,6 +10,7 @@ use App\Models\Account as AccountModel;
 use App\Models\ImUser as ImUserModel;
 use App\Models\User as UserModel;
 use App\Repos\Account as AccountRepo;
+use App\Repos\Online as OnlineRepo;
 use App\Repos\Role as RoleRepo;
 use App\Repos\User as UserRepo;
 use App\Validators\Account as AccountValidator;
@@ -30,6 +31,25 @@ class User extends Service
         return $roleRepo->findAll(['deleted' => 0]);
     }
 
+    public function getOnlineLogs($id)
+    {
+        $user = $this->findOrFail($id);
+
+        $pageQuery = new PaginateQuery();
+
+        $params = $pageQuery->getParams();
+
+        $params['user_id'] = $user->id;
+
+        $sort = $pageQuery->getSort();
+        $page = $pageQuery->getPage();
+        $limit = $pageQuery->getLimit();
+
+        $onlineRepo = new OnlineRepo();
+
+        return $onlineRepo->paginate($params, $sort, $page, $limit);
+    }
+
     public function getUsers()
     {
         $pageQuery = new PaginateQuery();
diff --git a/app/Http/Admin/Views/answer/add.volt b/app/Http/Admin/Views/answer/add.volt
new file mode 100644
index 00000000..4b6a5dcf
--- /dev/null
+++ b/app/Http/Admin/Views/answer/add.volt
@@ -0,0 +1,41 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.answer.create'}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>回答问题</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <div class="layui-input-block" style="margin:0;">
+                <input class="layui-input" type="text" name="title" value="{{ question.title }}" readonly="readonly">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block" style="margin:0;">
+                <div id="vditor"></div>
+                <textarea name="content" class="layui-hide" id="vditor-textarea"></textarea>
+            </div>
+        </div>
+        <div class="layui-input-block kg-center" style="margin:0;">
+            <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">提交</button>
+            <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            <input type="hidden" name="referer" value="{{ referer }}">
+            <input type="hidden" name="question_id" value="{{ question.id }}">
+        </div>
+    </form>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('https://cdn.jsdelivr.net/npm/vditor/dist/index.css', false) }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/index.min.js', false) }}
+    {{ js_include('admin/js/vditor.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/answer/edit.volt b/app/Http/Admin/Views/answer/edit.volt
new file mode 100644
index 00000000..d11df81c
--- /dev/null
+++ b/app/Http/Admin/Views/answer/edit.volt
@@ -0,0 +1,40 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.answer.update','id':answer.id}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>编辑答案</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <div class="layui-input-block" style="margin:0;">
+                <input class="layui-input" type="text" name="title" value="{{ question.title }}" readonly="readonly">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block" style="margin:0;">
+                <div id="vditor"></div>
+                <textarea name="content" class="layui-hide" id="vditor-textarea">{{ answer.content }}</textarea>
+            </div>
+        </div>
+        <div class="layui-input-block kg-center" style="margin:0;">
+            <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">提交</button>
+            <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            <input type="hidden" name="referer" value="{{ referer }}">
+        </div>
+    </form>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('https://cdn.jsdelivr.net/npm/vditor/dist/index.css', false) }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/index.min.js', false) }}
+    {{ js_include('admin/js/vditor.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/answer/list.volt b/app/Http/Admin/Views/answer/list.volt
new file mode 100644
index 00000000..697a5f19
--- /dev/null
+++ b/app/Http/Admin/Views/answer/list.volt
@@ -0,0 +1,64 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/answer') }}
+
+    <table class="layui-table kg-table layui-form">
+        <colgroup>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col width="10%">
+        </colgroup>
+        <thead>
+        <tr>
+            <th>信息</th>
+            <th>评论</th>
+            <th>点赞</th>
+            <th>状态</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            {% set question_url = url({'for':'home.question.show','id':item.question.id}) %}
+            {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+            {% set review_url = url({'for':'admin.answer.review','id':item.id}) %}
+            {% set edit_url = url({'for':'admin.answer.edit','id':item.id}) %}
+            {% set delete_url = url({'for':'admin.answer.delete','id':item.id}) %}
+            {% set restore_url = url({'for':'admin.answer.restore','id':item.id}) %}
+            <tr>
+                <td>
+                    <P>问题：<a href="{{ question_url }}" target="_blank">{{ item.question.title }}</a></P>
+                    <p>回答：{{ item.summary }}</p>
+                    <p>作者：<a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a>　创建：{{ date('Y-m-d',item.create_time) }}</p>
+                </td>
+                <td>{{ item.comment_count }}</td>
+                <td>{{ item.like_count }}</td>
+                <td>{{ publish_status(item.published) }}</td>
+                <td class="center">
+                    <div class="layui-dropdown">
+                        <button class="layui-btn layui-btn-sm">操作 <i class="layui-icon layui-icon-triangle-d"></i></button>
+                        <ul>
+                            {% if item.published == 1 %}
+                                <li><a href="{{ review_url }}">审核回答</a></li>
+                            {% endif %}
+                            <li><a href="{{ edit_url }}">编辑回答</a></li>
+                            {% if item.deleted == 0 %}
+                                <a href="javascript:" class="kg-delete" data-url="{{ delete_url }}">删除回答</a>
+                            {% else %}
+                                <a href="javascript:" class="kg-restore" data-url="{{ restore_url }}">还原回答</a>
+                            {% endif %}
+                        </ul>
+                    </div>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/article/show.volt b/app/Http/Admin/Views/answer/review.volt
similarity index 70%
rename from app/Http/Admin/Views/article/show.volt
rename to app/Http/Admin/Views/answer/review.volt
index 106706e9..c94e5e6e 100644
--- a/app/Http/Admin/Views/article/show.volt
+++ b/app/Http/Admin/Views/answer/review.volt
@@ -2,24 +2,20 @@
 
 {% block content %}
 
-    {% set list_url = url({'for':'admin.article.pending_list'}) %}
+    <fieldset class="layui-elem-field layui-field-title">
+        <legend>审核内容</legend>
+    </fieldset>
 
-    <div class="kg-nav">
-        <div class="kg-nav-left">
-            <span class="layui-breadcrumb">
-                <a href="{{ list_url }}">审核列表</a>
-                <a><cite>{{ article.title }}</cite></a>
-            </span>
-        </div>
+    <div class="kg-mod-preview">
+        <div class="title">{{ question.title }}</div>
+        <div class="content markdown-body">{{ answer.content }}</div>
     </div>
 
-    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.article.review','id':article.id}) }}">
-        <div class="layui-form-item">
-            <label class="layui-form-label">内容</label>
-            <div class="layui-input-block">
-                <div class="content markdown-body">{{ article.content|parse_markdown }}</div>
-            </div>
-        </div>
+    <fieldset class="layui-elem-field layui-field-title">
+        <legend>审核意见</legend>
+    </fieldset>
+
+    <form class="layui-form kg-form kg-review-form" method="POST" action="{{ url({'for':'admin.answer.review','id':answer.id}) }}">
         <div class="layui-form-item">
             <label class="layui-form-label">审核</label>
             <div class="layui-input-block">
@@ -33,7 +29,7 @@
                 <div class="layui-input-block">
                     <select name="reason">
                         <option value="">请选择</option>
-                        {% for value,name in reject_options %}
+                        {% for value,name in reasons %}
                             <option value="{{ value }}">{{ name }}</option>
                         {% endfor %}
                     </select>
diff --git a/app/Http/Admin/Views/comment/search.volt b/app/Http/Admin/Views/answer/search.volt
similarity index 63%
rename from app/Http/Admin/Views/comment/search.volt
rename to app/Http/Admin/Views/answer/search.volt
index b0c4a8b7..cd0e7b6f 100644
--- a/app/Http/Admin/Views/comment/search.volt
+++ b/app/Http/Admin/Views/answer/search.volt
@@ -2,20 +2,20 @@
 
 {% block content %}
 
-    <form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.review.list'}) }}">
+    <form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.answer.list'}) }}">
         <fieldset class="layui-elem-field layui-field-title">
-            <legend>搜索评价</legend>
+            <legend>搜索回答</legend>
         </fieldset>
         <div class="layui-form-item">
-            <label class="layui-form-label">评价编号</label>
+            <label class="layui-form-label">回答编号</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="id" placeholder="评价编号精确匹配">
+                <input class="layui-input" type="text" name="id" placeholder="回答编号精确匹配">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">课程编号</label>
+            <label class="layui-form-label">问题编号</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="course_id" placeholder="课程编号精确匹配">
+                <input class="layui-input" type="text" name="question_id" placeholder="问题编号精确匹配">
             </div>
         </div>
         <div class="layui-form-item">
@@ -25,10 +25,18 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">发布</label>
+            <label class="layui-form-label">发布状态</label>
             <div class="layui-input-block">
-                <input type="radio" name="published" value="1" title="是">
-                <input type="radio" name="published" value="0" title="否">
+                {% for value,title in publish_types %}
+                    <input type="radio" name="published" value="{{ value }}" title="{{ title }}">
+                {% endfor %}
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">匿名</label>
+            <div class="layui-input-block">
+                <input type="radio" name="anonymous" value="1" title="是">
+                <input type="radio" name="anonymous" value="0" title="否">
             </div>
         </div>
         <div class="layui-form-item">
diff --git a/app/Http/Admin/Views/article/add.volt b/app/Http/Admin/Views/article/add.volt
index 81e6d1e4..369bd8c8 100644
--- a/app/Http/Admin/Views/article/add.volt
+++ b/app/Http/Admin/Views/article/add.volt
@@ -6,17 +6,6 @@
         <fieldset class="layui-elem-field layui-field-title">
             <legend>添加文章</legend>
         </fieldset>
-        <div class="layui-form-item">
-            <label class="layui-form-label">分类</label>
-            <div class="layui-input-block">
-                <select name="category_id" lay-verify="required">
-                    <option value="">请选择</option>
-                    {% for item in categories %}
-                        <option value="{{ item.id }}">{{ item.name }}</option>
-                    {% endfor %}
-                </select>
-            </div>
-        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">标题</label>
             <div class="layui-input-block">
diff --git a/app/Http/Admin/Views/article/edit.volt b/app/Http/Admin/Views/article/edit.volt
index 9cfa6e0b..179f055e 100644
--- a/app/Http/Admin/Views/article/edit.volt
+++ b/app/Http/Admin/Views/article/edit.volt
@@ -33,7 +33,6 @@
 
     {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/index.min.js', false) }}
     {{ js_include('lib/xm-select.js') }}
-    {{ js_include('admin/js/cover.upload.js') }}
     {{ js_include('admin/js/vditor.js') }}
 
 {% endblock %}
diff --git a/app/Http/Admin/Views/article/edit_basic.volt b/app/Http/Admin/Views/article/edit_basic.volt
index 8857b583..ebf4ea31 100644
--- a/app/Http/Admin/Views/article/edit_basic.volt
+++ b/app/Http/Admin/Views/article/edit_basic.volt
@@ -1,33 +1,12 @@
 {% set source_url_display = article.source_type == 1 ? 'display:none' : 'display:block' %}
 
 <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.article.update','id':article.id}) }}">
-    <div class="layui-form-item">
-        <label class="layui-form-label">封面</label>
-        <div class="layui-input-inline">
-            <img id="img-cover" class="kg-cover" src="{{ article.cover }}">
-            <input type="hidden" name="cover" value="{{ article.cover }}">
-        </div>
-        <div class="layui-input-inline" style="padding-top:35px;">
-            <button id="change-cover" class="layui-btn layui-btn-sm" type="button">更换</button>
-        </div>
-    </div>
     <div class="layui-form-item">
         <label class="layui-form-label">标题</label>
         <div class="layui-input-block">
             <input class="layui-input" type="text" name="title" value="{{ article.title }}" lay-verify="required">
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">分类</label>
-        <div class="layui-input-block">
-            <select name="category_id" lay-verify="required">
-                <option value="">请选择</option>
-                {% for item in categories %}
-                    <option value="{{ item.id }}" {% if article.category_id == item.id %}selected="selected"{% endif %}>{{ item.name }}</option>
-                {% endfor %}
-            </select>
-        </div>
-    </div>
     <div class="layui-form-item">
         <label class="layui-form-label">标签</label>
         <div class="layui-input-block">
@@ -51,18 +30,10 @@
         </div>
     </div>
     <div class="layui-form-item">
-        <label class="layui-form-label">发布状态</label>
+        <label class="layui-form-label">关闭评论</label>
         <div class="layui-input-block">
-            {% for value,title in publish_types %}
-                <input type="radio" name="published" value="{{ value }}" title="{{ title }}" {% if article.published == value %}checked="checked"{% endif %} lay-filter="source_type">
-            {% endfor %}
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">允许评论</label>
-        <div class="layui-input-block">
-            <input type="radio" name="allow_comment" value="1" title="是" {% if article.allow_comment == 1 %}checked="checked"{% endif %}>
-            <input type="radio" name="allow_comment" value="0" title="否" {% if article.allow_comment == 0 %}checked="checked"{% endif %}>
+            <input type="radio" name="closed" value="1" title="是" {% if article.closed == 1 %}checked="checked"{% endif %}>
+            <input type="radio" name="closed" value="0" title="否" {% if article.closed == 0 %}checked="checked"{% endif %}>
         </div>
     </div>
     <div class="layui-form-item">
diff --git a/app/Http/Admin/Views/article/edit_desc.volt b/app/Http/Admin/Views/article/edit_desc.volt
index 70123beb..185096f2 100644
--- a/app/Http/Admin/Views/article/edit_desc.volt
+++ b/app/Http/Admin/Views/article/edit_desc.volt
@@ -1,20 +1,12 @@
 <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.article.update','id':article.id}) }}">
     <div class="layui-form-item">
-        <label class="layui-form-label">详情</label>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="margin:0;">
             <div id="vditor"></div>
             <textarea name="content" class="layui-hide" id="vditor-textarea">{{ article.content }}</textarea>
         </div>
     </div>
     <div class="layui-form-item">
-        <label class="layui-form-label">简介</label>
-        <div class="layui-input-block">
-            <textarea name="summary" class="layui-textarea">{{ article.summary }}</textarea>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label"></label>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="margin:0;">
             <button class="kg-submit layui-btn" lay-submit="true" lay-filter="go">提交</button>
             <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
         </div>
diff --git a/app/Http/Admin/Views/article/list.volt b/app/Http/Admin/Views/article/list.volt
index 95eab222..b13ccdea 100644
--- a/app/Http/Admin/Views/article/list.volt
+++ b/app/Http/Admin/Views/article/list.volt
@@ -38,13 +38,13 @@
         <thead>
         <tr>
             <th>文章</th>
-            <th>状态</th>
-            <th>浏览</th>
             <th>评论</th>
+            <th>浏览</th>
             <th>点赞</th>
             <th>收藏</th>
+            <th>状态</th>
             <th>推荐</th>
-            <th>评论</th>
+            <th>关闭</th>
             <th>操作</th>
         </tr>
         </thead>
@@ -52,6 +52,7 @@
         {% for item in pager.items %}
             {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
             {% set preview_url = url({'for':'home.article.show','id':item.id}) %}
+            {% set review_url = url({'for':'admin.article.review','id':item.id}) %}
             {% set edit_url = url({'for':'admin.article.edit','id':item.id}) %}
             {% set update_url = url({'for':'admin.article.update','id':item.id}) %}
             {% set delete_url = url({'for':'admin.article.delete','id':item.id}) %}
@@ -74,18 +75,22 @@
                         <span>创建：{{ date('Y-m-d',item.create_time) }}</span>
                     </p>
                 </td>
-                <td>{{ publish_status(item.published) }}</td>
                 <td>{{ item.view_count }}</td>
                 <td>{{ item.comment_count }}</td>
                 <td>{{ item.like_count }}</td>
                 <td>{{ item.favorite_count }}</td>
+                <td>{{ publish_status(item.published) }}</td>
                 <td><input type="checkbox" name="featured" value="1" lay-skin="switch" lay-text="是|否" lay-filter="featured" data-url="{{ update_url }}" {% if item.featured == 1 %}checked="checked"{% endif %}></td>
-                <td><input type="checkbox" name="comment" value="1" lay-skin="switch" lay-text="开|关" lay-filter="comment" data-url="{{ update_url }}" {% if item.allow_comment == 1 %}checked="checked"{% endif %}></td>
+                <td><input type="checkbox" name="comment" value="1" lay-skin="switch" lay-text="是|否" lay-filter="closed" data-url="{{ update_url }}" {% if item.closed == 1 %}checked="checked"{% endif %}></td>
                 <td class="center">
                     <div class="layui-dropdown">
                         <button class="layui-btn layui-btn-sm">操作 <i class="layui-icon layui-icon-triangle-d"></i></button>
                         <ul>
-                            <li><a href="{{ preview_url }}" target="_blank">预览文章</a></li>
+                            {% if item.published == 1 %}
+                                <li><a href="{{ review_url }}">审核文章</a></li>
+                            {% elseif item.published == 2 %}
+                                <li><a href="{{ preview_url }}" target="_blank">预览文章</a></li>
+                            {% endif %}
                             <li><a href="{{ edit_url }}">编辑文章</a></li>
                             {% if item.deleted == 0 %}
                                 <li><a href="javascript:" class="kg-delete" data-url="{{ delete_url }}">删除文章</a></li>
@@ -142,16 +147,16 @@
                 });
             });
 
-            form.on('switch(comment)', function (data) {
+            form.on('switch(closed)', function (data) {
                 var checked = $(this).is(':checked');
-                var allowComment = checked ? 1 : 0;
+                var closed = checked ? 1 : 0;
                 var url = $(this).data('url');
-                var tips = allowComment === 1 ? '确定要开启评论？' : '确定要关闭评论？';
+                var tips = closed === 1 ? '确定要关闭评论？' : '确定要开启评论？';
                 layer.confirm(tips, function () {
                     $.ajax({
                         type: 'POST',
                         url: url,
-                        data: {allow_comment: allowComment},
+                        data: {closed: closed},
                         success: function (res) {
                             layer.msg(res.msg, {icon: 1});
                         },
diff --git a/app/Http/Admin/Views/article/review.volt b/app/Http/Admin/Views/article/review.volt
new file mode 100644
index 00000000..f24ca97d
--- /dev/null
+++ b/app/Http/Admin/Views/article/review.volt
@@ -0,0 +1,85 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <fieldset class="layui-elem-field layui-field-title">
+        <legend>审核内容</legend>
+    </fieldset>
+
+    <div class="kg-mod-preview">
+        <div class="title">{{ article.title }}</div>
+        <div class="content markdown-body">{{ article.content }}</div>
+        {% if article.tags %}
+            <div class="tags">
+                {% for item in article.tags %}
+                    <span class="layui-btn layui-btn-xs">{{ item['name'] }}</span>
+                {% endfor %}
+            </div>
+        {% endif %}
+    </div>
+
+    <fieldset class="layui-elem-field layui-field-title">
+        <legend>审核意见</legend>
+    </fieldset>
+
+    <form class="layui-form kg-form kg-review-form" method="POST" action="{{ url({'for':'admin.article.review','id':article.id}) }}">
+        <div class="layui-form-item">
+            <label class="layui-form-label">审核</label>
+            <div class="layui-input-block">
+                <input type="radio" name="type" value="approve" title="通过" lay-filter="review">
+                <input type="radio" name="type" value="reject" title="拒绝" lay-filter="review">
+            </div>
+        </div>
+        <div id="reason-block" style="display:none;">
+            <div class="layui-form-item">
+                <label class="layui-form-label">理由</label>
+                <div class="layui-input-block">
+                    <select name="reason">
+                        <option value="">请选择</option>
+                        {% for value,name in reasons %}
+                            <option value="{{ value }}">{{ name }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button id="kg-submit" class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('home/css/markdown.css') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        layui.use(['jquery', 'form'], function () {
+
+            var $ = layui.jquery;
+            var form = layui.form;
+
+            form.on('radio(review)', function (data) {
+                var block = $('#reason-block');
+                if (data.value === 'approve') {
+                    block.hide();
+                } else {
+                    block.show();
+                }
+            });
+
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/article/search.volt b/app/Http/Admin/Views/article/search.volt
index 69b89d9f..a21a904d 100644
--- a/app/Http/Admin/Views/article/search.volt
+++ b/app/Http/Admin/Views/article/search.volt
@@ -24,17 +24,6 @@
                 <input class="layui-input" type="text" name="title" placeholder="标题模糊匹配">
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">分类</label>
-            <div class="layui-input-block">
-                <select name="category_id">
-                    <option value="">请选择</option>
-                    {% for item in categories %}
-                        <option value="{{ item.id }}">{{ item.name }}</option>
-                    {% endfor %}
-                </select>
-            </div>
-        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">标签</label>
             <div class="layui-input-block">
@@ -57,6 +46,20 @@
                 {% endfor %}
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">允许评论</label>
+            <div class="layui-input-block">
+                <input type="radio" name="closed" value="0" title="是">
+                <input type="radio" name="closed" value="1" title="否">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">仅我可见</label>
+            <div class="layui-input-block">
+                <input type="radio" name="private" value="1" title="是">
+                <input type="radio" name="private" value="0" title="否">
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">推荐</label>
             <div class="layui-input-block">
diff --git a/app/Http/Admin/Views/audit/list.volt b/app/Http/Admin/Views/audit/list.volt
index b1b739d7..b40d81be 100644
--- a/app/Http/Admin/Views/audit/list.volt
+++ b/app/Http/Admin/Views/audit/list.volt
@@ -40,20 +40,15 @@
         </thead>
         <tbody>
         {% for item in pager.items %}
-            {% set list_by_id_url = url({'for':'admin.audit.list'},{'user_id':item.user_id}) %}
-            {% set list_by_ip_url = url({'for':'admin.audit.list'},{'user_ip':item.user_ip}) %}
-            {% set list_by_route_url = url({'for':'admin.audit.list'},{'req_route':item.req_route}) %}
-            {% set list_by_path_url = url({'for':'admin.audit.list'},{'req_path':item.req_path}) %}
             {% set show_url = url({'for':'admin.audit.show','id':item.id}) %}
             <tr>
                 <td>{{ item.user_id }}</td>
-                <td><a href="{{ list_by_id_url }}">{{ item.user_name }}</a></td>
+                <td>{{ item.user_name }}</td>
                 <td>
-                    <a href="{{ list_by_ip_url }}">{{ item.user_ip }}</a>
-                    <span class="layui-btn layui-btn-xs kg-ip2region" data-ip="{{ item.user_ip }}">位置</span>
+                    <a href="javascript:" class="kg-ip2region" title="查看位置" data-ip="{{ item.user_ip }}">{{ item.user_ip }}</a>
                 </td>
-                <td><a href="{{ list_by_route_url }}">{{ item.req_route }}</a></td>
-                <td><a href="{{ list_by_path_url }}">{{ item.req_path }}</a></td>
+                <td>{{ item.req_route }}</td>
+                <td>{{ item.req_path }}</td>
                 <td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
                 <td class="center">
                     <button class="kg-view layui-btn layui-btn-sm" data-url="{{ show_url }}">详情</button>
diff --git a/app/Http/Admin/Views/comment/edit.volt b/app/Http/Admin/Views/comment/edit.volt
deleted file mode 100644
index 292772af..00000000
--- a/app/Http/Admin/Views/comment/edit.volt
+++ /dev/null
@@ -1,98 +0,0 @@
-{% extends 'templates/main.volt' %}
-
-{% block content %}
-
-    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.review.update','id':review.id}) }}">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>编辑评价</legend>
-        </fieldset>
-        <div class="layui-form-item">
-            <label class="layui-form-label">内容实用</label>
-            <div class="layui-input-block">
-                <div id="rating1" class="kg-rating"></div>
-                <input type="hidden" name="rating1" value="{{ review.rating1 }}"/>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">通俗易懂</label>
-            <div class="layui-input-block">
-                <div id="rating2" class="kg-rating"></div>
-                <input type="hidden" name="rating2" value="{{ review.rating2 }}"/>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">逻辑清晰</label>
-            <div class="layui-input-block">
-                <div id="rating3" class="kg-rating"></div>
-                <input type="hidden" name="rating3" value="{{ review.rating3 }}"/>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">课程评价</label>
-            <div class="layui-input-block">
-                <div class="layui-form-mid gray">{{ review.content }}</div>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">发布</label>
-            <div class="layui-input-block">
-                <input type="radio" name="published" value="1" title="是" {% if review.published == 1 %}checked="checked"{% endif %}>
-                <input type="radio" name="published" value="0" title="否" {% if review.published == 0 %}checked="checked"{% endif %}>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"></label>
-            <div class="layui-input-block">
-                <button class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
-                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
-            </div>
-        </div>
-    </form>
-
-{% endblock %}
-
-{% block inline_js %}
-
-    <script>
-
-        layui.use(['jquery', 'rate'], function () {
-
-            var $ = layui.jquery;
-            var rate = layui.rate;
-
-            var $rating1 = $('input[name=rating1]');
-            var $rating2 = $('input[name=rating2]');
-            var $rating3 = $('input[name=rating3]');
-
-            rate.render({
-                elem: '#rating1',
-                value: $rating1.val(),
-                readonly: true,
-                choose: function (value) {
-                    $rating1.val(value);
-                }
-            });
-
-            rate.render({
-                elem: '#rating2',
-                value: $rating2.val(),
-                readonly: true,
-                choose: function (value) {
-                    $rating2.val(value);
-                }
-            });
-
-            rate.render({
-                elem: '#rating3',
-                value: $rating3.val(),
-                readonly: true,
-                choose: function (value) {
-                    $rating3.val(value);
-                }
-            });
-
-        });
-
-    </script>
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/comment/list.volt b/app/Http/Admin/Views/comment/list.volt
index 64071a58..539ebbd9 100644
--- a/app/Http/Admin/Views/comment/list.volt
+++ b/app/Http/Admin/Views/comment/list.volt
@@ -4,9 +4,9 @@
 
     {{ partial('macros/common') }}
 
-    <table class="layui-table kg-table layui-form">
+    <table class="layui-table kg-table layui-form" lay-size="lg">
         <colgroup>
-            <col>
+            <col width="50%">
             <col>
             <col>
             <col>
@@ -15,31 +15,23 @@
         <thead>
         <tr>
             <th>评论</th>
+            <th>点赞</th>
             <th>用户</th>
-            <th>终端</th>
-            <th>发布</th>
+            <th>时间</th>
             <th>操作</th>
         </tr>
         </thead>
         <tbody>
         {% for item in pager.items %}
+            {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
             {% set update_url = url({'for':'admin.comment.update','id':item.id}) %}
             {% set delete_url = url({'for':'admin.comment.delete','id':item.id}) %}
             {% set restore_url = url({'for':'admin.comment.restore','id':item.id}) %}
             <tr>
-                <td>
-                    <p>内容：<a href="javascript:" title="{{ item.content }}">{{ substr(item.content,0,30) }}</a></p>
-                    <p>时间：{{ date('Y-m-d H:i',item.create_time) }}，点赞：{{ item.like_count }}</p>
-                </td>
-                <td>
-                    <p>昵称：{{ item.owner.name }}</p>
-                    <p>编号：{{ item.owner.id }}</p>
-                </td>
-                <td>
-                    <p>类型：{{ client_type(item.client_type) }}</p>
-                    <p>地址：<a href="javascript:" class="kg-ip2region" data-ip="{{ item.client_ip }}">查看</a></p>
-                </td>
-                <td><input type="checkbox" name="published" value="1" lay-skin="switch" lay-text="是|否" lay-filter="published" data-url="{{ update_url }}" {% if item.published == 1 %}checked="checked"{% endif %}></td>
+                <td>{{ item.content }}</td>
+                <td>{{ item.like_count }}</td>
+                <td><a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a></td>
+                <td>{{ date('Y-m-d',item.create_time) }}</td>
                 <td class="center">
                     {% if item.deleted == 0 %}
                         <a href="javascript:" class="layui-badge layui-bg-red kg-delete" data-url="{{ delete_url }}">删除</a>
@@ -54,10 +46,4 @@
 
     {{ partial('partials/pager') }}
 
-{% endblock %}
-
-{% block include_js %}
-
-    {{ js_include('admin/js/ip2region.js') }}
-
 {% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/macros/answer.volt b/app/Http/Admin/Views/macros/answer.volt
new file mode 100644
index 00000000..05de2d9f
--- /dev/null
+++ b/app/Http/Admin/Views/macros/answer.volt
@@ -0,0 +1,11 @@
+{%- macro publish_status(type) %}
+    {% if type == 1 %}
+        审核中
+    {% elseif type == 2 %}
+        已发布
+    {% elseif type == 3 %}
+        未通过
+    {% else %}
+        未知
+    {% endif %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/macros/article.volt b/app/Http/Admin/Views/macros/article.volt
index 9d31a831..c904f6ba 100644
--- a/app/Http/Admin/Views/macros/article.volt
+++ b/app/Http/Admin/Views/macros/article.volt
@@ -12,11 +12,11 @@
 
 {%- macro source_info(type,url) %}
     {% if type == 1 %}
-        原创
+        <span class="layui-badge">原创</span>
     {% elseif type == 2 %}
-        <a href="{{ url }}" target="_blank">转载</a>
+        <a class="layui-badge layui-bg-blue" href="{{ url }}" target="_blank">转载</a>
     {% elseif type == 3 %}
-        翻译
+        <span class="layui-badge layui-bg-gray">翻译</span>
     {% else %}
         N/A
     {% endif %}
diff --git a/app/Http/Admin/Views/macros/question.volt b/app/Http/Admin/Views/macros/question.volt
new file mode 100644
index 00000000..6593e6ea
--- /dev/null
+++ b/app/Http/Admin/Views/macros/question.volt
@@ -0,0 +1,18 @@
+{%- macro publish_status(type) %}
+    {% if type == 1 %}
+        审核中
+    {% elseif type == 2 %}
+        已发布
+    {% elseif type == 3 %}
+        未通过
+    {% else %}
+        未知
+    {% endif %}
+{%- endmacro %}
+
+{%- macro tags_info(items) %}
+    {% for item in items %}
+        {% set comma = loop.last ? '' : ',' %}
+        {{ item.name ~ comma }}
+    {% endfor %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/moderation/answers.volt b/app/Http/Admin/Views/moderation/answers.volt
new file mode 100644
index 00000000..ffeab7d9
--- /dev/null
+++ b/app/Http/Admin/Views/moderation/answers.volt
@@ -0,0 +1,55 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/answer') }}
+
+    <div class="kg-nav">
+        <div class="kg-nav-left">
+            <span class="layui-breadcrumb">
+                <a><cite>回答审核</cite></a>
+            </span>
+        </div>
+    </div>
+
+    <table class="layui-table kg-table layui-form">
+        <colgroup>
+            <col width="50%">
+            <col>
+            <col>
+            <col width="10%">
+        </colgroup>
+        <thead>
+        <tr>
+            <th>回答</th>
+            <th>作者</th>
+            <th>时间</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            {% set question_url = url({'for':'home.question.show','id':item.question.id}) %}
+            {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+            {% set review_url = url({'for':'admin.answer.review','id':item.id}) %}
+            <tr>
+                <td>
+                    <P>问题：<a href="{{ question_url }}" target="_blank">{{ item.question.title }}</a></P>
+                    <p class="layui-elip">回答：{{ substr(item.summary,0,32) }}</p>
+                </td>
+                <td>
+                    <p>昵称：<a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a></p>
+                    <p>编号：{{ item.owner.id }}</p>
+                </td>
+                <td>{{ date('Y-m-d H:i',item.create_time) }}</td>
+                <td class="center">
+                    <a href="{{ review_url }}" class="layui-btn layui-btn-sm">详情</a>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/moderation/articles.volt b/app/Http/Admin/Views/moderation/articles.volt
index 87a3229b..f9e1a631 100644
--- a/app/Http/Admin/Views/moderation/articles.volt
+++ b/app/Http/Admin/Views/moderation/articles.volt
@@ -14,8 +14,6 @@
 
     <table class="layui-table kg-table layui-form">
         <colgroup>
-            <col>
-            <col>
             <col>
             <col>
             <col>
@@ -25,8 +23,6 @@
         <tr>
             <th>文章</th>
             <th>作者</th>
-            <th>来源</th>
-            <th>评论</th>
             <th>时间</th>
             <th>操作</th>
         </tr>
@@ -34,14 +30,11 @@
         <tbody>
         {% for item in pager.items %}
             {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
-            {% set show_url = url({'for':'admin.article.show','id':item.id}) %}
+            {% set review_url = url({'for':'admin.article.review','id':item.id}) %}
             <tr>
                 <td>
-                    <p>标题：{{ item.title }}（{{ item.id }}）</p>
+                    <p>标题：{{ item.title }} {{ source_info(item.source_type,item.source_url) }}</p>
                     <p class="meta">
-                        {% if item.category.id is defined %}
-                            <span>分类：{{ item.category.name }}</span>
-                        {% endif %}
                         {% if item.tags %}
                             <span>标签：{{ tags_info(item.tags) }}</span>
                         {% endif %}
@@ -51,23 +44,9 @@
                     <p>昵称：<a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a></p>
                     <p>编号：{{ item.owner.id }}</p>
                 </td>
-                <td>{{ source_info(item.source_type,item.source_url) }}</td>
-                <td>
-                    {% if item.allow_comment == 1 %}
-                        开启
-                    {% else %}
-                        关闭
-                    {% endif %}
-                </td>
-                <td>
-                    {% if item.update_time > 0 %}
-                        {{ date('Y-m-d H:i:s',item.update_time) }}
-                    {% else %}
-                        {{ date('Y-m-d H:i:s',item.create_time) }}
-                    {% endif %}
-                </td>
+                <td>{{ date('Y-m-d H:i',item.create_time) }}</td>
                 <td class="center">
-                    <a href="{{ show_url }}" class="layui-btn layui-btn-sm">详情</a>
+                    <a href="{{ review_url }}" class="layui-btn layui-btn-sm">详情</a>
                 </td>
             </tr>
         {% endfor %}
diff --git a/app/Http/Admin/Views/moderation/questions.volt b/app/Http/Admin/Views/moderation/questions.volt
new file mode 100644
index 00000000..4d0a0a6e
--- /dev/null
+++ b/app/Http/Admin/Views/moderation/questions.volt
@@ -0,0 +1,58 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/question') }}
+
+    <div class="kg-nav">
+        <div class="kg-nav-left">
+            <span class="layui-breadcrumb">
+                <a><cite>问题审核</cite></a>
+            </span>
+        </div>
+    </div>
+
+    <table class="layui-table kg-table layui-form">
+        <colgroup>
+            <col>
+            <col>
+            <col>
+            <col width="10%">
+        </colgroup>
+        <thead>
+        <tr>
+            <th>问题</th>
+            <th>作者</th>
+            <th>时间</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+            {% set review_url = url({'for':'admin.question.review','id':item.id}) %}
+            <tr>
+                <td>
+                    <p>标题：{{ item.title }}</p>
+                    <p class="meta">
+                        {% if item.tags %}
+                            <span>标签：{{ tags_info(item.tags) }}</span>
+                        {% endif %}
+                    </p>
+                </td>
+                <td>
+                    <p>昵称：<a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a></p>
+                    <p>编号：{{ item.owner.id }}</p>
+                </td>
+                <td>{{ date('Y-m-d H:i',item.create_time) }}</td>
+                <td class="center">
+                    <a href="{{ review_url }}" class="layui-btn layui-btn-sm">详情</a>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/question/add.volt b/app/Http/Admin/Views/question/add.volt
new file mode 100644
index 00000000..e6cd2a19
--- /dev/null
+++ b/app/Http/Admin/Views/question/add.volt
@@ -0,0 +1,24 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.question.create'}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>添加问题</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">标题</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="title" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button id="kg-submit" class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
diff --git a/app/Http/Admin/Views/question/edit.volt b/app/Http/Admin/Views/question/edit.volt
new file mode 100644
index 00000000..c99a7fc0
--- /dev/null
+++ b/app/Http/Admin/Views/question/edit.volt
@@ -0,0 +1,61 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <fieldset class="layui-elem-field layui-field-title">
+        <legend>编辑问题</legend>
+    </fieldset>
+
+    <div class="layui-tab layui-tab-brief">
+        <ul class="layui-tab-title kg-tab-title">
+            <li class="layui-this">基本信息</li>
+            <li>内容详情</li>
+        </ul>
+        <div class="layui-tab-content">
+            <div class="layui-tab-item layui-show">
+                {{ partial('question/edit_basic') }}
+            </div>
+            <div class="layui-tab-item">
+                {{ partial('question/edit_desc') }}
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('https://cdn.jsdelivr.net/npm/vditor/dist/index.css', false) }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/index.min.js', false) }}
+    {{ js_include('lib/xm-select.js') }}
+    {{ js_include('admin/js/vditor.js') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        layui.use(['jquery', 'form'], function () {
+
+            xmSelect.render({
+                el: '#xm-tag-ids',
+                name: 'xm_tag_ids',
+                max: 3,
+                filterable: true,
+                filterMethod: function (val, item, index, prop) {
+                    return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
+                },
+                data: {{ xm_tags|json_encode }}
+            });
+
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/question/edit_basic.volt b/app/Http/Admin/Views/question/edit_basic.volt
new file mode 100644
index 00000000..e94340d9
--- /dev/null
+++ b/app/Http/Admin/Views/question/edit_basic.volt
@@ -0,0 +1,35 @@
+<form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.question.update','id':question.id}) }}">
+    <div class="layui-form-item">
+        <label class="layui-form-label">标题</label>
+        <div class="layui-input-block">
+            <input class="layui-input" type="text" name="title" value="{{ question.title }}" lay-verify="required">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">标签</label>
+        <div class="layui-input-block">
+            <div id="xm-tag-ids"></div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">匿名</label>
+        <div class="layui-input-block">
+            <input type="radio" name="anonymous" value="1" title="是" {% if question.anonymous == 1 %}checked="checked"{% endif %}>
+            <input type="radio" name="anonymous" value="0" title="否" {% if question.anonymous == 0 %}checked="checked"{% endif %}>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">关闭</label>
+        <div class="layui-input-block">
+            <input type="radio" name="closed" value="1" title="是" {% if question.closed == 1 %}checked="checked"{% endif %}>
+            <input type="radio" name="closed" value="0" title="否" {% if question.closed == 0 %}checked="checked"{% endif %}>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label"></label>
+        <div class="layui-input-block">
+            <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">提交</button>
+            <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Http/Admin/Views/question/edit_desc.volt b/app/Http/Admin/Views/question/edit_desc.volt
new file mode 100644
index 00000000..b355bd47
--- /dev/null
+++ b/app/Http/Admin/Views/question/edit_desc.volt
@@ -0,0 +1,14 @@
+<form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.question.update','id':question.id}) }}">
+    <div class="layui-form-item">
+        <div class="layui-input-block" style="margin:0;">
+            <div id="vditor"></div>
+            <textarea name="content" class="layui-hide" id="vditor-textarea">{{ question.content }}</textarea>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block" style="margin:0;">
+            <button class="kg-submit layui-btn" lay-submit="true" lay-filter="go">提交</button>
+            <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Http/Admin/Views/question/list.volt b/app/Http/Admin/Views/question/list.volt
new file mode 100644
index 00000000..cfabc02a
--- /dev/null
+++ b/app/Http/Admin/Views/question/list.volt
@@ -0,0 +1,162 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/question') }}
+
+    {% set add_url = url({'for':'admin.question.add'}) %}
+    {% set search_url = url({'for':'admin.question.search'}) %}
+
+    <div class="kg-nav">
+        <div class="kg-nav-left">
+            <span class="layui-breadcrumb">
+                <a><cite>问题管理</cite></a>
+            </span>
+        </div>
+        <div class="kg-nav-right">
+            <a class="layui-btn layui-btn-sm" href="{{ add_url }}">
+                <i class="layui-icon layui-icon-add-1"></i>添加问题
+            </a>
+            <a class="layui-btn layui-btn-sm" href="{{ search_url }}">
+                <i class="layui-icon layui-icon-search"></i>搜索问题
+            </a>
+        </div>
+    </div>
+
+    <table class="layui-table kg-table layui-form">
+        <colgroup>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col width="10%">
+        </colgroup>
+        <thead>
+        <tr>
+            <th>问题</th>
+            <th>回答</th>
+            <th>浏览</th>
+            <th>点赞</th>
+            <th>收藏</th>
+            <th>状态</th>
+            <th>关闭</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+            {% set preview_url = url({'for':'home.question.show','id':item.id}) %}
+            {% set review_url = url({'for':'admin.question.review','id':item.id}) %}
+            {% set edit_url = url({'for':'admin.question.edit','id':item.id}) %}
+            {% set update_url = url({'for':'admin.question.update','id':item.id}) %}
+            {% set delete_url = url({'for':'admin.question.delete','id':item.id}) %}
+            {% set restore_url = url({'for':'admin.question.restore','id':item.id}) %}
+            {% set answer_add_url = url({'for':'admin.answer.add'},{'question_id':item.id}) %}
+            {% set answer_list_url = url({'for':'admin.answer.list'},{'question_id':item.id}) %}
+            <tr>
+                <td>
+                    <p>标题：<a href="{{ edit_url }}">{{ item.title }}</a>（{{ item.id }}）</p>
+                    <p class="meta">
+                        {% if item.category.id is defined %}
+                            <span>分类：{{ item.category.name }}</span>
+                        {% endif %}
+                        {% if item.tags %}
+                            <span>标签：{{ tags_info(item.tags) }}</span>
+                        {% endif %}
+                    </p>
+                    <p class="meta">
+                        <span>作者：<a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a></span>
+                        <span>创建：{{ date('Y-m-d',item.create_time) }}</span>
+                    </p>
+                </td>
+                <td>{{ item.answer_count }}</td>
+                <td>{{ item.view_count }}</td>
+                <td>{{ item.like_count }}</td>
+                <td>{{ item.favorite_count }}</td>
+                <td>{{ publish_status(item.published) }}</td>
+                <td><input type="checkbox" name="closed" value="1" lay-skin="switch" lay-text="是|否" lay-filter="closed" data-url="{{ update_url }}" {% if item.closed == 1 %}checked="checked"{% endif %}></td>
+                <td class="center">
+                    <div class="layui-dropdown">
+                        <button class="layui-btn layui-btn-sm">操作 <i class="layui-icon layui-icon-triangle-d"></i></button>
+                        <ul>
+                            {% if item.published == 1 %}
+                                <li><a href="{{ review_url }}">审核问题</a></li>
+                            {% elseif item.published == 2 %}
+                                <li><a href="{{ preview_url }}" target="_blank">预览问题</a></li>
+                            {% endif %}
+                            <li><a href="{{ answer_add_url }}">回答问题</a></li>
+                            <li><a href="{{ edit_url }}">编辑问题</a></li>
+                            {% if item.deleted == 0 %}
+                                <li><a href="javascript:" class="kg-delete" data-url="{{ delete_url }}">删除问题</a></li>
+                            {% else %}
+                                <li><a href="javascript:" class="kg-restore" data-url="{{ restore_url }}">还原问题</a></li>
+                            {% endif %}
+                            <hr>
+                            <li><a href="{{ answer_list_url }}">回答管理</a></li>
+                        </ul>
+                    </div>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    {{ partial('partials/pager') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        layui.define(['jquery', 'form', 'layer'], function () {
+
+            var $ = layui.jquery;
+            var form = layui.form;
+            var layer = layui.layer;
+
+            form.on('switch(closed)', function (data) {
+                var checked = $(this).is(':checked');
+                var closed = checked ? 1 : 0;
+                var url = $(this).data('url');
+                var tips = closed === 1 ? '确定要关闭讨论？' : '确定要开启讨论？';
+                layer.confirm(tips, function () {
+                    $.ajax({
+                        type: 'POST',
+                        url: url,
+                        data: {closed: data.value},
+                        success: function (res) {
+                            layer.msg(res.msg, {icon: 1});
+                        },
+                        error: function (xhr) {
+                            var json = JSON.parse(xhr.responseText);
+                            layer.msg(json.msg, {icon: 2});
+                            data.elem.checked = !checked;
+                            form.render();
+                        }
+                    });
+                }, function () {
+                    data.elem.checked = !checked;
+                    form.render();
+                });
+            });
+
+            $('.kg-answer').on('click', function () {
+                var url = $(this).data('url');
+                layer.open({
+                    type: 2,
+                    title: '回答管理',
+                    area: ['1000px', '600px'],
+                    content: url
+                });
+            });
+
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/question/review.volt b/app/Http/Admin/Views/question/review.volt
new file mode 100644
index 00000000..e1491b8a
--- /dev/null
+++ b/app/Http/Admin/Views/question/review.volt
@@ -0,0 +1,85 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <fieldset class="layui-elem-field layui-field-title">
+        <legend>审核内容</legend>
+    </fieldset>
+
+    <div class="kg-mod-preview">
+        <div class="title">{{ question.title }}</div>
+        <div class="content markdown-body">{{ question.content }}</div>
+        {% if question.tags %}
+            <div class="tags">
+                {% for item in question.tags %}
+                    <span class="layui-btn layui-btn-xs">{{ item['name'] }}</span>
+                {% endfor %}
+            </div>
+        {% endif %}
+    </div>
+
+    <fieldset class="layui-elem-field layui-field-title">
+        <legend>审核意见</legend>
+    </fieldset>
+
+    <form class="layui-form kg-form kg-review-form" method="POST" action="{{ url({'for':'admin.question.review','id':question.id}) }}">
+        <div class="layui-form-item">
+            <label class="layui-form-label">审核</label>
+            <div class="layui-input-block">
+                <input type="radio" name="type" value="approve" title="通过" lay-filter="review">
+                <input type="radio" name="type" value="reject" title="拒绝" lay-filter="review">
+            </div>
+        </div>
+        <div id="reason-block" style="display:none;">
+            <div class="layui-form-item">
+                <label class="layui-form-label">理由</label>
+                <div class="layui-input-block">
+                    <select name="reason">
+                        <option value="">请选择</option>
+                        {% for value,name in reasons %}
+                            <option value="{{ value }}">{{ name }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button id="kg-submit" class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('home/css/markdown.css') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        layui.use(['jquery', 'form'], function () {
+
+            var $ = layui.jquery;
+            var form = layui.form;
+
+            form.on('radio(review)', function (data) {
+                var block = $('#reason-block');
+                if (data.value === 'approve') {
+                    block.hide();
+                } else {
+                    block.show();
+                }
+            });
+
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/question/search.volt b/app/Http/Admin/Views/question/search.volt
new file mode 100644
index 00000000..75e6aca3
--- /dev/null
+++ b/app/Http/Admin/Views/question/search.volt
@@ -0,0 +1,93 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.question.list'}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>搜索问题</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">问题编号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="id" placeholder="问题编号精确匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">作者编号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="owner_id" placeholder="作者编号精确匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">标题</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="title" placeholder="标题模糊匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">标签</label>
+            <div class="layui-input-block">
+                <div id="xm-tag-ids"></div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">发布</label>
+            <div class="layui-input-block">
+                {% for value,title in publish_types %}
+                    <input type="radio" name="published" value="{{ value }}" title="{{ title }}">
+                {% endfor %}
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">匿名</label>
+            <div class="layui-input-block">
+                <input type="radio" name="anonymous" value="1" title="是">
+                <input type="radio" name="anonymous" value="0" title="否">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">关闭</label>
+            <div class="layui-input-block">
+                <input type="radio" name="closed" value="1" title="是">
+                <input type="radio" name="closed" value="0" title="否">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">删除</label>
+            <div class="layui-input-block">
+                <input type="radio" name="deleted" value="1" title="是">
+                <input type="radio" name="deleted" value="0" title="否">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit="true">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('lib/xm-select.js') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        xmSelect.render({
+            el: '#xm-tag-ids',
+            name: 'xm_tag_ids',
+            max: 5,
+            filterable: true,
+            data: {{ xm_tags|json_encode }}
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/setting/storage.volt b/app/Http/Admin/Views/setting/storage.volt
index 93d58fee..e0f7b07d 100644
--- a/app/Http/Admin/Views/setting/storage.volt
+++ b/app/Http/Admin/Views/setting/storage.volt
@@ -121,10 +121,6 @@
                                 <td>群组头像</td>
                                 <td>public/static/admin/img/default/group_cover.png</td>
                             </tr>
-                            <tr>
-                                <td>文章封面</td>
-                                <td>public/static/admin/img/default/article_cover.png</td>
-                            </tr>
                             <tr>
                                 <td>课程封面</td>
                                 <td>public/static/admin/img/default/course_cover.png</td>
diff --git a/app/Http/Admin/Views/tag/add.volt b/app/Http/Admin/Views/tag/add.volt
index e3cb3cbf..b2d30288 100644
--- a/app/Http/Admin/Views/tag/add.volt
+++ b/app/Http/Admin/Views/tag/add.volt
@@ -12,12 +12,6 @@
                 <input class="layui-input" type="text" name="name" lay-verify="required">
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">排序</label>
-            <div class="layui-input-block">
-                <input class="layui-input" type="text" name="priority" lay-verify="number">
-            </div>
-        </div>
         <div class="layui-form-item">
             <label class="layui-form-label"></label>
             <div class="layui-input-block">
diff --git a/app/Http/Admin/Views/tag/edit.volt b/app/Http/Admin/Views/tag/edit.volt
index 1128c729..e39e3058 100644
--- a/app/Http/Admin/Views/tag/edit.volt
+++ b/app/Http/Admin/Views/tag/edit.volt
@@ -7,15 +7,19 @@
             <legend>编辑标签</legend>
         </fieldset>
         <div class="layui-form-item">
-            <label class="layui-form-label">名称</label>
-            <div class="layui-input-block">
-                <input class="layui-input" type="text" name="name" value="{{ tag2.name }}" lay-verify="required">
+            <label class="layui-form-label">图标</label>
+            <div class="layui-input-inline" style="width: 80px;">
+                <img id="img-icon" class="kg-icon" src="{{ tag2.icon }}">
+                <input type="hidden" name="icon" value="{{ tag2.icon }}">
+            </div>
+            <div class="layui-input-inline" style="padding-top:15px;">
+                <button id="change-icon" class="layui-btn layui-btn-sm" type="button">更换</button>
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">排序</label>
+            <label class="layui-form-label">名称</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="priority" value="{{ tag2.priority }}" lay-verify="number">
+                <input class="layui-input" type="text" name="name" value="{{ tag2.name }}" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
@@ -34,4 +38,10 @@
         </div>
     </form>
 
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('admin/js/icon.upload.js') }}
+
 {% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/tag/list.volt b/app/Http/Admin/Views/tag/list.volt
index 99785aaa..2ca61555 100644
--- a/app/Http/Admin/Views/tag/list.volt
+++ b/app/Http/Admin/Views/tag/list.volt
@@ -29,15 +29,17 @@
             <col>
             <col>
             <col>
+            <col>
             <col width="12%">
         </colgroup>
         <thead>
         <tr>
             <th>编号</th>
+            <th>图标</th>
             <th>名称</th>
+            <th>关注数</th>
             <th>创建时间</th>
             <th>更新时间</th>
-            <th>排序</th>
             <th>发布</th>
             <th>操作</th>
         </tr>
@@ -49,10 +51,11 @@
             {% set delete_url = url({'for':'admin.tag.delete','id':item.id}) %}
             <tr>
                 <td>{{ item.id }}</td>
+                <td><img class="kg-icon" src="{{ item.icon }}" alt="{{ item.name }}"></td>
                 <td><a href="{{ edit_url }}">{{ item.name }}</a></td>
-                <td>{{ date('Y-m-d H:i',item.create_time) }}</td>
-                <td>{{ date('Y-m-d H:i',item.update_time) }}</td>
-                <td class="center"><input class="layui-input kg-priority" type="text" name="priority" title="数值越小排序越靠前" value="{{ item.priority }}" data-url="{{ update_url }}"></td>
+                <td>{{ item.follow_count }}</td>
+                <td>{{ date('Y-m-d',item.create_time) }}</td>
+                <td>{{ date('Y-m-d',item.update_time) }}</td>
                 <td><input type="checkbox" name="published" value="1" lay-skin="switch" lay-text="是|否" lay-filter="published" data-url="{{ update_url }}" {% if item.published == 1 %}checked="checked"{% endif %}>
                 </td>
                 <td class="center">
diff --git a/app/Http/Admin/Views/user/list.volt b/app/Http/Admin/Views/user/list.volt
index a9ff78cd..76ea12ba 100644
--- a/app/Http/Admin/Views/user/list.volt
+++ b/app/Http/Admin/Views/user/list.volt
@@ -33,6 +33,7 @@
             <col>
             <col>
             <col>
+            <col>
             <col width="10%">
         </colgroup>
         <thead>
@@ -42,7 +43,8 @@
             <th>用户角色</th>
             <th>课程</th>
             <th>文章</th>
-            <th>收藏</th>
+            <th>提问</th>
+            <th>回答</th>
             <th>活跃时间</th>
             <th>注册时间</th>
             <th>操作</th>
@@ -51,6 +53,7 @@
         <tbody>
         {% for item in pager.items %}
             {% set preview_url = url({'for':'home.user.show','id':item.id}) %}
+            {% set online_url = url({'for':'admin.user.online','id':item.id}) %}
             {% set edit_url = url({'for':'admin.user.edit','id':item.id}) %}
             <tr>
                 <td class="center">
@@ -71,15 +74,17 @@
                 </td>
                 <td>{{ item.course_count }}</td>
                 <td>{{ item.article_count }}</td>
-                <td>{{ item.favorite_count }}</td>
+                <td>{{ item.question_count }}</td>
+                <td>{{ item.answer_count }}</td>
                 <td>{{ date('Y-m-d',item.active_time) }}</td>
                 <td>{{ date('Y-m-d',item.create_time) }}</td>
                 <td class="center">
                     <div class="layui-dropdown">
                         <button class="layui-btn layui-btn-sm">操作 <i class="layui-icon layui-icon-triangle-d"></i></button>
                         <ul>
-                            <li><a href="{{ preview_url }}" target="_blank">预览</a></li>
-                            <li><a href="{{ edit_url }}">编辑</a></li>
+                            <li><a href="{{ preview_url }}" target="_blank">用户主页</a></li>
+                            <li><a href="javascript:" class="kg-online" data-url="{{ online_url }}">在线记录</a></li>
+                            <li><a href="{{ edit_url }}">编辑用户</a></li>
                         </ul>
                     </div>
                 </td>
@@ -90,4 +95,29 @@
 
     {{ partial('partials/pager') }}
 
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        layui.define(['jquery', 'layer'], function () {
+
+            var $ = layui.jquery;
+            var layer = layui.layer;
+
+            $('.kg-online').on('click', function () {
+                var url = $(this).data('url');
+                layer.open({
+                    type: 2,
+                    title: '在线记录',
+                    area: ['800px', '600px'],
+                    content: url
+                });
+            });
+
+        });
+
+    </script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/user/online.volt b/app/Http/Admin/Views/user/online.volt
new file mode 100644
index 00000000..86f0af78
--- /dev/null
+++ b/app/Http/Admin/Views/user/online.volt
@@ -0,0 +1,42 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/common') }}
+
+    <table class="layui-table kg-table">
+        <colgroup>
+            <col>
+            <col>
+            <col>
+            <col>
+        </colgroup>
+        <thead>
+        <tr>
+            <th>终端类型</th>
+            <th>终端地址</th>
+            <th>活跃时间</th>
+            <th>创建时间</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            <tr>
+                <td>{{ client_type(item.client_type) }}</td>
+                <td><a href="javascript:" title="查看位置" class="layui-badge layui-bg-gray kg-ip2region">{{ item.client_ip }}</a></td>
+                <td>{{ date('Y-m-d H:i',item.active_time) }}</td>
+                <td>{{ date('Y-m-d H:i',item.create_time) }}</td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    {{ partial('partials/pager') }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('admin/js/ip2region.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Controllers/AnswerController.php b/app/Http/Home/Controllers/AnswerController.php
new file mode 100644
index 00000000..f51c77d6
--- /dev/null
+++ b/app/Http/Home/Controllers/AnswerController.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace App\Http\Home\Controllers;
+
+use App\Http\Home\Services\Answer as AnswerService;
+use App\Http\Home\Services\Question as QuestionService;
+use App\Services\Logic\Answer\AnswerAccept as AnswerAcceptService;
+use App\Services\Logic\Answer\AnswerCreate as AnswerCreateService;
+use App\Services\Logic\Answer\AnswerDelete as AnswerDeleteService;
+use App\Services\Logic\Answer\AnswerInfo as AnswerInfoService;
+use App\Services\Logic\Answer\AnswerLike as AnswerLikeService;
+use App\Services\Logic\Answer\AnswerUpdate as AnswerUpdateService;
+use Phalcon\Mvc\View;
+
+/**
+ * @RoutePrefix("/answer")
+ */
+class AnswerController extends Controller
+{
+
+    /**
+     * @Get("/tips", name="home.answer.tips")
+     */
+    public function tipsAction()
+    {
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+    }
+
+    /**
+     * @Get("/add", name="home.answer.add")
+     */
+    public function addAction()
+    {
+        $id = $this->request->getQuery('question_id', 'int', 0);
+
+        $service = new QuestionService();
+
+        $question = $service->getQuestion($id);
+
+        $this->seo->prependTitle('回答问题');
+
+        $this->view->setVar('question', $question);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/edit", name="home.answer.edit")
+     */
+    public function editAction($id)
+    {
+        $service = new AnswerService();
+
+        $answer = $service->getAnswer($id);
+
+        $service = new QuestionService();
+
+        $question = $service->getQuestion($answer->question_id);
+
+        $this->seo->prependTitle('编辑回答');
+
+        $this->view->setVar('question', $question);
+        $this->view->setVar('answer', $answer);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}", name="home.answer.show")
+     */
+    public function showAction($id)
+    {
+        $service = new AnswerInfoService();
+
+        $answer = $service->handle($id);
+
+        $this->view->setVar('answer', $answer);
+    }
+
+    /**
+     * @Post("/create", name="home.answer.create")
+     */
+    public function createAction()
+    {
+        $service = new AnswerCreateService();
+
+        $answer = $service->handle();
+
+        $location = $this->url->get([
+            'for' => 'home.question.show',
+            'id' => $answer->question_id,
+        ]);
+
+        $content = [
+            'location' => $location,
+            'msg' => '创建回答成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="home.answer.update")
+     */
+    public function updateAction($id)
+    {
+        $service = new AnswerUpdateService();
+
+        $answer = $service->handle($id);
+
+        $location = $this->url->get([
+            'for' => 'home.question.show',
+            'id' => $answer->question_id,
+        ]);
+
+        $content = [
+            'location' => $location,
+            'msg' => '更新回答成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="home.answer.delete")
+     */
+    public function deleteAction($id)
+    {
+        $service = new AnswerDeleteService();
+
+        $answer = $service->handle($id);
+
+        $location = $this->url->get([
+            'for' => 'home.question.show',
+            'id' => $answer->question_id,
+        ]);
+
+        $content = [
+            'location' => $location,
+            'msg' => '删除回答成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/like", name="home.answer.like")
+     */
+    public function likeAction($id)
+    {
+        $service = new AnswerLikeService();
+
+        $data = $service->handle($id);
+
+        $msg = $data['action'] == 'do' ? '点赞成功' : '取消点赞成功';
+
+        return $this->jsonSuccess(['data' => $data, 'msg' => $msg]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/accept", name="home.answer.accept")
+     */
+    public function acceptAction($id)
+    {
+        $service = new AnswerAcceptService();
+
+        $data = $service->handle($id);
+
+        $msg = $data['action'] == 'do' ? '采纳成功' : '取消采纳成功';
+
+        return $this->jsonSuccess(['data' => $data, 'msg' => $msg]);
+    }
+
+    /**
+     * @Route("/{id:[0-9]+}/report", name="home.answer.report")
+     */
+    public function reportAction($id)
+    {
+
+    }
+
+}
diff --git a/app/Http/Home/Controllers/ArticleController.php b/app/Http/Home/Controllers/ArticleController.php
index ba081e4b..36adbfd8 100644
--- a/app/Http/Home/Controllers/ArticleController.php
+++ b/app/Http/Home/Controllers/ArticleController.php
@@ -4,13 +4,15 @@ namespace App\Http\Home\Controllers;
 
 use App\Http\Home\Services\Article as ArticleService;
 use App\Http\Home\Services\ArticleQuery as ArticleQueryService;
+use App\Services\Logic\Article\ArticleCreate as ArticleCreateService;
+use App\Services\Logic\Article\ArticleDelete as ArticleDeleteService;
 use App\Services\Logic\Article\ArticleFavorite as ArticleFavoriteService;
 use App\Services\Logic\Article\ArticleInfo as ArticleInfoService;
 use App\Services\Logic\Article\ArticleLike as ArticleLikeService;
 use App\Services\Logic\Article\ArticleList as ArticleListService;
-use App\Services\Logic\Article\CommentList as ArticleCommentListService;
+use App\Services\Logic\Article\ArticleUpdate as ArticleUpdateService;
 use App\Services\Logic\Article\HotAuthorList as HotAuthorListService;
-use App\Services\Logic\Article\RelatedList as ArticleRelatedListService;
+use App\Services\Logic\Article\RelatedArticleList as RelatedArticleListService;
 use Phalcon\Mvc\View;
 
 /**
@@ -78,7 +80,7 @@ class ArticleController extends Controller
         $article = $service->getArticleModel();
         $xmTags = $service->getXmTags(0);
 
-        $this->seo->prependTitle('撰写文章');
+        $this->seo->prependTitle('写文章');
 
         $this->view->pick('article/edit');
         $this->view->setVar('source_types', $sourceTypes);
@@ -123,6 +125,7 @@ class ArticleController extends Controller
         }
 
         $this->seo->prependTitle($article['title']);
+        $this->seo->setDescription($article['summary']);
 
         $this->view->setVar('article', $article);
     }
@@ -132,7 +135,7 @@ class ArticleController extends Controller
      */
     public function relatedAction($id)
     {
-        $service = new ArticleRelatedListService();
+        $service = new RelatedArticleListService();
 
         $articles = $service->handle($id);
 
@@ -140,27 +143,14 @@ class ArticleController extends Controller
         $this->view->setVar('articles', $articles);
     }
 
-    /**
-     * @Get("/{id:[0-9]+}/comments", name="home.article.comments")
-     */
-    public function commentsAction($id)
-    {
-        $service = new ArticleCommentListService();
-
-        $comments = $service->handle($id);
-
-        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
-        $this->view->setVar('comments', $comments);
-    }
-
     /**
      * @Post("/create", name="home.article.create")
      */
     public function createAction()
     {
-        $service = new ArticleService();
+        $service = new ArticleCreateService();
 
-        $service->createArticle();
+        $service->handle();
 
         $location = $this->url->get(['for' => 'home.uc.articles']);
 
@@ -177,9 +167,9 @@ class ArticleController extends Controller
      */
     public function updateAction($id)
     {
-        $service = new ArticleService();
+        $service = new ArticleUpdateService();
 
-        $service->updateArticle($id);
+        $service->handle($id);
 
         $location = $this->url->get(['for' => 'home.uc.articles']);
 
@@ -196,12 +186,14 @@ class ArticleController extends Controller
      */
     public function deleteAction($id)
     {
-        $service = new ArticleService();
+        $service = new ArticleDeleteService();
 
-        $service->deleteArticle($id);
+        $service->handle($id);
+
+        $location = $this->url->get(['for' => 'home.uc.articles']);
 
         $content = [
-            'location' => $this->request->getHTTPReferer(),
+            'location' => $location,
             'msg' => '删除文章成功',
         ];
 
@@ -236,5 +228,12 @@ class ArticleController extends Controller
         return $this->jsonSuccess(['data' => $data, 'msg' => $msg]);
     }
 
+    /**
+     * @Route("/{id:[0-9]+}/report", name="home.article.report")
+     */
+    public function reportAction($id)
+    {
+
+    }
 
 }
diff --git a/app/Http/Home/Controllers/ChapterController.php b/app/Http/Home/Controllers/ChapterController.php
index f9230ad6..dcb97734 100644
--- a/app/Http/Home/Controllers/ChapterController.php
+++ b/app/Http/Home/Controllers/ChapterController.php
@@ -6,7 +6,6 @@ use App\Models\ChapterLive as LiveModel;
 use App\Models\Course as CourseModel;
 use App\Services\Logic\Chapter\ChapterInfo as ChapterInfoService;
 use App\Services\Logic\Chapter\ChapterLike as ChapterLikeService;
-use App\Services\Logic\Chapter\DanmuList as ChapterDanmuListService;
 use App\Services\Logic\Chapter\Learning as ChapterLearningService;
 use App\Services\Logic\Chapter\ResourceList as ChapterResourceListService;
 use App\Services\Logic\Course\BasicInfo as CourseInfoService;
@@ -30,18 +29,6 @@ class ChapterController extends Controller
         $this->view->setVar('items', $items);
     }
 
-    /**
-     * @Get("/{id:[0-9]+}/danmus", name="home.chapter.danmus")
-     */
-    public function danmusAction($id)
-    {
-        $service = new ChapterDanmuListService();
-
-        $items = $service->handle($id);
-
-        return $this->jsonSuccess(['items' => $items]);
-    }
-
     /**
      * @Get("/{id:[0-9]+}", name="home.chapter.show")
      */
diff --git a/app/Http/Home/Controllers/CommentController.php b/app/Http/Home/Controllers/CommentController.php
index 4d11ee38..9448e362 100644
--- a/app/Http/Home/Controllers/CommentController.php
+++ b/app/Http/Home/Controllers/CommentController.php
@@ -63,26 +63,6 @@ class CommentController extends Controller
         $this->view->setVar('comment', $comment);
     }
 
-    /**
-     * @Get("/add", name="home.comment.add")
-     */
-    public function addAction()
-    {
-
-    }
-
-    /**
-     * @Get("/{id:[0-9]+}/reply", name="home.comment.reply")
-     */
-    public function replyAction($id)
-    {
-        $service = new CommentInfoService();
-
-        $comment = $service->handle($id);
-
-        $this->view->setVar('comment', $comment);
-    }
-
     /**
      * @Post("/create", name="home.comment.create")
      */
@@ -100,9 +80,9 @@ class CommentController extends Controller
     }
 
     /**
-     * @Post("/{id:[0-9]+}/reply", name="home.comment.create_reply")
+     * @Post("/{id:[0-9]+}/reply", name="home.comment.reply")
      */
-    public function createReplyAction($id)
+    public function replyAction($id)
     {
         $service = new CommentReplyService();
 
@@ -141,4 +121,12 @@ class CommentController extends Controller
         return $this->jsonSuccess(['msg' => '删除评论成功']);
     }
 
+    /**
+     * @Route("/{id:[0-9]+}/report", name="home.comment.report")
+     */
+    public function reportAction($id)
+    {
+
+    }
+
 }
diff --git a/app/Http/Home/Controllers/QuestionController.php b/app/Http/Home/Controllers/QuestionController.php
new file mode 100644
index 00000000..a691a5ea
--- /dev/null
+++ b/app/Http/Home/Controllers/QuestionController.php
@@ -0,0 +1,261 @@
+<?php
+
+namespace App\Http\Home\Controllers;
+
+use App\Http\Home\Services\Question as QuestionService;
+use App\Http\Home\Services\QuestionQuery as QuestionQueryService;
+use App\Services\Logic\Question\AnswerList as AnswerListService;
+use App\Services\Logic\Question\HotQuestionList as HotQuestionListService;
+use App\Services\Logic\Question\QuestionCreate as QuestionCreateService;
+use App\Services\Logic\Question\QuestionDelete as QuestionDeleteService;
+use App\Services\Logic\Question\QuestionFavorite as QuestionFavoriteService;
+use App\Services\Logic\Question\QuestionInfo as QuestionInfoService;
+use App\Services\Logic\Question\QuestionLike as QuestionLikeService;
+use App\Services\Logic\Question\QuestionList as QuestionListService;
+use App\Services\Logic\Question\QuestionUpdate as QuestionUpdateService;
+use App\Services\Logic\Question\RelatedQuestionList as RelatedQuestionListService;
+use App\Services\Logic\Question\TopAnswererList as TopAnswererListService;
+use Phalcon\Mvc\View;
+
+/**
+ * @RoutePrefix("/question")
+ */
+class QuestionController extends Controller
+{
+
+    /**
+     * @Get("/hot/questions", name="home.question.hot_questions")
+     */
+    public function hotQuestionsAction()
+    {
+        $service = new HotQuestionListService();
+
+        $questions = $service->handle();
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->pick('question/hot_questions');
+        $this->view->setVar('questions', $questions);
+    }
+
+    /**
+     * @Get("/top/answerers", name="home.question.top_answerers")
+     */
+    public function topAnswerersAction()
+    {
+        $service = new TopAnswererListService();
+
+        $answerers = $service->handle();
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->pick('question/top_answerers');
+        $this->view->setVar('answerers', $answerers);
+    }
+
+    /**
+     * @Get("/list", name="home.question.list")
+     */
+    public function listAction()
+    {
+        $service = new QuestionQueryService();
+
+        $sorts = $service->handleSorts();
+        $params = $service->getParams();
+
+        $this->seo->prependTitle('问答');
+
+        $this->view->setVar('sorts', $sorts);
+        $this->view->setVar('params', $params);
+    }
+
+    /**
+     * @Get("/pager", name="home.question.pager")
+     */
+    public function pagerAction()
+    {
+        $service = new QuestionListService();
+
+        $pager = $service->handle();
+
+        $pager->target = 'question-list';
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/add", name="home.question.add")
+     */
+    public function addAction()
+    {
+        $service = new QuestionService();
+
+        $question = $service->getQuestionModel();
+
+        $xmTags = $service->getXmTags(0);
+
+        $this->seo->prependTitle('提问题');
+
+        $this->view->pick('question/edit');
+        $this->view->setVar('question', $question);
+        $this->view->setVar('xm_tags', $xmTags);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/edit", name="home.question.edit")
+     */
+    public function editAction($id)
+    {
+        $service = new QuestionService();
+
+        $question = $service->getQuestion($id);
+
+        $xmTags = $service->getXmTags($id);
+
+        $this->seo->prependTitle('编辑问题');
+
+        $this->view->setVar('question', $question);
+        $this->view->setVar('xm_tags', $xmTags);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}", name="home.question.show")
+     */
+    public function showAction($id)
+    {
+        $service = new QuestionInfoService();
+
+        $question = $service->handle($id);
+
+        $this->seo->prependTitle($question['title']);
+        $this->seo->setDescription($question['summary']);
+
+        $this->view->setVar('question', $question);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/answers", name="home.question.answers")
+     */
+    public function answersAction($id)
+    {
+        $service = new QuestionService();
+
+        $question = $service->getQuestion($id);
+
+        $service = new AnswerListService();
+
+        $pager = $service->handle($id);
+
+        $pager->target = 'answer-list';
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->setVar('question', $question);
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/related", name="home.question.related")
+     */
+    public function relatedAction($id)
+    {
+        $service = new RelatedQuestionListService();
+
+        $questions = $service->handle($id);
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->setVar('questions', $questions);
+    }
+
+    /**
+     * @Post("/create", name="home.question.create")
+     */
+    public function createAction()
+    {
+        $service = new QuestionCreateService();
+
+        $service->handle();
+
+        $location = $this->url->get(['for' => 'home.uc.questions']);
+
+        $content = [
+            'location' => $location,
+            'msg' => '创建问题成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="home.question.update")
+     */
+    public function updateAction($id)
+    {
+        $service = new QuestionUpdateService();
+
+        $service->handle($id);
+
+        $location = $this->url->get(['for' => 'home.uc.questions']);
+
+        $content = [
+            'location' => $location,
+            'msg' => '更新问题成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="home.question.delete")
+     */
+    public function deleteAction($id)
+    {
+        $service = new QuestionDeleteService();
+
+        $service->handle($id);
+
+        $location = $this->url->get(['for' => 'home.uc.questions']);
+
+        $content = [
+            'location' => $location,
+            'msg' => '删除问题成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/favorite", name="home.question.favorite")
+     */
+    public function favoriteAction($id)
+    {
+        $service = new QuestionFavoriteService();
+
+        $data = $service->handle($id);
+
+        $msg = $data['action'] == 'do' ? '收藏成功' : '取消收藏成功';
+
+        return $this->jsonSuccess(['data' => $data, 'msg' => $msg]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/like", name="home.question.like")
+     */
+    public function likeAction($id)
+    {
+        $service = new QuestionLikeService();
+
+        $data = $service->handle($id);
+
+        $msg = $data['action'] == 'do' ? '点赞成功' : '取消点赞成功';
+
+        return $this->jsonSuccess(['data' => $data, 'msg' => $msg]);
+    }
+
+    /**
+     * @Route("/{id:[0-9]+}/report", name="home.question.report")
+     */
+    public function reportAction($id)
+    {
+
+    }
+
+}
diff --git a/app/Http/Home/Controllers/SearchController.php b/app/Http/Home/Controllers/SearchController.php
index ba3507ef..2e2927af 100644
--- a/app/Http/Home/Controllers/SearchController.php
+++ b/app/Http/Home/Controllers/SearchController.php
@@ -5,6 +5,7 @@ namespace App\Http\Home\Controllers;
 use App\Services\Logic\Search\Article as ArticleSearchService;
 use App\Services\Logic\Search\Course as CourseSearchService;
 use App\Services\Logic\Search\Group as GroupSearchService;
+use App\Services\Logic\Search\Question as QuestionSearchService;
 use App\Services\Logic\Search\User as UserSearchService;
 
 /**
@@ -42,7 +43,7 @@ class SearchController extends Controller
 
     /**
      * @param string $type
-     * @return ArticleSearchService|CourseSearchService|GroupSearchService|UserSearchService
+     * @return ArticleSearchService|QuestionSearchService|CourseSearchService|GroupSearchService|UserSearchService
      */
     protected function getSearchService($type)
     {
@@ -50,6 +51,9 @@ class SearchController extends Controller
             case 'article':
                 $service = new ArticleSearchService();
                 break;
+            case 'question':
+                $service = new QuestionSearchService();
+                break;
             case 'group':
                 $service = new GroupSearchService();
                 break;
diff --git a/app/Http/Home/Controllers/TagController.php b/app/Http/Home/Controllers/TagController.php
new file mode 100644
index 00000000..262b8614
--- /dev/null
+++ b/app/Http/Home/Controllers/TagController.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Http\Home\Controllers;
+
+use App\Services\Logic\Tag\TagFollow as TagFollowService;
+use App\Services\Logic\Tag\TagList as TagListService;
+use App\Services\Logic\Tag\FollowList as FollowListService;
+use Phalcon\Mvc\View;
+
+/**
+ * @RoutePrefix("/tag")
+ */
+class TagController extends Controller
+{
+
+    /**
+     * @Get("/list", name="home.tag.list")
+     */
+    public function listAction()
+    {
+        $this->seo->prependTitle('标签');
+    }
+
+    /**
+     * @Get("/list/pager", name="home.tag.list_pager")
+     */
+    public function listPagerAction()
+    {
+        $service = new TagListService();
+
+        $pager = $service->handle();
+
+        $pager->target = 'all-tag-list';
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->pick('tag/list_pager');
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/my/pager", name="home.tag.my_pager")
+     */
+    public function myPagerAction()
+    {
+        $service = new FollowListService();
+
+        $pager = $service->handle();
+
+        $pager->target = 'my-tag-list';
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->pick('tag/my_pager');
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/follow", name="home.tag.follow")
+     */
+    public function followAction($id)
+    {
+        $service = new TagFollowService();
+
+        $data = $service->handle($id);
+
+        $msg = $data['action'] == 'do' ? '关注成功' : '取消关注成功';
+
+        return $this->jsonSuccess(['data' => $data, 'msg' => $msg]);
+    }
+
+}
diff --git a/app/Http/Home/Controllers/UserConsoleController.php b/app/Http/Home/Controllers/UserConsoleController.php
index c38d6209..1f215146 100644
--- a/app/Http/Home/Controllers/UserConsoleController.php
+++ b/app/Http/Home/Controllers/UserConsoleController.php
@@ -5,6 +5,7 @@ namespace App\Http\Home\Controllers;
 use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
 use App\Services\Logic\Account\OAuthProvider as OAuthProviderService;
 use App\Services\Logic\User\Console\AccountInfo as AccountInfoService;
+use App\Services\Logic\User\Console\AnswerList as AnswerListService;
 use App\Services\Logic\User\Console\ArticleList as ArticleListService;
 use App\Services\Logic\User\Console\ConnectDelete as ConnectDeleteService;
 use App\Services\Logic\User\Console\ConnectList as ConnectListService;
@@ -24,6 +25,7 @@ use App\Services\Logic\User\Console\PointHistory as PointHistoryService;
 use App\Services\Logic\User\Console\PointRedeemList as PointRedeemListService;
 use App\Services\Logic\User\Console\ProfileInfo as ProfileInfoService;
 use App\Services\Logic\User\Console\ProfileUpdate as ProfileUpdateService;
+use App\Services\Logic\User\Console\QuestionList as QuestionListService;
 use App\Services\Logic\User\Console\RefundList as RefundListService;
 use App\Services\Logic\User\Console\ReviewList as ReviewListService;
 use Phalcon\Mvc\Dispatcher;
@@ -154,6 +156,32 @@ class UserConsoleController extends Controller
         $this->view->setVar('pager', $pager);
     }
 
+    /**
+     * @Get("/questions", name="home.uc.questions")
+     */
+    public function questionsAction()
+    {
+        $service = new QuestionListService();
+
+        $pager = $service->handle();
+
+        $this->view->pick('user/console/questions');
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/answers", name="home.uc.answers")
+     */
+    public function answersAction()
+    {
+        $service = new AnswerListService();
+
+        $pager = $service->handle();
+
+        $this->view->pick('user/console/answers');
+        $this->view->setVar('pager', $pager);
+    }
+
     /**
      * @Get("/favorites", name="home.uc.favorites")
      */
diff --git a/app/Http/Home/Controllers/WidgetController.php b/app/Http/Home/Controllers/WidgetController.php
new file mode 100644
index 00000000..b129692d
--- /dev/null
+++ b/app/Http/Home/Controllers/WidgetController.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Home\Controllers;
+
+use App\Services\Logic\Question\HotQuestionList as HotQuestionListService;
+use App\Services\Logic\Question\TopAnswererList as TopAnswererListService;
+use App\Services\Logic\Tag\FollowList as FollowListService;
+use Phalcon\Mvc\View;
+
+/**
+ * @RoutePrefix("/widget")
+ */
+class WidgetController extends Controller
+{
+
+    /**
+     * @Get("/my/tags", name="home.widget.my_tags")
+     */
+    public function myTagsAction()
+    {
+        $service = new FollowListService();
+
+        $pager = $service->handle();
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->pick('widget/my_tags');
+        $this->view->setVar('tags', $pager->items);
+    }
+
+    /**
+     * @Get("/hot/questions", name="home.widget.hot_questions")
+     */
+    public function hotQuestionsAction()
+    {
+        $service = new HotQuestionListService();
+
+        $questions = $service->handle();
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->pick('widget/hot_questions');
+        $this->view->setVar('questions', $questions);
+    }
+
+    /**
+     * @Get("/top/answerers", name="home.widget.top_answerers")
+     */
+    public function topAnswerersAction()
+    {
+        $service = new TopAnswererListService();
+
+        $answerers = $service->handle();
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->pick('widget/top_answerers');
+        $this->view->setVar('answerers', $answerers);
+    }
+
+}
diff --git a/app/Http/Home/Services/Answer.php b/app/Http/Home/Services/Answer.php
new file mode 100644
index 00000000..099a72da
--- /dev/null
+++ b/app/Http/Home/Services/Answer.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Home\Services;
+
+use App\Models\Answer as AnswerModel;
+use App\Services\Logic\AnswerTrait;
+use App\Services\Logic\Service as LogicService;
+
+class Answer extends LogicService
+{
+
+    use AnswerTrait;
+
+    public function getAnswerModel()
+    {
+        return new AnswerModel();
+    }
+
+    public function getAnswer($id)
+    {
+        return $this->checkAnswer($id);
+    }
+
+}
diff --git a/app/Http/Home/Services/Article.php b/app/Http/Home/Services/Article.php
index ac172aa2..420de389 100644
--- a/app/Http/Home/Services/Article.php
+++ b/app/Http/Home/Services/Article.php
@@ -2,143 +2,76 @@
 
 namespace App\Http\Home\Services;
 
-use App\Http\Admin\Services\Article as ArticleService;
-use App\Library\Utils\Word as WordUtil;
 use App\Models\Article as ArticleModel;
-use App\Traits\Client as ClientTrait;
-use App\Validators\Article as ArticleValidator;
+use App\Models\Category as CategoryModel;
+use App\Repos\Category as CategoryRepo;
+use App\Repos\Tag as TagRepo;
+use App\Services\Logic\ArticleTrait;
 
-class Article extends ArticleService
+class Article extends Service
 {
 
-    use ClientTrait;
+    use ArticleTrait;
 
-    public function createArticle()
+    public function getArticleModel()
     {
-        $post = $this->request->getPost();
-
-        $user = $this->getLoginUser();
-
         $article = new ArticleModel();
 
-        $data = $this->handlePostData($post);
-
-        $data['client_type'] = $this->getClientType();
-        $data['client_ip'] = $this->getClientIp();
-        $data['owner_id'] = $user->id;
-
-        $article->create($data);
-
-        if (isset($post['xm_tag_ids'])) {
-            $this->saveTags($article, $post['xm_tag_ids']);
-        }
-
-        $this->incrUserArticleCount($user);
-
-        $this->eventsManager->fire('Article:afterCreate', $this, $article);
+        $article->afterFetch();
 
         return $article;
     }
 
-    public function updateArticle($id)
+    public function getXmTags($id)
     {
-        $post = $this->request->getPost();
+        $tagRepo = new TagRepo();
 
-        $article = $this->findOrFail($id);
+        $allTags = $tagRepo->findAll(['published' => 1], 'priority');
 
-        $data = $this->handlePostData($post);
+        if ($allTags->count() == 0) return [];
 
-        $data['client_type'] = $this->getClientType();
-        $data['client_ip'] = $this->getClientIp();
+        $articleTagIds = [];
 
-        if ($article->published == ArticleModel::PUBLISH_REJECTED) {
-            $data['published'] = ArticleModel::PUBLISH_PENDING;
-        }
-
-        /**
-         * 当通过审核后，禁止修改部分文章属性
-         */
-        if ($article->published == ArticleModel::PUBLISH_APPROVED) {
-            unset(
-                $data['title'],
-                $data['content'],
-                $data['cover'],
-                $data['source_type'],
-                $data['source_url'],
-                $data['category_id'],
-                $post['xm_tag_ids'],
-            );
-        }
-
-        $article->update($data);
-
-        if (isset($post['xm_tag_ids'])) {
-            $this->saveTags($article, $post['xm_tag_ids']);
-        }
-
-        $this->eventsManager->fire('Article:afterUpdate', $this, $article);
-
-        return $article;
-    }
-
-    public function deleteArticle($id)
-    {
-        $article = $this->findOrFail($id);
-
-        $user = $this->getLoginUser();
-
-        $validator = new ArticleValidator();
-
-        $validator->checkOwner($user->id, $article->owner_id);
-
-        $article->deleted = 1;
-
-        $article->update();
-
-        $this->decrUserArticleCount($user);
-
-        $this->rebuildArticleIndex($article);
-
-        $this->eventsManager->fire('Article:afterDelete', $this, $article);
-
-        return $article;
-    }
-
-    protected function handlePostData($post)
-    {
-        $data = [];
-
-        $validator = new ArticleValidator();
-
-        $data['title'] = $validator->checkTitle($post['title']);
-        $data['content'] = $validator->checkContent($post['content']);
-        $data['word_count'] = WordUtil::getWordCount($data['content']);
-
-        if (isset($post['category_id'])) {
-            $category = $validator->checkCategory($post['category_id']);
-            $data['category_id'] = $category->id;
-        }
-
-        if (isset($post['cover'])) {
-            $data['cover'] = $validator->checkCover($post['cover']);
-        }
-
-        if (isset($post['source_type'])) {
-            $data['source_type'] = $validator->checkSourceType($post['source_type']);
-            if ($post['source_type'] != ArticleModel::SOURCE_ORIGIN) {
-                $data['source_url'] = $validator->checkSourceUrl($post['source_url']);
+        if ($id > 0) {
+            $article = $this->checkArticle($id);
+            if (!empty($article->tags)) {
+                $articleTagIds = kg_array_column($article->tags, 'id');
             }
         }
 
-        if (isset($post['allow_comment'])) {
-            $data['allow_comment'] = $validator->checkAllowCommentStatus($post['allow_comment']);
+        $list = [];
+
+        foreach ($allTags as $tag) {
+            $selected = in_array($tag->id, $articleTagIds);
+            $list[] = [
+                'name' => $tag->name,
+                'value' => $tag->id,
+                'selected' => $selected,
+            ];
         }
 
-        if (isset($post['private'])) {
-            $data['private'] = $validator->checkPrivateStatus($post['private']);
-        }
+        return $list;
+    }
 
-        return $data;
+    public function getCategories()
+    {
+        $categoryRepo = new CategoryRepo();
+
+        return $categoryRepo->findAll([
+            'type' => CategoryModel::TYPE_ARTICLE,
+            'level' => 1,
+            'published' => 1,
+        ]);
+    }
+
+    public function getSourceTypes()
+    {
+        return ArticleModel::sourceTypes();
+    }
+
+    public function getArticle($id)
+    {
+        return $this->checkArticle($id);
     }
 
 }
diff --git a/app/Http/Home/Services/Question.php b/app/Http/Home/Services/Question.php
new file mode 100644
index 00000000..c8af59cc
--- /dev/null
+++ b/app/Http/Home/Services/Question.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Http\Home\Services;
+
+use App\Models\Category as CategoryModel;
+use App\Models\Question as QuestionModel;
+use App\Repos\Category as CategoryRepo;
+use App\Repos\Tag as TagRepo;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+
+class Question extends LogicService
+{
+
+    use QuestionTrait;
+
+    public function getQuestionModel()
+    {
+        $question = new QuestionModel();
+
+        $question->afterFetch();
+
+        return $question;
+    }
+
+    public function getCategories()
+    {
+        $categoryRepo = new CategoryRepo();
+
+        return $categoryRepo->findAll([
+            'type' => CategoryModel::TYPE_ARTICLE,
+            'level' => 1,
+            'published' => 1,
+        ]);
+    }
+
+    public function getXmTags($id)
+    {
+        $tagRepo = new TagRepo();
+
+        $allTags = $tagRepo->findAll(['published' => 1], 'priority');
+
+        if ($allTags->count() == 0) return [];
+
+        $questionTagIds = [];
+
+        if ($id > 0) {
+            $question = $this->checkQuestion($id);
+            if (!empty($question->tags)) {
+                $questionTagIds = kg_array_column($question->tags, 'id');
+            }
+        }
+
+        $list = [];
+
+        foreach ($allTags as $tag) {
+            $selected = in_array($tag->id, $questionTagIds);
+            $list[] = [
+                'name' => $tag->name,
+                'value' => $tag->id,
+                'selected' => $selected,
+            ];
+        }
+
+        return $list;
+    }
+
+    public function getQuestion($id)
+    {
+        return $this->checkQuestion($id);
+    }
+
+}
diff --git a/app/Http/Home/Services/QuestionQuery.php b/app/Http/Home/Services/QuestionQuery.php
new file mode 100644
index 00000000..19f854d3
--- /dev/null
+++ b/app/Http/Home/Services/QuestionQuery.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Home\Services;
+
+use App\Models\Question as QuestionModel;
+use App\Validators\QuestionQuery as QuestionQueryValidator;
+
+class QuestionQuery extends Service
+{
+
+    protected $baseUrl;
+
+    public function __construct()
+    {
+        $this->baseUrl = $this->url->get(['for' => 'home.question.list']);
+    }
+
+    public function handleSorts()
+    {
+        $params = $this->getParams();
+
+        $result = [];
+
+        $sorts = QuestionModel::sortTypes();
+
+        foreach ($sorts as $key => $value) {
+            $params['sort'] = $key;
+            $result[] = [
+                'id' => $key,
+                'name' => $value,
+                'url' => $this->baseUrl . $this->buildParams($params),
+            ];
+        }
+
+        return $result;
+    }
+
+    public function getParams()
+    {
+        $query = $this->request->getQuery();
+
+        $params = [];
+
+        $validator = new QuestionQueryValidator();
+
+        if (isset($query['tag_id'])) {
+            $validator->checkTag($query['tag_id']);
+            $params['tag_id'] = $query['tag_id'];
+        }
+
+        if (isset($query['sort'])) {
+            $validator->checkSort($query['sort']);
+            $params['sort'] = $query['sort'];
+        }
+
+        return $params;
+    }
+
+    protected function buildParams($params)
+    {
+        return $params ? '?' . http_build_query($params) : '';
+    }
+
+}
diff --git a/app/Http/Home/Views/answer/add.volt b/app/Http/Home/Views/answer/add.volt
new file mode 100644
index 00000000..085ae598
--- /dev/null
+++ b/app/Http/Home/Views/answer/add.volt
@@ -0,0 +1,76 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <div class="breadcrumb">
+        <span class="layui-breadcrumb">
+            <a href="/">首页</a>
+            <a><cite>回答问题</cite></a>
+        </span>
+    </div>
+
+    <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-input-block" style="margin:0;">
+                        <input class="layui-input" type="text" name="title" value="{{ question.title }}" readonly="readonly">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <div class="layui-input-block" style="margin:0;">
+                        <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;">
+                        <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">发布回答</button>
+                        <input type="hidden" name="question_id" value="{{ question.id }}">
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <div id="tips" data-url="{{ url({'for':'home.answer.tips'}) }}"></div>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('https://cdn.jsdelivr.net/npm/vditor/dist/index.css', false) }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/index.min.js', false) }}
+    {{ js_include('home/js/answer.js') }}
+    {{ js_include('home/js/vditor.js') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        layui.use(['jquery', 'layer'], function () {
+
+            var $ = layui.jquery;
+            var layer = layui.layer;
+            var $tips = $('#tips');
+
+            if ($tips.length > 0) {
+                layer.open({
+                    type: 2,
+                    title: '答题指南',
+                    content: $tips.data('url'),
+                    area: ['600px', '320px'],
+                });
+            }
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/answer/edit.volt b/app/Http/Home/Views/answer/edit.volt
new file mode 100644
index 00000000..bbed9ada
--- /dev/null
+++ b/app/Http/Home/Views/answer/edit.volt
@@ -0,0 +1,49 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <div class="breadcrumb">
+        <span class="layui-breadcrumb">
+            <a href="/">首页</a>
+            <a><cite>编辑回答</cite></a>
+        </span>
+    </div>
+
+    <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-input-block" style="margin:0;">
+                        <input class="layui-input" type="text" name="title" value="{{ question.title }}" readonly="readonly">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <div class="layui-input-block" style="margin:0;">
+                        <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;">
+                        <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">发布回答</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('https://cdn.jsdelivr.net/npm/vditor/dist/index.css', false) }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/index.min.js', false) }}
+    {{ js_include('home/js/answer.js') }}
+    {{ js_include('home/js/vditor.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/answer/tips.volt b/app/Http/Home/Views/answer/tips.volt
new file mode 100644
index 00000000..cc8ba34e
--- /dev/null
+++ b/app/Http/Home/Views/answer/tips.volt
@@ -0,0 +1,20 @@
+{% extends 'templates/layer.volt' %}
+
+{% block content %}
+
+    <div class="answer-tips">
+        <h3 class="suggest-text">适合作为回答的</h3>
+        <ul class="suggest-list">
+            <li><i class="layui-icon layui-icon-ok-circle"></i> 经过验证的有效解决办法</li>
+            <li><i class="layui-icon layui-icon-ok-circle"></i> 自己的经验指引，对解决问题有帮助</li>
+            <li><i class="layui-icon layui-icon-ok-circle"></i> 遵循 Markdown 语法排版，表达语义正确</li>
+        </ul>
+        <h3 class="not-suggest-text">不该作为回答的</h3>
+        <ul class="not-suggest-list">
+            <li><i class="layui-icon layui-icon-close-fill"></i> 询问内容细节或回复楼层</li>
+            <li><i class="layui-icon layui-icon-close-fill"></i> 与题目无关的内容</li>
+            <li><i class="layui-icon layui-icon-close-fill"></i> “赞” “顶” “同问” 等毫无意义的内容</li>
+        </ul>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/article/comment.volt b/app/Http/Home/Views/article/comment.volt
index 91731085..6d9b24ee 100644
--- a/app/Http/Home/Views/article/comment.volt
+++ b/app/Http/Home/Views/article/comment.volt
@@ -9,7 +9,7 @@
         <div class="footer" id="comment-footer" style="display:none;">
             <div class="toolbar"></div>
             <div class="action">
-                <button class="{{ submit_class }}" lay-submit="true" lay-filter="addComment">发布</button>
+                <button class="{{ submit_class }}" lay-submit="true" lay-filter="add_comment">发布</button>
                 <button class="layui-btn layui-btn-sm layui-bg-gray" id="btn-cancel-comment" type="button">取消</button>
             </div>
         </div>
diff --git a/app/Http/Home/Views/article/edit.volt b/app/Http/Home/Views/article/edit.volt
index 5cfe7fcd..f88d3a5f 100644
--- a/app/Http/Home/Views/article/edit.volt
+++ b/app/Http/Home/Views/article/edit.volt
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    {% set title = article.id > 0 ? '编辑文章' : '撰写文章' %}
+    {% set title = article.id > 0 ? '编辑文章' : '写文章' %}
     {% set action_url = article.id > 0 ? url({'for':'home.article.update','id':article.id}) : url({'for':'home.article.create'}) %}
     {% set source_url_display = article.source_type == 1 ? 'display:none' : 'display:block' %}
 
@@ -30,8 +30,7 @@
                     </div>
                     <div class="layui-form-item center">
                         <div class="layui-input-block">
-                            <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">提交</button>
-                            <button class="kg-back layui-btn layui-btn-primary" type="button">返回</button>
+                            <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">发布文章</button>
                         </div>
                     </div>
                 </div>
@@ -41,25 +40,6 @@
                     <div class="layui-card-header">基本信息</div>
                     <div class="layui-card-body">
                         <div class="writer-sidebar">
-                            <div class="layui-form-item cover-wrap">
-                                <label class="layui-form-label">封面</label>
-                                <div class="layui-input-block">
-                                    <img id="img-cover" class="cover" src="{{ article.cover }}!cover_270">
-                                    <input type="hidden" name="cover" value="{{ article.cover }}">
-                                </div>
-                                <button id="change-cover" class="layui-btn layui-btn-sm btn-change" type="button">更换</button>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">分类</label>
-                                <div class="layui-input-block">
-                                    <select name="category_id" lay-verify="required">
-                                        <option value="">请选择</option>
-                                        {% for item in categories %}
-                                            <option value="{{ item.id }}" {% if article.category_id == item.id %}selected="selected"{% endif %}>{{ item.name }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </div>
-                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">标签</label>
                                 <div class="layui-input-block">
@@ -87,10 +67,10 @@
                                 </div>
                             </div>
                             <div class="layui-form-item">
-                                <label class="layui-form-label">允许评论</label>
+                                <label class="layui-form-label">关闭评论</label>
                                 <div class="layui-input-block">
-                                    <input type="radio" name="allow_comment" value="1" title="是" {% if article.allow_comment == 1 %}checked="checked"{% endif %}>
-                                    <input type="radio" name="allow_comment" value="0" title="否" {% if article.allow_comment == 0 %}checked="checked"{% endif %}>
+                                    <input type="radio" name="closed" value="1" title="是" {% if article.closed == 1 %}checked="checked"{% endif %}>
+                                    <input type="radio" name="closed" value="0" title="否" {% if article.closed == 0 %}checked="checked"{% endif %}>
                                 </div>
                             </div>
                             <div class="layui-form-item">
diff --git a/app/Http/Home/Views/article/hot_authors.volt b/app/Http/Home/Views/article/hot_authors.volt
index ec92de94..8cfd91fa 100644
--- a/app/Http/Home/Views/article/hot_authors.volt
+++ b/app/Http/Home/Views/article/hot_authors.volt
@@ -1,4 +1,4 @@
-{% if authors %}
+{% if authors|length > 0 %}
     <div class="layui-card">
         <div class="layui-card-header">推荐作者</div>
         <div class="layui-card-body">
diff --git a/app/Http/Home/Views/article/list.volt b/app/Http/Home/Views/article/list.volt
index c3e60e54..e540ac25 100644
--- a/app/Http/Home/Views/article/list.volt
+++ b/app/Http/Home/Views/article/list.volt
@@ -2,10 +2,10 @@
 
 {% block content %}
 
-    {% set category_val = request.get('category_id','int','all') %}
     {% set sort_val = request.get('sort','trim','latest') %}
     {% set pager_url = url({'for':'home.article.pager'}, params) %}
-    {% set hot_author_url = url({'for':'home.article.hot_authors'}) %}
+    {% set hot_authors_url = url({'for':'home.article.hot_authors'}) %}
+    {% set my_tags_url = url({'for':'home.widget.my_tags'},{'type':'article'}) %}
 
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
@@ -17,30 +17,26 @@
     <div class="layout-main clearfix">
         <div class="layout-content">
             <div class="content-wrap wrap">
-                <div class="article-sort">
-                    {% for sort in sorts %}
-                        {% set class = sort_val == sort.id ? 'layui-btn layui-btn-xs' : 'none' %}
-                        <a class="{{ class }}" href="{{ sort.url }}">{{ sort.name }}</a>
-                    {% endfor %}
-                </div>
-                <div class="article-list" id="article-list" data-url="{{ pager_url }}"></div>
-            </div>
-        </div>
-        <div class="layout-sidebar">
-            <div class="sidebar">
-                <div class="layui-card">
-                    <div class="layui-card-header">文章分类</div>
-                    <div class="layui-card-body">
-                        <ul class="article-cate-list">
-                            {% for category in categories %}
-                                {% set class = category_val == category.id ? 'active' : '' %}
-                                <li class="{{ class }}"><a href="{{ category.url }}">{{ category.name }}</a></li>
-                            {% endfor %}
-                        </ul>
+                <div class="layui-tab layui-tab-brief search-tab">
+                    <ul class="layui-tab-title">
+                        {% for sort in sorts %}
+                            {% set class = sort_val == sort.id ? 'layui-this' : 'none' %}
+                            <li class="{{ class }}"><a href="{{ sort.url }}">{{ sort.name }}</a></li>
+                        {% endfor %}
+                    </ul>
+                    <div class="layui-tab-content">
+                        <div class="layui-tab-item layui-show">
+                            <div id="article-list" data-url="{{ pager_url }}"></div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="sidebar" id="hot-author-list" data-url="{{ hot_author_url }}"></div>
+        </div>
+        <div class="layout-sidebar">
+            {% if auth_user.id > 0 %}
+                <div class="sidebar" id="sidebar-my-tags" data-url="{{ my_tags_url }}"></div>
+            {% endif %}
+            <div class="sidebar" id="sidebar-hot-authors" data-url="{{ hot_authors_url }}"></div>
         </div>
     </div>
 
diff --git a/app/Http/Home/Views/article/pager.volt b/app/Http/Home/Views/article/pager.volt
index 4fa86973..18dd8c2d 100644
--- a/app/Http/Home/Views/article/pager.volt
+++ b/app/Http/Home/Views/article/pager.volt
@@ -1,16 +1,11 @@
 {{ partial('macros/article') }}
 
 {% if pager.total_pages > 0 %}
-    <div class="article-list clearfix">
+    <div class="article-list">
         {% for item in pager.items %}
             {% set article_url = url({'for':'home.article.show','id':item.id}) %}
             {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
-            <div class="article-card clearfix">
-                <div class="cover">
-                    <a href="{{ article_url }}" target="_blank">
-                        <img src="{{ item.cover }}!cover_270" alt="{{ item.title }}">
-                    </a>
-                </div>
+            <div class="article-card">
                 <div class="info">
                     <div class="title layui-elip">
                         <a href="{{ article_url }}" target="_blank">{{ item.title }}</a>
@@ -18,12 +13,19 @@
                     <div class="summary">{{ item.summary }}</div>
                     <div class="meta">
                         <span class="owner"><a href="{{ owner_url }}">{{ item.owner.name }}</a></span>
-                        <span class="view">{{ item.view_count }} 浏览</span>
-                        <span class="comment">{{ item.comment_count }} 评论</span>
-                        <span class="like">{{ item.like_count }} 点赞</span>
                         <span class="time">{{ item.create_time|time_ago }}</span>
+                        <span class="view">{{ item.view_count }} 浏览</span>
+                        <span class="like">{{ item.like_count }} 点赞</span>
+                        <span class="comment">{{ item.comment_count }} 评论</span>
                     </div>
                 </div>
+                {% if item.cover %}
+                    <div class="cover">
+                        <a href="{{ article_url }}" target="_blank">
+                            <img src="{{ item.cover }}!cover_270" alt="{{ item.title }}">
+                        </a>
+                    </div>
+                {% endif %}
             </div>
         {% endfor %}
     </div>
diff --git a/app/Http/Home/Views/article/related.volt b/app/Http/Home/Views/article/related.volt
index c68bf7b5..d84bda39 100644
--- a/app/Http/Home/Views/article/related.volt
+++ b/app/Http/Home/Views/article/related.volt
@@ -11,7 +11,7 @@
                     <div class="meta">
                         <span class="view">{{ article.view_count }} 浏览</span>
                         <span class="like">{{ article.like_count }} 点赞</span>
-                        <span class="comment">{{ article.like_count }} 评论</span>
+                        <span class="comment">{{ article.comment_count }} 评论</span>
                     </div>
                 {% endfor %}
             </div>
diff --git a/app/Http/Home/Views/article/show.volt b/app/Http/Home/Views/article/show.volt
index 97de06a6..7b145569 100644
--- a/app/Http/Home/Views/article/show.volt
+++ b/app/Http/Home/Views/article/show.volt
@@ -5,14 +5,17 @@
     {{ partial('macros/article') }}
 
     {% set article_list_url = url({'for':'home.article.list'}) %}
-    {% set related_article_url = url({'for':'home.article.related','id':article.id}) %}
-    {% set owner_url = url({'for':'home.user.show','id':article.owner.id}) %}
+    {% set article_report_url = url({'for':'home.article.report','id':article.id}) %}
+    {% set article_edit_url = url({'for':'home.article.edit','id':article.id}) %}
+    {% set article_delete_url = url({'for':'home.article.delete','id':article.id}) %}
+    {% set article_owner_url = url({'for':'home.user.show','id':article.owner.id}) %}
+    {% set article_related_url = url({'for':'home.article.related','id':article.id}) %}
 
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="/">首页</a>
             <a href="{{ article_list_url }}">专栏</a>
-            <a><cite>文章详情</cite></a>
+            <a><cite>详情</cite></a>
         </span>
         <span class="share">
             <a href="javascript:" title="分享到微信"><i class="layui-icon layui-icon-login-wechat icon-wechat"></i></a>
@@ -29,13 +32,20 @@
             <div class="article-info wrap">
                 <div class="title">{{ article.title }}</div>
                 <div class="meta">
-                    <span class="source layui-badge layui-bg-green">{{ source_type(article.source_type) }}</span>
-                    <span class="owner">
-                        <a href="{{ owner_url }}">{{ article.owner.name }}</a>
-                    </span>
-                    <span class="view">{{ article.view_count }} 阅读</span>
-                    <span class="word">{{ article.word_count }} 字数</span>
-                    <span class="time" title="{{ date('Y-m-d H:i:s',article.create_time) }}">{{ article.create_time|time_ago }}</span>
+                    <div class="left">
+                        <span class="source layui-badge layui-bg-green">{{ source_type(article.source_type) }}</span>
+                        <span class="owner"><a href="{{ article_owner_url }}">{{ article.owner.name }}</a></span>
+                        <span class="time">{{ article.create_time|time_ago }}</span>
+                        <span class="view">{{ article.view_count }} 阅读</span>
+                        <span class="comment">{{ article.comment_count }} 评论</span>
+                    </div>
+                    <div class="right">
+                        <span class="article-report" data-url="{{ article_report_url }}">举报</span>
+                        {% if auth_user.id == article.owner.id %}
+                            <span class="article-edit" data-url="{{ article_edit_url }}">编辑</span>
+                            <span class="kg-delete" data-url="{{ article_delete_url }}">删除</span>
+                        {% endif %}
+                    </div>
                 </div>
                 <div class="content markdown-body">{{ article.content }}</div>
                 {% if article.tags %}
@@ -55,7 +65,7 @@
                 {% endif %}
             </div>
             <div id="comment-anchor"></div>
-            {% if article.allow_comment == 1 %}
+            {% if article.closed == 0 %}
                 <div class="article-comment wrap">
                     {{ partial('article/comment') }}
                 </div>
@@ -74,7 +84,7 @@
                             </div>
                             <div class="info">
                                 <div class="name layui-elip">
-                                    <a href="{{ owner_url }}" title="{{ article.owner.about }}">{{ article.owner.name }}</a>
+                                    <a href="{{ article_owner_url }}" title="{{ article.owner.about }}">{{ article.owner.name }}</a>
                                 </div>
                                 <div class="title layui-elip">{{ article.owner.title|default('初出江湖') }}</div>
                             </div>
@@ -82,7 +92,7 @@
                     </div>
                 </div>
             </div>
-            <div class="sidebar" id="related-article-list" data-url="{{ related_article_url }}"></div>
+            <div class="sidebar" id="sidebar-related" data-url="{{ article_related_url }}"></div>
         </div>
     </div>
 
diff --git a/app/Http/Home/Views/article/sticky.volt b/app/Http/Home/Views/article/sticky.volt
index 50be63ab..5e3cef4f 100644
--- a/app/Http/Home/Views/article/sticky.volt
+++ b/app/Http/Home/Views/article/sticky.volt
@@ -20,7 +20,7 @@
     </div>
     <div class="item" id="toolbar-favorite">
         <div class="icon" title="{{ favorite_title }}" data-url="{{ favorite_url }}">
-            <i class="layui-icon layui-icon-star icon-star {{ favorite_class }}"></i>
+            <i class="layui-icon icon-star {{ favorite_class }}"></i>
         </div>
         <div class="text" data-count="{{ article.favorite_count }}">{{ article.favorite_count }}</div>
     </div>
diff --git a/app/Http/Home/Views/chapter/comment.volt b/app/Http/Home/Views/chapter/comment.volt
index 35a0f786..9cff8d86 100644
--- a/app/Http/Home/Views/chapter/comment.volt
+++ b/app/Http/Home/Views/chapter/comment.volt
@@ -8,7 +8,7 @@
         <div class="footer" id="comment-footer" style="display:none;">
             <div class="toolbar"></div>
             <div class="action">
-                <button class="layui-btn layui-btn-sm" lay-submit="true" lay-filter="addComment">发布</button>
+                <button class="layui-btn layui-btn-sm" lay-submit="true" lay-filter="add_comment">发布</button>
                 <button class="layui-btn layui-btn-sm layui-bg-gray" id="btn-cancel-comment" type="button">取消</button>
             </div>
         </div>
diff --git a/app/Http/Home/Views/comment/list.volt b/app/Http/Home/Views/comment/list.volt
index 15f853bb..f4c86d44 100644
--- a/app/Http/Home/Views/comment/list.volt
+++ b/app/Http/Home/Views/comment/list.volt
@@ -1,12 +1,13 @@
 {% if pager.total_pages > 0 %}
     {% for item in pager.items %}
         {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+        {% set report_url = url({'for':'home.comment.report','id':item.id}) %}
         {% set like_url = url({'for':'home.comment.like','id':item.id}) %}
         {% set delete_url = url({'for':'home.comment.delete','id':item.id}) %}
-        {% set reply_create_url = url({'for':'home.comment.create_reply','id':item.id}) %}
+        {% set reply_url = url({'for':'home.comment.reply','id':item.id}) %}
         {% set reply_list_url = url({'for':'home.comment.replies','id':item.id},{'limit':5}) %}
         <div class="comment-box" id="comment-{{ item.id }}">
-            <div class="comment-card clearfix">
+            <div class="comment-card">
                 <div class="avatar">
                     <a href="{{ owner_url }}" title="{{ item.owner.name }}" target="_blank">
                         <img src="{{ item.owner.avatar }}!avatar_160" alt="{{ item.owner.name }}">
@@ -25,26 +26,26 @@
                             <div class="column">
                                 <span class="like-count" data-count="{{ item.like_count }}">{{ item.like_count }}</span>
                                 {% if item.me.liked == 1 %}
-                                    <span class="action action-like liked" title="取消点赞" data-url="{{ like_url }}">已赞</span>
+                                    <span class="action comment-like liked" title="取消点赞" data-url="{{ like_url }}">已赞</span>
                                 {% else %}
-                                    <span class="action action-like" title="点赞支持" data-url="{{ like_url }}">点赞</span>
+                                    <span class="action comment-like" title="点赞支持" data-url="{{ like_url }}">点赞</span>
                                 {% endif %}
                             </div>
                             <div class="column">
                                 <span class="reply-count" data-count="{{ item.reply_count }}">{{ item.reply_count }}</span>
-                                <span class="action action-toggle" title="展开回应" data-id="{{ item.id }}" data-url="{{ reply_list_url }}">回应</span>
+                                <span class="action comment-toggle" title="展开回应" data-id="{{ item.id }}" data-url="{{ reply_list_url }}">回应</span>
                             </div>
                         </div>
                         <div class="right">
                             <div class="column">
-                                <span class="action action-reply" data-id="{{ item.id }}">回复</span>
+                                <span class="action comment-reply" data-id="{{ item.id }}">回复</span>
                             </div>
                             <div class="column">
-                                <span class="action action-report" data-id="{{ item.id }}">举报</span>
+                                <span class="action comment-report" data-url="{{ report_url }}">举报</span>
                             </div>
                             {% if item.owner.id == auth_user.id %}
                                 <div class="column">
-                                    <span class="action action-delete" data-id="{{ item.id }}" data-url="{{ delete_url }}">删除</span>
+                                    <span class="action comment-delete" data-id="{{ item.id }}" data-url="{{ delete_url }}">删除</span>
                                 </div>
                             {% endif %}
                         </div>
@@ -52,12 +53,12 @@
                 </div>
             </div>
             <div class="comment-form" id="comment-form-{{ item.id }}" style="display:none;">
-                <form class="layui-form" method="post" action="{{ reply_create_url }}">
+                <form class="layui-form" method="post" action="{{ reply_url }}">
                     <textarea class="layui-textarea" name="content" placeholder="撰写评论..." lay-verify="required"></textarea>
                     <div class="footer">
                         <div class="toolbar"></div>
                         <div class="action">
-                            <button class="layui-btn layui-btn-sm" lay-submit="true" lay-filter="replyComment" data-comment-id="{{ item.id }}" data-parent-id="{{ item.parent_id }}">发布</button>
+                            <button class="layui-btn layui-btn-sm" lay-submit="true" lay-filter="reply_comment" data-comment-id="{{ item.id }}" data-parent-id="{{ item.parent_id }}">发布</button>
                             <button class="layui-btn layui-btn-sm layui-bg-gray btn-cancel-reply" type="button" data-id="{{ item.id }}">取消</button>
                         </div>
                     </div>
diff --git a/app/Http/Home/Views/comment/replies.volt b/app/Http/Home/Views/comment/replies.volt
index 4b05ab1b..8d14e8cd 100644
--- a/app/Http/Home/Views/comment/replies.volt
+++ b/app/Http/Home/Views/comment/replies.volt
@@ -3,9 +3,9 @@
         {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
         {% set like_url = url({'for':'home.comment.like','id':item.id}) %}
         {% set delete_url = url({'for':'home.comment.delete','id':item.id}) %}
-        {% set reply_create_url = url({'for':'home.comment.create_reply','id':item.id}) %}
+        {% set reply_url = url({'for':'home.comment.reply','id':item.id}) %}
         <div class="comment-box" id="comment-{{ item.id }}">
-            <div class="comment-card clearfix">
+            <div class="comment-card">
                 <div class="avatar">
                     <a href="{{ owner_url }}" title="{{ item.owner.name }}" target="_blank">
                         <img src="{{ item.owner.avatar }}!avatar_160" alt="{{ item.owner.name }}">
@@ -29,22 +29,22 @@
                             <div class="column">
                                 <span class="like-count" data-count="{{ item.like_count }}">{{ item.like_count }}</span>
                                 {% if item.me.liked == 1 %}
-                                    <span class="action action-like liked" title="取消点赞" data-url="{{ like_url }}">已赞</span>
+                                    <span class="action comment-like liked" title="取消点赞" data-url="{{ like_url }}">已赞</span>
                                 {% else %}
-                                    <span class="action action-like" title="点赞支持" data-url="{{ like_url }}">点赞</span>
+                                    <span class="action comment-like" title="点赞支持" data-url="{{ like_url }}">点赞</span>
                                 {% endif %}
                             </div>
                         </div>
                         <div class="right">
                             <div class="column">
-                                <span class="action action-reply" data-id="{{ item.id }}">回复</span>
+                                <span class="action comment-reply" data-id="{{ item.id }}">回复</span>
                             </div>
                             <div class="column">
-                                <span class="action action-report" data-id="{{ item.id }}">举报</span>
+                                <span class="action comment-report" data-id="{{ item.id }}">举报</span>
                             </div>
                             {% if item.owner.id == auth_user.id %}
                                 <div class="column">
-                                    <span class="action action-delete" data-id="{{ item.id }}" data-parent-id="{{ item.parent_id }}" data-url="{{ delete_url }}">删除</span>
+                                    <span class="action comment-delete" data-id="{{ item.id }}" data-parent-id="{{ item.parent_id }}" data-url="{{ delete_url }}">删除</span>
                                 </div>
                             {% endif %}
                         </div>
@@ -52,12 +52,12 @@
                 </div>
             </div>
             <div class="comment-form" id="comment-form-{{ item.id }}" style="display:none;">
-                <form class="layui-form" method="post" action="{{ reply_create_url }}">
+                <form class="layui-form" method="post" action="{{ reply_url }}">
                     <textarea class="layui-textarea" name="content" placeholder="撰写评论..." lay-verify="required"></textarea>
                     <div class="footer">
                         <div class="toolbar"></div>
                         <div class="action">
-                            <button class="layui-btn layui-btn-sm" lay-submit="true" lay-filter="replyComment" data-comment-id="{{ item.id }}" data-parent-id="{{ item.parent_id }}">发布</button>
+                            <button class="layui-btn layui-btn-sm" lay-submit="true" lay-filter="reply_comment" data-comment-id="{{ item.id }}" data-parent-id="{{ item.parent_id }}">发布</button>
                             <button class="layui-btn layui-btn-sm layui-bg-gray btn-cancel-reply" type="button" data-id="{{ item.id }}">取消</button>
                         </div>
                     </div>
diff --git a/app/Http/Home/Views/comment/reply.volt b/app/Http/Home/Views/comment/reply.volt
deleted file mode 100644
index 6143f829..00000000
--- a/app/Http/Home/Views/comment/reply.volt
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'templates/layer.volt' %}
-
-{% block content %}
-    <form class="layui-form" method="post" action="{{ url({'for':'home.comment.create_reply','id':comment.id}) }}">
-        <div class="layui-form-item">
-            <textarea class="layui-textarea" name="content" placeholder="@{{ comment.owner.name }}" lay-verify="required"></textarea>
-        </div>
-        <div class="layui-form-item center">
-            <button class="layui-btn" lay-submit="true" lay-filter="replyComment">提交</button>
-            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
-        </div>
-    </form>
-{% endblock %}
-
-{% block include_js %}
-
-    {{ js_include('home/js/comment.js') }}
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/course/consults.volt b/app/Http/Home/Views/course/consults.volt
index 9043c915..8524063c 100644
--- a/app/Http/Home/Views/course/consults.volt
+++ b/app/Http/Home/Views/course/consults.volt
@@ -5,7 +5,7 @@
             {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
             {% set consult_url = url({'for':'home.consult.show','id':item.id}) %}
             {% set like_url = url({'for':'home.consult.like','id':item.id}) %}
-            <div class="comment-card review-card clearfix">
+            <div class="comment-card consult-card">
                 <div class="avatar">
                     <a href="{{ owner_url }}" title="{{ item.owner.name }}" target="_blank">
                         <img src="{{ item.owner.avatar }}!avatar_160" alt="{{ item.owner.name }}">
@@ -17,8 +17,8 @@
                             <i class="layui-icon layui-icon-more"></i>
                         </a>
                     </div>
-                    <div class="title layui-elip">{{ item.question }}</div>
-                    <div class="content">{{ item.answer }}</div>
+                    <div class="question">{{ item.question }}</div>
+                    <div class="answer">{{ item.answer }}</div>
                     <div class="footer">
                         <div class="left">
                             <div class="column">
diff --git a/app/Http/Home/Views/course/reviews.volt b/app/Http/Home/Views/course/reviews.volt
index 52235a7f..352573c3 100644
--- a/app/Http/Home/Views/course/reviews.volt
+++ b/app/Http/Home/Views/course/reviews.volt
@@ -5,7 +5,7 @@
         {% for item in pager.items %}
             {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
             {% set like_url = url({'for':'home.review.like','id':item.id}) %}
-            <div class="comment-card review-card clearfix">
+            <div class="comment-card review-card">
                 <div class="avatar">
                     <a href="{{ owner_url }}" title="{{ item.owner.name }}" target="_blank">
                         <img src="{{ item.owner.avatar }}!avatar_160" alt="{{ item.owner.name }}">
diff --git a/app/Http/Home/Views/macros/answer.volt b/app/Http/Home/Views/macros/answer.volt
new file mode 100644
index 00000000..05de2d9f
--- /dev/null
+++ b/app/Http/Home/Views/macros/answer.volt
@@ -0,0 +1,11 @@
+{%- macro publish_status(type) %}
+    {% if type == 1 %}
+        审核中
+    {% elseif type == 2 %}
+        已发布
+    {% elseif type == 3 %}
+        未通过
+    {% else %}
+        未知
+    {% endif %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/macros/notification.volt b/app/Http/Home/Views/macros/notification.volt
index 8b50b462..1b8e7171 100644
--- a/app/Http/Home/Views/macros/notification.volt
+++ b/app/Http/Home/Views/macros/notification.volt
@@ -16,7 +16,7 @@
         <p>评价内容：{{ info.review.content }}</p>
     {% elseif type == 184 %}
         {% set article_url = url({'for':'home.article.show','id':info.article.id}) %}
-        <p>你的文章 <a href="{{ article_url }}" target="_blank">{{ info.article.title }}</a> 通过了审核</p>
+        <p>你的文章 <a href="{{ article_url }}" target="_blank">{{ info.article.title }}</a> 审核已通过</p>
     {% elseif type == 185 %}
         {% set article_url = url({'for':'home.article.show','id':info.article.id}) %}
         <p>你的文章 <a href="{{ article_url }}" target="_blank">{{ info.article.title }}</a> 审核未通过</p>
@@ -31,6 +31,35 @@
     {% elseif type == 189 %}
         {% set article_url = url({'for':'home.article.show','id':info.article.id}) %}
         <p>{{ sender.name }} 喜欢了你的文章 <a href="{{ article_url }}" target="_blank">{{ info.article.title }}</a></p>
+    {% elseif type == 204 %}
+        {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}
+        <p>你的提问 <a href="{{ question_url }}" target="_blank">{{ info.question.title }}</a> 审核已通过</p>
+    {% elseif type == 205 %}
+        {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}
+        <p>你的提问 <a href="{{ question_url }}" target="_blank">{{ info.question.title }}</a> 审核未通过</p>
+        <p>拒绝原因：{{ info.reason }}</p>
+    {% elseif type == 206 %}
+        {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}
+        <p>{{ sender.name }} 回答了你的提问 <a href="{{ question_url }}" target="_blank">{{ info.question.title }}</a></p>
+        <p>回答内容：{{ info.answer.summary }}</p>
+    {% elseif type == 208 %}
+        {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}
+        <p>{{ sender.name }} 收藏了你的问题 <a href="{{ question_url }}" target="_blank">{{ info.question.title }}</a></p>
+    {% elseif type == 209 %}
+        {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}
+        <p>{{ sender.name }} 喜欢了你的问题 <a href="{{ question_url }}" target="_blank">{{ info.question.title }}</a></p>
+    {% elseif type == 224 %}
+        {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}
+        <p>你对问题 <a href="{{ question_url }}" target="_blank">{{ info.question.title }}</a> 的回答，审核已通过</p>
+        <p>回答内容：{{ info.answer.summary }}</p>
+    {% elseif type == 225 %}
+        {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}
+        <p>你对问题 <a href="{{ question_url }}" target="_blank">{{ info.question.title }}</a> 的回答，审核未通过</p>
+        <p>回答内容：{{ info.answer.summary }}</p>
+    {% elseif type == 228 %}
+        {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}
+        <p>{{ sender.name }} 喜欢了你对问题 <a href="{{ question_url }}" target="_blank">{{ info.question.title }}</a>　的回答</p>
+        <p>回答内容：{{ info.answer.summary }}</p>
     {% elseif type == 506 %}
         <p>{{ sender.name }} 回复了你的评论：{{ info.comment.content }}</p>
         <p>回复内容：{{ info.reply.content }}</p>
diff --git a/app/Http/Home/Views/macros/question.volt b/app/Http/Home/Views/macros/question.volt
new file mode 100644
index 00000000..05de2d9f
--- /dev/null
+++ b/app/Http/Home/Views/macros/question.volt
@@ -0,0 +1,11 @@
+{%- macro publish_status(type) %}
+    {% if type == 1 %}
+        审核中
+    {% elseif type == 2 %}
+        已发布
+    {% elseif type == 3 %}
+        未通过
+    {% else %}
+        未知
+    {% endif %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/partials/header.volt b/app/Http/Home/Views/partials/header.volt
index 3a1ee5a3..fc3cc815 100644
--- a/app/Http/Home/Views/partials/header.volt
+++ b/app/Http/Home/Views/partials/header.volt
@@ -42,7 +42,7 @@
             <li class="layui-nav-item">
                 <a href="javascript:">创建</a>
                 <dl class="layui-nav-child">
-                    <dd><a href="javascript:">提问题</a></dd>
+                    <dd><a href="{{ url({'for':'home.question.add'}) }}" target="_blank">提问题</a></dd>
                     <dd><a href="{{ url({'for':'home.article.add'}) }}" target="_blank">写文章</a></dd>
                 </dl>
             </li>
diff --git a/app/Http/Home/Views/question/answer_tips.volt b/app/Http/Home/Views/question/answer_tips.volt
new file mode 100644
index 00000000..bf7e38ce
--- /dev/null
+++ b/app/Http/Home/Views/question/answer_tips.volt
@@ -0,0 +1,17 @@
+<div class="layui-card">
+    <div class="layui-card-header">答题指南</div>
+    <div class="layui-card-body">
+        <h3 class="suggest-text">适合作为回答的</h3>
+        <ul class="suggest-list">
+            <li><i class="layui-icon layui-icon-ok-circle"></i> 经过验证的有效解决办法</li>
+            <li><i class="layui-icon layui-icon-ok-circle"></i> 自己的经验指引，对解决问题有帮助</li>
+            <li><i class="layui-icon layui-icon-ok-circle"></i> 遵循 Markdown 语法排版，表达语义正确</li>
+        </ul>
+        <h3 class="not-suggest-text">不该作为回答的</h3>
+        <ul class="not-suggest-list">
+            <li><i class="layui-icon layui-icon-close-fill"></i> 询问内容细节或回复楼层</li>
+            <li><i class="layui-icon layui-icon-close-fill"></i> 与题目无关的内容</li>
+            <li><i class="layui-icon layui-icon-close-fill"></i> “赞” “顶” “同问” 等毫无意义的内容</li>
+        </ul>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Http/Home/Views/question/answers.volt b/app/Http/Home/Views/question/answers.volt
new file mode 100644
index 00000000..c74f5bf8
--- /dev/null
+++ b/app/Http/Home/Views/question/answers.volt
@@ -0,0 +1,51 @@
+{% if pager.total_pages > 0 %}
+    {% for item in pager.items %}
+        {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+        {% set like_url = url({'for':'home.answer.like','id':item.id}) %}
+        {% set report_url = url({'for':'home.answer.report','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}) %}
+        <div class="comment-card answer-card" id="answer-{{ item.id }}">
+            <div class="avatar">
+                <a href="{{ owner_url }}" title="{{ item.owner.name }}" target="_blank">
+                    <img src="{{ item.owner.avatar }}!avatar_160" alt="{{ item.owner.name }}">
+                </a>
+            </div>
+            <div class="info">
+                <div class="user">
+                    <a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a>
+                </div>
+                <div class="content markdown-body">{{ item.content }}</div>
+                <div class="footer">
+                    <div class="left">
+                        <div class="column">
+                            <span class="time" title="{{ date('Y-m-d H:i',item.create_time) }}">{{ item.create_time|time_ago }}</span>
+                        </div>
+                        <div class="column">
+                            <span class="like-count" data-count="{{ item.like_count }}">{{ item.like_count }}</span>
+                            {% if item.me.liked == 1 %}
+                                <span class="action answer-like liked" title="取消点赞" data-url="{{ like_url }}">已赞</span>
+                            {% else %}
+                                <span class="action answer-like" title="点赞支持" data-url="{{ like_url }}">点赞</span>
+                            {% endif %}
+                        </div>
+                    </div>
+                    <div class="right">
+                        <div class="column">
+                            <span class="action answer-report" data-url="{{ report_url }}">举报</span>
+                        </div>
+                        {% if auth_user.id == item.owner.id %}
+                            <div class="column">
+                                <span class="action answer-edit" data-url="{{ edit_url }}">编辑</span>
+                            </div>
+                            <div class="column">
+                                <span class="action kg-delete" data-url="{{ delete_url }}">删除</span>
+                            </div>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endfor %}
+    {{ partial('partials/pager_ajax') }}
+{% endif %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/question/edit.volt b/app/Http/Home/Views/question/edit.volt
new file mode 100644
index 00000000..15cea959
--- /dev/null
+++ b/app/Http/Home/Views/question/edit.volt
@@ -0,0 +1,71 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {% set title = question.id > 0 ? '编辑问题' : '提问题' %}
+    {% set action_url = question.id > 0 ? url({'for':'home.question.update','id':question.id}) : url({'for':'home.question.create'}) %}
+
+    <div class="breadcrumb">
+        <span class="layui-breadcrumb">
+            <a href="/">首页</a>
+            <a><cite>{{ title }}</cite></a>
+        </span>
+    </div>
+
+    <form class="layui-form" method="POST" action="{{ action_url }}">
+        <div class="layout-main clearfix">
+            <div class="layout-content">
+                <div class="writer-content wrap">
+                    <div class="layui-form-item">
+                        <div class="layui-input-block">
+                            <input class="layui-input" type="text" name="title" value="{{ question.title }}" placeholder="请输入标题..." lay-verify="required">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-input-block">
+                            <div id="vditor"></div>
+                            <textarea name="content" class="layui-hide" id="vditor-textarea">{{ question.content }}</textarea>
+                        </div>
+                    </div>
+                    <div class="layui-form-item center">
+                        <div class="layui-input-block">
+                            <button class="layui-btn kg-submit" lay-submit="true" lay-filter="go">发布问题</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layout-sidebar">
+                <div class="layui-card">
+                    <div class="layui-card-header">基本信息</div>
+                    <div class="layui-card-body">
+                        <div class="writer-sidebar">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标签</label>
+                                <div class="layui-input-block">
+                                    <div id="xm-tag-ids"></div>
+                                    <input type="hidden" name="xm_tags" value='{{ xm_tags|json_encode }}'>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('https://cdn.jsdelivr.net/npm/vditor/dist/index.css', false) }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/index.min.js', false) }}
+    {{ js_include('lib/xm-select.js') }}
+    {{ js_include('home/js/question.edit.js') }}
+    {{ js_include('home/js/vditor.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/question/hot_questions.volt b/app/Http/Home/Views/question/hot_questions.volt
new file mode 100644
index 00000000..bfb765c4
--- /dev/null
+++ b/app/Http/Home/Views/question/hot_questions.volt
@@ -0,0 +1,27 @@
+{% if questions|length > 0 %}
+    <div class="layui-card">
+        <div class="layui-card-header">热门问题</div>
+        <div class="layui-card-body">
+            {% for item in questions %}
+                {% set url = url({'for':'home.question.show','id':item.id}) %}
+                {% set rank = loop.index %}
+                <div class="sidebar-rank-card">
+                    <div class="rank">
+                        {% if rank == 1 %}
+                            <span class="layui-badge layui-bg-red">{{ rank }}</span>
+                        {% elseif rank == 2 %}
+                            <span class="layui-badge layui-bg-blue">{{ rank }}</span>
+                        {% elseif rank == 3 %}
+                            <span class="layui-badge layui-bg-green">{{ rank }}</span>
+                        {% else %}
+                            <span class="layui-badge layui-bg-gray">{{ rank }}</span>
+                        {% endif %}
+                    </div>
+                    <div class="title">
+                        <a href="{{ url }}">{{ item.title }}</a>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+{% endif %}
diff --git a/app/Http/Home/Views/question/list.volt b/app/Http/Home/Views/question/list.volt
new file mode 100644
index 00000000..e53df859
--- /dev/null
+++ b/app/Http/Home/Views/question/list.volt
@@ -0,0 +1,51 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {% set sort_val = request.get('sort','trim','latest') %}
+    {% set pager_url = url({'for':'home.question.pager'}, params) %}
+    {% set hot_questions_url = url({'for':'home.question.hot_questions'}) %}
+    {% set top_answerers_url = url({'for':'home.question.top_answerers'}) %}
+    {% set my_tags_url = url({'for':'home.widget.my_tags'},{'type':'question'}) %}
+
+    <div class="breadcrumb">
+        <span class="layui-breadcrumb">
+            <a href="/">首页</a>
+            <a><cite>问答</cite></a>
+        </span>
+    </div>
+
+    <div class="layout-main clearfix">
+        <div class="layout-content">
+            <div class="content-wrap wrap">
+                <div class="layui-tab layui-tab-brief search-tab">
+                    <ul class="layui-tab-title">
+                        {% for sort in sorts %}
+                            {% set class = sort_val == sort.id ? 'layui-this' : 'none' %}
+                            <li class="{{ class }}"><a href="{{ sort.url }}">{{ sort.name }}</a></li>
+                        {% endfor %}
+                    </ul>
+                    <div class="layui-tab-content">
+                        <div class="layui-tab-item layui-show">
+                            <div id="question-list" data-url="{{ pager_url }}"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layout-sidebar">
+            {% if auth_user.id > 0 %}
+                <div class="sidebar" id="sidebar-my-tags" data-url="{{ my_tags_url }}"></div>
+            {% endif %}
+            <div class="sidebar" id="sidebar-hot-questions" data-url="{{ hot_questions_url }}"></div>
+            <div class="sidebar" id="sidebar-top-answerers" data-url="{{ top_answerers_url }}"></div>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('home/js/question.list.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/question/pager.volt b/app/Http/Home/Views/question/pager.volt
new file mode 100644
index 00000000..7e30295f
--- /dev/null
+++ b/app/Http/Home/Views/question/pager.volt
@@ -0,0 +1,43 @@
+{{ partial('macros/question') }}
+
+{% if pager.total_pages > 0 %}
+    <div class="question-list">
+        {% for item in pager.items %}
+            {% set question_url = url({'for':'home.question.show','id':item.id}) %}
+            {% set solved_class = item.solved ? 'column solved' : 'column' %}
+            <div class="article-card question-card">
+                <div class="info">
+                    <div class="title layui-elip">
+                        <a href="{{ question_url }}" target="_blank">{{ item.title }}</a>
+                    </div>
+                    <div class="summary">{{ item.summary }}</div>
+                    <div class="meta">
+                        {% if item.last_replier.id is defined %}
+                            {% set last_replier_url = url({'for':'home.user.show','id':item.last_replier.id}) %}
+                            <span class="replier"><a href="{{ last_replier_url }}">{{ item.last_replier.name }}</a></span>
+                            <span class="time">{{ item.last_reply_time|time_ago }}</span>
+                            <span class="view">{{ item.view_count }} 浏览</span>
+                            <span class="like">{{ item.like_count }} 点赞</span>
+                            <span class="answer">{{ item.answer_count }} 回答</span>
+                        {% else %}
+                            {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+                            <span class="owner"><a href="{{ owner_url }}">{{ item.owner.name }}</a></span>
+                            <span class="time">{{ item.create_time|time_ago }}</span>
+                            <span class="view">{{ item.view_count }} 浏览</span>
+                            <span class="like">{{ item.like_count }} 点赞</span>
+                            <span class="answer">{{ item.answer_count }} 回答</span>
+                        {% endif %}
+                    </div>
+                </div>
+                {% if item.cover %}
+                    <div class="cover">
+                        <a href="{{ question_url }}" target="_blank">
+                            <img src="{{ item.cover }}!cover_270" alt="{{ item.title }}">
+                        </a>
+                    </div>
+                {% endif %}
+            </div>
+        {% endfor %}
+    </div>
+    {{ partial('partials/pager_ajax') }}
+{% endif %}
diff --git a/app/Http/Home/Views/question/related.volt b/app/Http/Home/Views/question/related.volt
new file mode 100644
index 00000000..dedd7b87
--- /dev/null
+++ b/app/Http/Home/Views/question/related.volt
@@ -0,0 +1,20 @@
+{% if questions %}
+    <div class="layui-card">
+        <div class="layui-card-header">相关问题</div>
+        <div class="layui-card-body">
+            <div class="sidebar-article-list">
+                {% for question in questions %}
+                    {% set question_url = url({'for':'home.question.show','id':question.id}) %}
+                    <div class="title">
+                        <a href="{{ question_url }}" target="_blank">{{ question.title }}</a>
+                    </div>
+                    <div class="meta">
+                        <span class="view">{{ question.view_count }} 浏览</span>
+                        <span class="like">{{ question.like_count }} 点赞</span>
+                        <span class="answer">{{ question.answer_count }} 回答</span>
+                    </div>
+                {% endfor %}
+            </div>
+        </div>
+    </div>
+{% endif %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/question/show.volt b/app/Http/Home/Views/question/show.volt
new file mode 100644
index 00000000..da806f6a
--- /dev/null
+++ b/app/Http/Home/Views/question/show.volt
@@ -0,0 +1,130 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/question') }}
+
+    {% set question_list_url = url({'for':'home.question.list'}) %}
+    {% set question_report_url = url({'for':'home.question.report','id':question.id}) %}
+    {% set question_edit_url = url({'for':'home.question.edit','id':question.id}) %}
+    {% set question_delete_url = url({'for':'home.question.delete','id':question.id}) %}
+    {% set question_owner_url = url({'for':'home.user.show','id':question.owner.id}) %}
+    {% set question_related_url = url({'for':'home.question.related','id':question.id}) %}
+    {% set answer_add_url = url({'for':'home.answer.add'},{'question_id':question.id}) %}
+    {% set answer_list_url = url({'for':'home.question.answers','id':question.id}) %}
+
+    <div class="breadcrumb">
+        <span class="layui-breadcrumb">
+            <a href="/">首页</a>
+            <a href="{{ question_list_url }}">问答</a>
+            <a><cite>详情</cite></a>
+        </span>
+        <span class="share">
+            <a href="javascript:" title="分享到微信"><i class="layui-icon layui-icon-login-wechat icon-wechat"></i></a>
+            <a href="javascript:" title="分享到QQ空间"><i class="layui-icon layui-icon-login-qq icon-qq"></i></a>
+            <a href="javascript:" title="分享到微博"><i class="layui-icon layui-icon-login-weibo icon-weibo"></i></a>
+        </span>
+    </div>
+
+    <div class="layout-main clearfix">
+        <div class="layout-sticky">
+            {{ partial('question/sticky') }}
+        </div>
+        <div class="layout-content">
+            <div class="article-info wrap">
+                <div class="title">{{ question.title }}</div>
+                <div class="meta">
+                    <div class="left">
+                        <span class="owner"><a href="{{ question_owner_url }}">{{ question.owner.name }}</a></span>
+                        <span class="time">{{ question.create_time|time_ago }}</span>
+                        <span class="view">{{ question.view_count }} 阅读</span>
+                        <span class="answer">{{ question.answer_count }} 回答</span>
+                    </div>
+                    <div class="right">
+                        <span class="question-report" data-url="{{ question_report_url }}">举报</span>
+                        {% if auth_user.id == question.owner.id %}
+                            <span class="question-edit" data-url="{{ question_edit_url }}">编辑</span>
+                            <span class="question-delete" data-url="{{ question_delete_url }}">删除</span>
+                        {% endif %}
+                    </div>
+                </div>
+                <div class="content markdown-body">{{ question.content }}</div>
+                {% if question.tags %}
+                    <div class="tags">
+                        {% for item in question.tags %}
+                            {% set url = url({'for':'home.question.list'},{'tag_id':item.id}) %}
+                            <a href="{{ url }}" class="layui-btn layui-btn-xs">{{ item.name }}</a>
+                        {% endfor %}
+                    </div>
+                {% endif %}
+            </div>
+            <div id="answer-anchor"></div>
+            <div class="answer-wrap wrap center">
+                {% if question.me.answered == 0 %}
+                    <button class="layui-btn layui-btn-fluid btn-answer" data-url="{{ answer_add_url }}">回答问题</button>
+                {% endif %}
+            </div>
+            {% if question.answer_count > 0 %}
+                <div class="answer-wrap wrap">
+                    <div class="layui-tab layui-tab-brief search-tab">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this" data-url="{{ answer_list_url }}?sort=popular">热门回答</li>
+                            <li data-url="{{ answer_list_url }}?sort=latest">最新回答</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div id="answer-list" data-url="{{ answer_list_url }}?sort=popular"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+        <div class="layout-sidebar">
+            <div class="sidebar">
+                <div class="layui-card">
+                    <div class="layui-card-header">关于作者</div>
+                    <div class="layui-card-body">
+                        <div class="sidebar-user-card clearfix">
+                            <div class="avatar">
+                                <img src="{{ question.owner.avatar }}!avatar_160" alt="{{ question.owner.name }}">
+                            </div>
+                            <div class="info">
+                                <div class="name layui-elip">
+                                    <a href="{{ question_owner_url }}" title="{{ question.owner.about }}">{{ question.owner.name }}</a>
+                                </div>
+                                <div class="title layui-elip">{{ question.owner.title|default('初出江湖') }}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="sidebar" id="sidebar-related" data-url="{{ question_related_url }}"></div>
+        </div>
+    </div>
+
+    {% set share_url = full_url({'for':'home.share'},{'id':question.id,'type':'question','referer':auth_user.id}) %}
+    {% set qrcode_url = url({'for':'home.qrcode'},{'text':share_url}) %}
+
+    <div class="layui-hide">
+        <input type="hidden" name="share.title" value="{{ question.title }}">
+        <input type="hidden" name="share.pic" value="">
+        <input type="hidden" name="share.url" value="{{ share_url }}">
+        <input type="hidden" name="share.qrcode" value="{{ qrcode_url }}">
+    </div>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('home/css/markdown.css') }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('home/js/question.show.js') }}
+    {{ js_include('home/js/question.share.js') }}
+    {{ js_include('home/js/answer.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/question/sticky.volt b/app/Http/Home/Views/question/sticky.volt
new file mode 100644
index 00000000..a9487e89
--- /dev/null
+++ b/app/Http/Home/Views/question/sticky.volt
@@ -0,0 +1,27 @@
+{% set favorite_url = url({'for':'home.question.favorite','id':question.id}) %}
+{% set like_url = url({'for':'home.question.like','id':question.id}) %}
+{% set favorite_title = question.me.favorited == 1 ? '取消收藏' : '收藏问题' %}
+{% set like_title = question.me.liked == 1 ? '取消点赞' : '点赞支持' %}
+{% set favorite_class = question.me.favorited == 1 ? 'layui-icon-star-fill' : 'layui-icon-star' %}
+{% set like_class = question.me.liked == 1 ? 'active' : '' %}
+
+<div class="toolbar-sticky">
+    <div class="item" id="toolbar-like">
+        <div class="icon" title="{{ like_title }}" data-url="{{ like_url }}">
+            <i class="layui-icon layui-icon-praise icon-praise {{ like_class }}"></i>
+        </div>
+        <div class="text" data-count="{{ question.like_count }}">{{ question.like_count }}</div>
+    </div>
+    <div class="item" id="toolbar-answer">
+        <div class="icon" title="回答问题">
+            <i class="layui-icon layui-icon-reply-fill icon-reply"></i>
+        </div>
+        <div class="text" data-count="{{ question.answer_count }}">{{ question.answer_count }}</div>
+    </div>
+    <div class="item" id="toolbar-favorite">
+        <div class="icon" title="{{ favorite_title }}" data-url="{{ favorite_url }}">
+            <i class="layui-icon icon-star {{ favorite_class }}"></i>
+        </div>
+        <div class="text" data-count="{{ question.favorite_count }}">{{ question.favorite_count }}</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Http/Home/Views/question/top_answerers.volt b/app/Http/Home/Views/question/top_answerers.volt
new file mode 100644
index 00000000..bfb765c4
--- /dev/null
+++ b/app/Http/Home/Views/question/top_answerers.volt
@@ -0,0 +1,27 @@
+{% if questions|length > 0 %}
+    <div class="layui-card">
+        <div class="layui-card-header">热门问题</div>
+        <div class="layui-card-body">
+            {% for item in questions %}
+                {% set url = url({'for':'home.question.show','id':item.id}) %}
+                {% set rank = loop.index %}
+                <div class="sidebar-rank-card">
+                    <div class="rank">
+                        {% if rank == 1 %}
+                            <span class="layui-badge layui-bg-red">{{ rank }}</span>
+                        {% elseif rank == 2 %}
+                            <span class="layui-badge layui-bg-blue">{{ rank }}</span>
+                        {% elseif rank == 3 %}
+                            <span class="layui-badge layui-bg-green">{{ rank }}</span>
+                        {% else %}
+                            <span class="layui-badge layui-bg-gray">{{ rank }}</span>
+                        {% endif %}
+                    </div>
+                    <div class="title">
+                        <a href="{{ url }}">{{ item.title }}</a>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+{% endif %}
diff --git a/app/Http/Home/Views/search/article.volt b/app/Http/Home/Views/search/article.volt
index a363d625..7c22ca7c 100644
--- a/app/Http/Home/Views/search/article.volt
+++ b/app/Http/Home/Views/search/article.volt
@@ -1,14 +1,9 @@
 {% if pager.total_pages > 0 %}
-    <div class="search-course-list">
+    <div class="search-article-list">
         {% for item in pager.items %}
             {% set article_url = url({'for':'home.article.show','id':item.id}) %}
             {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
-            <div class="search-course-card clearfix">
-                <div class="cover">
-                    <a href="{{ article_url }}" target="_blank">
-                        <img src="{{ item.cover }}!cover_270" alt="{{ item.title }}">
-                    </a>
-                </div>
+            <div class="search-article-card article-card">
                 <div class="info">
                     <div class="title layui-elip">
                         <a href="{{ article_url }}" target="_blank">{{ item.title }}</a>
@@ -21,6 +16,13 @@
                         <span>评论：{{ item.comment_count }}</span>
                     </div>
                 </div>
+                {% if item.cover %}
+                    <div class="cover">
+                        <a href="{{ article_url }}" target="_blank">
+                            <img src="{{ item.cover }}!cover_270" alt="{{ item.title }}">
+                        </a>
+                    </div>
+                {% endif %}
             </div>
         {% endfor %}
     </div>
diff --git a/app/Http/Home/Views/search/course.volt b/app/Http/Home/Views/search/course.volt
index 963f7983..17f87c80 100644
--- a/app/Http/Home/Views/search/course.volt
+++ b/app/Http/Home/Views/search/course.volt
@@ -3,7 +3,7 @@
         {% for item in pager.items %}
             {% set course_url = url({'for':'home.course.show','id':item.id}) %}
             {% set teacher_url = url({'for':'home.teacher.show','id':item.teacher.id}) %}
-            <div class="search-course-card clearfix">
+            <div class="search-course-card">
                 <div class="cover">
                     <a href="{{ course_url }}" target="_blank">
                         <img src="{{ item.cover }}!cover_270" alt="{{ item.title }}">
diff --git a/app/Http/Home/Views/search/group.volt b/app/Http/Home/Views/search/group.volt
index f67fc1fd..46b76de6 100644
--- a/app/Http/Home/Views/search/group.volt
+++ b/app/Http/Home/Views/search/group.volt
@@ -3,18 +3,18 @@
         {% for item in pager.items %}
             {% set group_url = url({'for':'home.im_group.show','id':item.id}) %}
             {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
-            {% set item.about = item.about ? item.about : '这个家伙真懒，什么也没有留下！' %}
-            <div class="search-group-card clearfix">
+            {% set item.about = item.about|default('这个家伙真懒，什么也没有留下！') %}
+            <div class="search-group-card">
                 <div class="avatar">
                     <a href="{{ group_url }}" target="_blank">
                         <img src="{{ item.avatar }}!avatar_160" alt="{{ item.name }}">
                     </a>
                 </div>
                 <div class="info">
-                    <div class="name layui-elip">
+                    <div class="name">
                         <a href="{{ group_url }}" target="_blank">{{ item.name }}</a>
                     </div>
-                    <div class="about layui-elip">{{ item.about }}</div>
+                    <div class="about">{{ item.about }}</div>
                     <div class="meta">
                         <span>组长：<a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a></span>
                         <span>成员：{{ item.user_count }}</span>
diff --git a/app/Http/Home/Views/search/index.volt b/app/Http/Home/Views/search/index.volt
index 1487c7b5..c7d08a3a 100644
--- a/app/Http/Home/Views/search/index.volt
+++ b/app/Http/Home/Views/search/index.volt
@@ -4,7 +4,7 @@
 
     {{ partial('macros/course') }}
 
-    {% set types = {'course':'课程','article':'专栏','group':'群组','user':'用户'} %}
+    {% set types = {'course':'课程','article':'专栏','question':'问答','group':'群组','user':'用户'} %}
     {% set type = request.get('type','trim','course') %}
     {% set query = request.get('query','striptags','') %}
 
@@ -35,6 +35,10 @@
                             <div class="layui-tab-item layui-show">
                                 {{ partial('search/article') }}
                             </div>
+                        {% elseif type == 'question' %}
+                            <div class="layui-tab-item layui-show">
+                                {{ partial('search/question') }}
+                            </div>
                         {% elseif type == 'group' %}
                             <div class="layui-tab-item layui-show">
                                 {{ partial('search/group') }}
diff --git a/app/Http/Home/Views/search/question.volt b/app/Http/Home/Views/search/question.volt
new file mode 100644
index 00000000..6f28739e
--- /dev/null
+++ b/app/Http/Home/Views/search/question.volt
@@ -0,0 +1,32 @@
+{% if pager.total_pages > 0 %}
+    <div class="search-question-list">
+        {% for item in pager.items %}
+            {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+            {% set question_url = url({'for':'home.question.show','id':item.id}) %}
+            {% set solved_class = item.solved ? 'column solved' : 'column' %}
+            <div class="search-question-card article-card question-card">
+                <div class="info">
+                    <div class="title layui-elip">
+                        <a href="{{ question_url }}" target="_blank">{{ item.title }}</a>
+                    </div>
+                    <div class="summary">{{ item.summary }}</div>
+                    <div class="meta">
+                        <span class="owner">提问：<a href="{{ owner_url }}">{{ item.owner.name }}</a></span>
+                        <span class="view">浏览：{{ item.view_count }}</span>
+                        <span class="like">点赞：{{ item.like_count }}</span>
+                        <span class="answer">回答：{{ item.answer_count }}</span>
+                    </div>
+                </div>
+                {% if item.cover %}
+                    <div class="cover">
+                        <a href="{{ question_url }}" target="_blank">
+                            <img src="{{ item.cover }}!cover_270" alt="{{ item.title }}">
+                        </a>
+                    </div>
+                {% endif %}
+            </div>
+        {% endfor %}
+    </div>
+{% else %}
+    {{ partial('search/empty') }}
+{% endif %}
diff --git a/app/Http/Home/Views/search/user.volt b/app/Http/Home/Views/search/user.volt
index 3f93b57a..eb635218 100644
--- a/app/Http/Home/Views/search/user.volt
+++ b/app/Http/Home/Views/search/user.volt
@@ -4,18 +4,18 @@
     <div class="search-user-list">
         {% for item in pager.items %}
             {% set user_url = url({'for':'home.user.show','id':item.id}) %}
-            {% set item.about = item.about ? item.about : '这个家伙真懒，什么也没有留下！' %}
-            <div class="search-group-card clearfix">
+            {% set item.about = item.about|default('这个家伙真懒，什么也没有留下！') %}
+            <div class="search-group-card">
                 <div class="avatar">
                     <a href="{{ user_url }}" target="_blank">
                         <img src="{{ item.avatar }}!avatar_160" alt="{{ item.name }}">
                     </a>
                 </div>
                 <div class="info">
-                    <div class="name layui-elip">
+                    <div class="name">
                         <a href="{{ user_url }}" target="_blank">{{ item.name }}</a>
                     </div>
-                    <div class="about layui-elip">{{ item.about }}</div>
+                    <div class="about">{{ item.about }}</div>
                     <div class="meta">
                         <span>性别：{{ gender_info(item.gender) }}</span>
                         <span>地区：{{ item.area }}</span>
diff --git a/app/Http/Home/Views/tag/list.volt b/app/Http/Home/Views/tag/list.volt
new file mode 100644
index 00000000..95dfcb33
--- /dev/null
+++ b/app/Http/Home/Views/tag/list.volt
@@ -0,0 +1,33 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {% set list_pager_url = url({'for':'home.tag.list_pager'}) %}
+    {% set my_pager_url = url({'for':'home.tag.my_pager'}) %}
+
+    <div class="tab-wrap">
+        <div class="layui-tab layui-tab-brief user-tab" lay-filter="tag">
+            <ul class="layui-tab-title">
+                <li class="layui-this">所有标签</li>
+                <li>我的关注</li>
+            </ul>
+            <div class="layui-tab-content">
+                <div class="layui-tab-item layui-show">
+                    <div id="all-tag-list" data-url="{{ list_pager_url }}"></div>
+                </div>
+                <div class="layui-tab-item">
+                    {% if auth_user.id > 0 %}
+                        <div id="my-tag-list" data-url="{{ my_pager_url }}"></div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('home/js/tag.list.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/tag/list_pager.volt b/app/Http/Home/Views/tag/list_pager.volt
new file mode 100644
index 00000000..3d5c5dfe
--- /dev/null
+++ b/app/Http/Home/Views/tag/list_pager.volt
@@ -0,0 +1,23 @@
+{% if pager.total_pages > 0 %}
+    <div class="tag-list clearfix">
+        <div class="layui-row layui-col-space20">
+            {% for item in pager.items %}
+                {% set follow_url = url({'for':'home.tag.follow','id':item.id}) %}
+                {% set follow_class = item.me.followed == 1 ? 'layui-btn layui-btn-sm followed btn-follow' : 'layui-btn layui-btn-primary layui-btn-sm btn-follow' %}
+                {% set follow_text = item.me.followed == 1 ? '已关注' : '关注' %}
+                <div class="layui-col-md3">
+                    <div class="tag-card">
+                        <div class="icon">
+                            <img src="{{ item.icon }}" alt="{{ item.name }}">
+                        </div>
+                        <div class="name">{{ item.name }}<span class="stats">（{{ item.follow_count }} 关注 ）</span></div>
+                        <div class="action">
+                            <span class="{{ follow_class }}" data-url="{{ follow_url }}">{{ follow_text }}</span>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+    {{ partial('partials/pager_ajax') }}
+{% endif %}
diff --git a/app/Http/Home/Views/tag/my_pager.volt b/app/Http/Home/Views/tag/my_pager.volt
new file mode 100644
index 00000000..4dae1e45
--- /dev/null
+++ b/app/Http/Home/Views/tag/my_pager.volt
@@ -0,0 +1,21 @@
+{% if pager.total_pages > 0 %}
+    <div class="tag-list clearfix">
+        <div class="layui-row layui-col-space20">
+            {% for item in pager.items %}
+                {% set follow_url = url({'for':'home.tag.follow','id':item.id}) %}
+                <div class="layui-col-md3">
+                    <div class="tag-card">
+                        <div class="icon">
+                            <img src="{{ item.icon }}" alt="{{ item.name }}">
+                        </div>
+                        <div class="name">{{ item.name }}<span class="stats">（{{ item.follow_count }} 关注 ）</span></div>
+                        <div class="action">
+                            <span class="layui-btn layui-btn-sm followed btn-follow" data-url="{{ follow_url }}">已关注</span>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+    {{ partial('partials/pager_ajax') }}
+{% endif %}
diff --git a/app/Http/Home/Views/user/console/answers.volt b/app/Http/Home/Views/user/console/answers.volt
new file mode 100644
index 00000000..8674dcb7
--- /dev/null
+++ b/app/Http/Home/Views/user/console/answers.volt
@@ -0,0 +1,65 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/answer') }}
+
+    {% set published_types = {'0':'全部','1':'审核中','2':'已发布','3':'未通过'} %}
+    {% set published = request.get('published','trim','0') %}
+
+    <div class="layout-main clearfix">
+        <div class="my-sidebar">{{ partial('user/console/menu') }}</div>
+        <div class="my-content">
+            <div class="wrap">
+                <div class="my-nav">
+                    <span class="title">我的回答</span>
+                    {% for key,value in published_types %}
+                        {% set class = (published == key) ? 'layui-btn layui-btn-xs' : 'none' %}
+                        {% set url = (key == '0') ? url({'for':'home.uc.answers'}) : url({'for':'home.uc.answers'},{'published':key}) %}
+                        <a class="{{ class }}" href="{{ url }}">{{ value }}</a>
+                    {% endfor %}
+                </div>
+                {% if pager.total_pages > 0 %}
+                    <table class="layui-table review-table">
+                        <colgroup>
+                            <col>
+                            <col>
+                            <col width="15%">
+                        </colgroup>
+                        <thead>
+                        <tr>
+                            <th>内容</th>
+                            <th>点赞</th>
+                            <th>操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for item in pager.items %}
+                            {% set question_url = url({'for':'home.question.show','id':item.question.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>回答：{{ substr(item.summary,0,32) }}</p>
+                                    <p class="meta">
+                                        创建：<span class="layui-badge layui-bg-gray">{{ item.create_time|time_ago }}</span>
+                                        状态：<span class="layui-badge layui-bg-gray">{{ publish_status(item.published) }}</span>
+                                    </p>
+                                </td>
+                                <td>{{ item.like_count }}</td>
+                                <td>
+                                    <a href="{{ edit_url }}" class="layui-btn layui-btn-xs">修改</a>
+                                    <a href="javascript:" class="layui-btn layui-btn-xs layui-bg-red kg-delete" data-url="{{ delete_url }}">删除</a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    {{ partial('partials/pager') }}
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/user/console/favorites.volt b/app/Http/Home/Views/user/console/favorites.volt
index d254df80..46adf29e 100644
--- a/app/Http/Home/Views/user/console/favorites.volt
+++ b/app/Http/Home/Views/user/console/favorites.volt
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    {% set types = {'course':'课程','article':'文章'} %}
+    {% set types = {'course':'课程','article':'文章','question':'问题'} %}
     {% set type = request.get('type','trim','course') %}
 
     <div class="layout-main clearfix">
@@ -21,6 +21,8 @@
                     {{ partial('user/console/favorites_course') }}
                 {% elseif type == 'article' %}
                     {{ partial('user/console/favorites_article') }}
+                {% elseif type == 'question' %}
+                    {{ partial('user/console/favorites_question') }}
                 {% endif %}
             </div>
         </div>
diff --git a/app/Http/Home/Views/user/console/favorites_article.volt b/app/Http/Home/Views/user/console/favorites_article.volt
index 5d25afb4..fc907330 100644
--- a/app/Http/Home/Views/user/console/favorites_article.volt
+++ b/app/Http/Home/Views/user/console/favorites_article.volt
@@ -26,7 +26,7 @@
                 <td>{{ item.like_count }}</td>
                 <td>{{ item.comment_count }}</td>
                 <td class="center">
-                    <button class="layui-btn layui-btn-sm kg-delete" data-tips="确定要取消收藏吗？" data-url="{{ favorite_url }}">取消</button>
+                    <button class="layui-btn layui-btn-sm layui-bg-red kg-delete" data-tips="确定要取消收藏吗？" data-url="{{ favorite_url }}">取消</button>
                 </td>
             </tr>
         {% endfor %}
diff --git a/app/Http/Home/Views/user/console/favorites_course.volt b/app/Http/Home/Views/user/console/favorites_course.volt
index c759ab84..d2891471 100644
--- a/app/Http/Home/Views/user/console/favorites_course.volt
+++ b/app/Http/Home/Views/user/console/favorites_course.volt
@@ -23,7 +23,7 @@
                 <td>{{ item.user_count }}</td>
                 <td>{{ "%0.1f"|format(item.rating) }}</td>
                 <td class="center">
-                    <button class="layui-btn layui-btn-sm kg-delete" data-tips="确定要取消收藏吗？" data-url="{{ favorite_url }}">取消</button>
+                    <button class="layui-btn layui-btn-sm layui-bg-red kg-delete" data-tips="确定要取消收藏吗？" data-url="{{ favorite_url }}">取消</button>
                 </td>
             </tr>
         {% endfor %}
diff --git a/app/Http/Home/Views/user/console/favorites_question.volt b/app/Http/Home/Views/user/console/favorites_question.volt
new file mode 100644
index 00000000..baa04fab
--- /dev/null
+++ b/app/Http/Home/Views/user/console/favorites_question.volt
@@ -0,0 +1,36 @@
+{% if pager.total_pages > 0 %}
+    <table class="layui-table" lay-size="lg">
+        <colgroup>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col width="12%">
+        </colgroup>
+        <thead>
+        <tr>
+            <th>问题</th>
+            <th>浏览</th>
+            <th>点赞</th>
+            <th>回答</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            {% set question_url = url({'for':'home.question.show','id':item.id}) %}
+            {% set favorite_url = url({'for':'home.question.favorite','id':item.id}) %}
+            <tr>
+                <td><a href="{{ question_url }}" target="_blank">{{ item.title }}</a></td>
+                <td>{{ item.view_count }}</td>
+                <td>{{ item.like_count }}</td>
+                <td>{{ item.answer_count }}</td>
+                <td class="center">
+                    <button class="layui-btn layui-btn-sm layui-bg-red kg-delete" data-tips="确定要取消收藏吗？" data-url="{{ favorite_url }}">取消</button>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+    {{ partial('partials/pager') }}
+{% endif %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/user/console/menu.volt b/app/Http/Home/Views/user/console/menu.volt
index 9036aac3..49ed9040 100644
--- a/app/Http/Home/Views/user/console/menu.volt
+++ b/app/Http/Home/Views/user/console/menu.volt
@@ -18,18 +18,28 @@
 </div>
 
 <div class="layui-card">
-    <div class="layui-card-header">内容中心</div>
+    <div class="layui-card-header">课程中心</div>
     <div class="layui-card-body">
         <ul class="my-menu">
             <li><a href="{{ url({'for':'home.uc.courses'}) }}">我的课程</a></li>
-            <li><a href="{{ url({'for':'home.uc.articles'}) }}">我的文章</a></li>
-            <li><a href="{{ url({'for':'home.uc.favorites'}) }}">我的收藏</a></li>
             <li><a href="{{ url({'for':'home.uc.reviews'}) }}">我的评价</a></li>
             <li><a href="{{ url({'for':'home.uc.consults'}) }}">我的咨询</a></li>
         </ul>
     </div>
 </div>
 
+<div class="layui-card">
+    <div class="layui-card-header">创作中心</div>
+    <div class="layui-card-body">
+        <ul class="my-menu">
+            <li><a href="{{ url({'for':'home.uc.articles'}) }}">我的文章</a></li>
+            <li><a href="{{ url({'for':'home.uc.questions'}) }}">我的提问</a></li>
+            <li><a href="{{ url({'for':'home.uc.answers'}) }}">我的回答</a></li>
+            <li><a href="{{ url({'for':'home.uc.favorites'}) }}">我的收藏</a></li>
+        </ul>
+    </div>
+</div>
+
 <div class="layui-card">
     <div class="layui-card-header">订单中心</div>
     <div class="layui-card-body">
diff --git a/app/Http/Home/Views/user/console/questions.volt b/app/Http/Home/Views/user/console/questions.volt
new file mode 100644
index 00000000..f020e257
--- /dev/null
+++ b/app/Http/Home/Views/user/console/questions.volt
@@ -0,0 +1,73 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/question') }}
+
+    {% set published_types = {'0':'全部','1':'审核中','2':'已发布','3':'未通过'} %}
+    {% set published = request.get('published','trim','0') %}
+
+    <div class="layout-main clearfix">
+        <div class="my-sidebar">{{ partial('user/console/menu') }}</div>
+        <div class="my-content">
+            <div class="wrap">
+                <div class="my-nav">
+                    <span class="title">我的提问</span>
+                    {% for key,value in published_types %}
+                        {% set class = (published == key) ? 'layui-btn layui-btn-xs' : 'none' %}
+                        {% set url = (key == '0') ? url({'for':'home.uc.questions'}) : url({'for':'home.uc.questions'},{'published':key}) %}
+                        <a class="{{ class }}" href="{{ url }}">{{ value }}</a>
+                    {% endfor %}
+                </div>
+                {% if pager.total_pages > 0 %}
+                    <table class="layui-table">
+                        <colgroup>
+                            <col>
+                            <col>
+                            <col>
+                            <col>
+                            <col>
+                            <col>
+                        </colgroup>
+                        <thead>
+                        <tr>
+                            <th>问题</th>
+                            <th>回答</th>
+                            <th>浏览</th>
+                            <th>点赞</th>
+                            <th>收藏</th>
+                            <th>操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for item in pager.items %}
+                            {% set show_url = url({'for':'home.question.show','id':item.id}) %}
+                            {% set edit_url = url({'for':'home.question.edit','id':item.id}) %}
+                            {% set delete_url = url({'for':'home.question.delete','id':item.id}) %}
+                            <tr>
+                                <td>
+                                    <p>标题：<a href="{{ show_url }}" target="_blank">{{ item.title }}</a></p>
+                                    <p class="meta">
+                                        创建：<span class="layui-badge layui-bg-gray">{{ item.create_time|time_ago }}</span>
+                                        状态：<span class="layui-badge layui-bg-gray">{{ publish_status(item.published) }}</span>
+                                    </p>
+                                </td>
+                                <td>{{ item.answer_count }}</td>
+                                <td>{{ item.view_count }}</td>
+                                <td>{{ item.like_count }}</td>
+                                <td>{{ item.favorite_count }}</td>
+                                <td class="center">
+                                    <a href="{{ edit_url }}" class="layui-btn layui-btn-xs">编辑</a>
+                                    <a href="javascript:" class="layui-btn layui-btn-xs layui-bg-red kg-delete" data-url="{{ delete_url }}">删除</a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    {{ partial('partials/pager') }}
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/widget/my_tags.volt b/app/Http/Home/Views/widget/my_tags.volt
new file mode 100644
index 00000000..9720544e
--- /dev/null
+++ b/app/Http/Home/Views/widget/my_tags.volt
@@ -0,0 +1,20 @@
+{% set type = request.get('type','string','article') %}
+
+{% if type == 'article' %}
+    {% set base_url = url({'for':'home.article.list'}) %}
+{% elseif type == 'question' %}
+    {% set base_url = url({'for':'home.question.list'}) %}
+{% endif %}
+
+<div class="layui-card widget-card">
+    <div class="more">
+        <a href="{{ url({'for':'home.tag.list'}) }}">管理</a>
+    </div>
+    <div class="layui-card-header">关注标签</div>
+    <div class="layui-card-body">
+        {% for item in tags %}
+            {% set tagged_url = base_url ~ '?tag_id=' ~ item.id %}
+            <a class="layui-badge-rim tag-badge" href="{{ tagged_url }}">{{ item.name }}</a>
+        {% endfor %}
+    </div>
+</div>
diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php
index e20d18d7..757a4408 100644
--- a/app/Library/AppInfo.php
+++ b/app/Library/AppInfo.php
@@ -11,7 +11,7 @@ class AppInfo
 
     protected $link = 'https://koogua.com';
 
-    protected $version = '1.3.3';
+    protected $version = '1.3.4';
 
     public function __get($name)
     {
diff --git a/app/Library/Helper.php b/app/Library/Helper.php
index 0626c662..79eabbdd 100644
--- a/app/Library/Helper.php
+++ b/app/Library/Helper.php
@@ -203,16 +203,6 @@ function kg_default_group_avatar_path()
     return '/img/default/group_avatar.png';
 }
 
-/**
- * 获取默认文章封面路径
- *
- * @return string
- */
-function kg_default_article_cover_path()
-{
-    return '/img/default/article_cover.png';
-}
-
 /**
  * 获取默认课程封面路径
  *
@@ -263,6 +253,16 @@ function kg_default_slide_cover_path()
     return '/img/default/course_cover.png';
 }
 
+/**
+ * 获取默认图标路径
+ *
+ * @return string
+ */
+function kg_default_icon_path()
+{
+    return '/img/default/user_avatar.png';
+}
+
 /**
  * 获取存储基准URL
  *
@@ -323,20 +323,6 @@ function kg_cos_group_avatar_url($path, $style = null)
     return kg_cos_img_url($path, $style);
 }
 
-/**
- * 获取文章封面URL
- *
- * @param string $path
- * @param string $style
- * @return string
- */
-function kg_cos_article_cover_url($path, $style = null)
-{
-    $path = $path ?: kg_default_article_cover_path();
-
-    return kg_cos_img_url($path, $style);
-}
-
 /**
  * 获取课程封面URL
  *
@@ -405,6 +391,20 @@ function kg_cos_slide_cover_url($path, $style = null)
     return kg_cos_img_url($path, $style);
 }
 
+/**
+ * 获取图标URL
+ *
+ * @param string $path
+ * @param string $style
+ * @return string
+ */
+function kg_cos_icon_url($path, $style = null)
+{
+    $path = $path ?: kg_default_icon_path();
+
+    return kg_cos_img_url($path, $style);
+}
+
 /**
  * 清除存储图片处理样式
  *
@@ -452,6 +452,26 @@ function kg_parse_summary($content, $length = 100)
     return kg_substr($content, 0, $length);
 }
 
+/**
+ * 解析内容中上传首图
+ *
+ * @param string $content
+ * @return string
+ */
+function kg_parse_first_content_image($content)
+{
+    $result = '';
+
+    $matched = preg_match('/\((.*?)\/img\/content\/(.*?)\)/', $content, $matches);
+
+    if ($matched) {
+        $url = sprintf('%s/img/content/%s', trim($matches[1]), trim($matches[2]));
+        $result = kg_cos_img_style_trim($url);
+    }
+
+    return $result;
+}
+
 /**
  * 隐藏部分字符
  *
diff --git a/app/Listeners/Answer.php b/app/Listeners/Answer.php
new file mode 100644
index 00000000..ba63326b
--- /dev/null
+++ b/app/Listeners/Answer.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\Answer as AnswerModel;
+use Phalcon\Events\Event as PhEvent;
+
+class Answer extends Listener
+{
+
+    public function afterCreate(PhEvent $event, $source, AnswerModel $answer)
+    {
+
+    }
+
+    public function afterUpdate(PhEvent $event, $source, AnswerModel $answer)
+    {
+
+    }
+
+    public function afterDelete(PhEvent $event, $source, AnswerModel $answer)
+    {
+
+    }
+
+    public function afterRestore(PhEvent $event, $source, AnswerModel $answer)
+    {
+
+    }
+
+    public function afterLike(PhEvent $event, $source, AnswerModel $answer)
+    {
+
+    }
+
+    public function afterUndoLike(PhEvent $event, $source, AnswerModel $answer)
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Listeners/Question.php b/app/Listeners/Question.php
new file mode 100644
index 00000000..7f12bf29
--- /dev/null
+++ b/app/Listeners/Question.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\Question as QuestionModel;
+use Phalcon\Events\Event as PhEvent;
+
+class Question extends Listener
+{
+
+    public function afterCreate(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterUpdate(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterDelete(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterRestore(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterApprove(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterReject(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterView(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterFavorite(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterUndoFavorite(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterLike(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+    public function afterUndoLike(PhEvent $event, $source, QuestionModel $question)
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Listeners/UserDailyCounter.php b/app/Listeners/UserDailyCounter.php
index 73659cae..ef29edb7 100644
--- a/app/Listeners/UserDailyCounter.php
+++ b/app/Listeners/UserDailyCounter.php
@@ -66,6 +66,16 @@ class UserDailyCounter extends Listener
         $this->counter->hIncrBy($user->id, 'article_like_count');
     }
 
+    public function incrQuestionLikeCount(PhEvent $event, $source, UserModel $user)
+    {
+        $this->counter->hIncrBy($user->id, 'question_like_count');
+    }
+
+    public function incrAnswerLikeCount(PhEvent $event, $source, UserModel $user)
+    {
+        $this->counter->hIncrBy($user->id, 'answer_like_count');
+    }
+
     public function incrCommentLikeCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'comment_like_count');
diff --git a/app/Models/Answer.php b/app/Models/Answer.php
new file mode 100644
index 00000000..e2fa9a30
--- /dev/null
+++ b/app/Models/Answer.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace App\Models;
+
+use App\Caches\MaxAnswerId as MaxAnswerIdCache;
+use Phalcon\Mvc\Model\Behavior\SoftDelete;
+
+class Answer extends Model
+{
+
+    /**
+     * 发布状态
+     */
+    const PUBLISH_PENDING = 1; // 审核中
+    const PUBLISH_APPROVED = 2; // 已发布
+    const PUBLISH_REJECTED = 3; // 未通过
+
+    /**
+     * 自增编号
+     *
+     * @var integer
+     */
+    public $id = 0;
+
+    /**
+     * 用户编号
+     *
+     * @var integer
+     */
+    public $owner_id = 0;
+
+    /**
+     * 问题编号
+     *
+     * @var integer
+     */
+    public $question_id = 0;
+
+    /**
+     * 封面
+     *
+     * @var string
+     */
+    public $cover = '';
+
+    /**
+     * 概要
+     *
+     * @var string
+     */
+    public $summary = '';
+
+    /**
+     * 内容
+     *
+     * @var string
+     */
+    public $content = '';
+
+    /**
+     * 匿名标识
+     *
+     * @var integer
+     */
+    public $anonymous = 0;
+
+    /**
+     * 采纳标识
+     *
+     * @var integer
+     */
+    public $accepted = 0;
+
+    /**
+     * 状态标识
+     *
+     * @var integer
+     */
+    public $published = self::PUBLISH_PENDING;
+
+    /**
+     * 删除标识
+     *
+     * @var integer
+     */
+    public $deleted = 0;
+
+    /**
+     * 终端类型
+     *
+     * @var integer
+     */
+    public $client_type = 0;
+
+    /**
+     * 终端IP
+     *
+     * @var integer
+     */
+    public $client_ip = '';
+
+    /**
+     * 评论数
+     *
+     * @var integer
+     */
+    public $comment_count = 0;
+
+    /**
+     * 点赞数
+     *
+     * @var integer
+     */
+    public $like_count = 0;
+
+    /**
+     * 举报数
+     *
+     * @var integer
+     */
+    public $report_count = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var integer
+     */
+    public $create_time = 0;
+
+    /**
+     * 更新时间
+     *
+     * @var integer
+     */
+    public $update_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_answer';
+    }
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        $this->addBehavior(
+            new SoftDelete([
+                'field' => 'deleted',
+                'value' => 1,
+            ])
+        );
+    }
+
+    public function beforeCreate()
+    {
+        if (empty($this->cover)) {
+            $this->cover = kg_parse_first_content_image($this->content);
+        }
+
+        if (empty($this->summary)) {
+            $this->summary = kg_parse_summary($this->content);
+        }
+
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        if (empty($this->cover)) {
+            $this->cover = kg_parse_first_content_image($this->content);
+        }
+
+        if (empty($this->summary)) {
+            $this->summary = kg_parse_summary($this->content);
+        }
+
+        $this->update_time = time();
+    }
+
+    public function afterCreate()
+    {
+        $cache = new MaxAnswerIdCache();
+
+        $cache->rebuild();
+    }
+
+    public static function publishTypes()
+    {
+        return [
+            self::PUBLISH_PENDING => '审核中',
+            self::PUBLISH_APPROVED => '已发布',
+            self::PUBLISH_REJECTED => '未通过',
+        ];
+    }
+
+    public static function sortTypes()
+    {
+        return [
+            'latest' => '最新',
+            'popular' => '最热',
+        ];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/AnswerLike.php b/app/Models/AnswerLike.php
new file mode 100644
index 00000000..ace2399b
--- /dev/null
+++ b/app/Models/AnswerLike.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+class AnswerLike extends Model
+{
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id = 0;
+
+    /**
+     * 回答编号
+     *
+     * @var int
+     */
+    public $answer_id = 0;
+
+    /**
+     * 用户编号
+     *
+     * @var int
+     */
+    public $user_id = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_answer_like';
+    }
+
+    public function beforeCreate()
+    {
+        $this->create_time = time();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Article.php b/app/Models/Article.php
index 25ef2301..644696cf 100644
--- a/app/Models/Article.php
+++ b/app/Models/Article.php
@@ -4,8 +4,8 @@ namespace App\Models;
 
 use App\Caches\MaxArticleId as MaxArticleIdCache;
 use App\Services\Sync\ArticleIndex as ArticleIndexSync;
+use App\Services\Sync\ArticleScore as ArticleScoreSync;
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
-use Phalcon\Text;
 
 class Article extends Model
 {
@@ -108,6 +108,13 @@ class Article extends Model
      */
     public $client_ip = '';
 
+    /**
+     * 综合得分
+     *
+     * @var float
+     */
+    public $score = 0.00;
+
     /**
      * 私有标识
      *
@@ -137,11 +144,11 @@ class Article extends Model
     public $deleted = 0;
 
     /**
-     * 允许评论
+     * 关闭标识
      *
      * @var int
      */
-    public $allow_comment = 1;
+    public $closed = 0;
 
     /**
      * 文字数
@@ -164,6 +171,13 @@ class Article extends Model
      */
     public $comment_count = 0;
 
+    /**
+     * 收藏数
+     *
+     * @var int
+     */
+    public $favorite_count = 0;
+
     /**
      * 点赞数
      *
@@ -172,11 +186,11 @@ class Article extends Model
     public $like_count = 0;
 
     /**
-     * 收藏数
+     * 举报数
      *
-     * @var int
+     * @var integer
      */
-    public $favorite_count = 0;
+    public $report_count;
 
     /**
      * 创建时间
@@ -201,8 +215,6 @@ class Article extends Model
     {
         parent::initialize();
 
-        $this->keepSnapshots(true);
-
         $this->addBehavior(
             new SoftDelete([
                 'field' => 'deleted',
@@ -214,9 +226,7 @@ class Article extends Model
     public function beforeCreate()
     {
         if (empty($this->cover)) {
-            $this->cover = kg_default_article_cover_path();
-        } elseif (Text::startsWith($this->cover, 'http')) {
-            $this->cover = self::getCoverPath($this->cover);
+            $this->cover = kg_parse_first_content_image($this->content);
         }
 
         if (is_array($this->tags) || is_object($this->tags)) {
@@ -231,10 +241,13 @@ class Article extends Model
         if (time() - $this->update_time > 3 * 3600) {
             $sync = new ArticleIndexSync();
             $sync->addItem($this->id);
+
+            $sync = new ArticleScoreSync();
+            $sync->addItem($this->id);
         }
 
-        if (Text::startsWith($this->cover, 'http')) {
-            $this->cover = self::getCoverPath($this->cover);
+        if (empty($this->cover)) {
+            $this->cover = kg_parse_first_content_image($this->content);
         }
 
         if (empty($this->summary)) {
@@ -257,24 +270,11 @@ class Article extends Model
 
     public function afterFetch()
     {
-        if (!Text::startsWith($this->cover, 'http')) {
-            $this->cover = kg_cos_article_cover_url($this->cover);
-        }
-
         if (is_string($this->tags)) {
             $this->tags = json_decode($this->tags, true);
         }
     }
 
-    public static function getCoverPath($url)
-    {
-        if (Text::startsWith($url, 'http')) {
-            return parse_url($url, PHP_URL_PATH);
-        }
-
-        return $url;
-    }
-
     public static function sourceTypes()
     {
         return [
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 8336c8a9..38ef61ff 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -14,6 +14,7 @@ class Category extends Model
     const TYPE_COURSE = 1; // 课程
     const TYPE_HELP = 2; // 帮助
     const TYPE_ARTICLE = 3; // 文章
+    const TYPE_QUESTION = 4; // 问答
 
     /**
      * 主键编号
@@ -143,6 +144,7 @@ class Category extends Model
             self::TYPE_COURSE => '课程',
             self::TYPE_HELP => '帮助',
             self::TYPE_ARTICLE => '专栏',
+            self::TYPE_QUESTION => '问答',
         ];
     }
 
diff --git a/app/Models/Comment.php b/app/Models/Comment.php
index 34eb95a0..b7d06c30 100644
--- a/app/Models/Comment.php
+++ b/app/Models/Comment.php
@@ -114,6 +114,13 @@ class Comment extends Model
      */
     public $like_count = 0;
 
+    /**
+     * 举报数
+     *
+     * @var integer
+     */
+    public $report_count;
+
     /**
      * 创建时间
      *
diff --git a/app/Models/Consult.php b/app/Models/Consult.php
index 30888a24..ab200716 100644
--- a/app/Models/Consult.php
+++ b/app/Models/Consult.php
@@ -119,6 +119,13 @@ class Consult extends Model
      */
     public $like_count = 0;
 
+    /**
+     * 举报数
+     *
+     * @var integer
+     */
+    public $report_count;
+
     /**
      * 回复时间
      *
diff --git a/app/Models/Course.php b/app/Models/Course.php
index 8a775adb..8db6710a 100644
--- a/app/Models/Course.php
+++ b/app/Models/Course.php
@@ -287,8 +287,6 @@ class Course extends Model
     {
         parent::initialize();
 
-        $this->keepSnapshots(true);
-
         $this->addBehavior(
             new SoftDelete([
                 'field' => 'deleted',
diff --git a/app/Models/Nav.php b/app/Models/Nav.php
index 7819078b..2a36da27 100644
--- a/app/Models/Nav.php
+++ b/app/Models/Nav.php
@@ -80,7 +80,7 @@ class Nav extends Model
      *
      * @var int
      */
-    public $priority = 100;
+    public $priority = 99;
 
     /**
      * 发布标识
diff --git a/app/Models/PointHistory.php b/app/Models/PointHistory.php
index dbf817b5..e5df34c2 100644
--- a/app/Models/PointHistory.php
+++ b/app/Models/PointHistory.php
@@ -19,7 +19,11 @@ class PointHistory extends Model
     const EVENT_COMMENT_POST = 9; // 发布评论
     const EVENT_ARTICLE_POST = 10; // 发布文章
     const EVENT_QUESTION_POST = 11; // 发布问题
-    const EVENT_ANSWER_POST = 12; // 发布答案
+    const EVENT_ANSWER_POST = 12; // 发布回答
+    const EVENT_ANSWER_ACCEPTED = 13; // 回答被采纳
+    const EVENT_ANSWER_LIKED = 14; // 回答被点赞
+    const EVENT_ARTICLE_LIKED = 15; // 文章被点赞
+    const EVENT_QUESTION_LIKED = 16; // 提问被点赞
 
     /**
      * 主键编号
diff --git a/app/Models/Question.php b/app/Models/Question.php
new file mode 100644
index 00000000..0b9b2564
--- /dev/null
+++ b/app/Models/Question.php
@@ -0,0 +1,310 @@
+<?php
+
+namespace App\Models;
+
+use App\Caches\MaxQuestionId as MaxQuestionIdCache;
+use App\Services\Sync\QuestionIndex as QuestionIndexSync;
+use App\Services\Sync\QuestionScore as QuestionScoreSync;
+use Phalcon\Mvc\Model\Behavior\SoftDelete;
+
+class Question extends Model
+{
+
+    /**
+     * 发布状态
+     */
+    const PUBLISH_PENDING = 1; // 审核中
+    const PUBLISH_APPROVED = 2; // 已发布
+    const PUBLISH_REJECTED = 3; // 未通过
+
+    /**
+     * 自增编号
+     *
+     * @var integer
+     */
+    public $id = 0;
+
+    /**
+     * 分类编号
+     *
+     * @var integer
+     */
+    public $category_id = 0;
+
+    /**
+     * 提问者
+     *
+     * @var integer
+     */
+    public $owner_id = 0;
+
+    /**
+     * 最后回应用户
+     *
+     * @var integer
+     */
+    public $last_replier_id = 0;
+
+    /**
+     * 最后回答编号
+     *
+     * @var integer
+     */
+    public $last_answer_id = 0;
+
+    /**
+     * 采纳答案编号
+     *
+     * @var integer
+     */
+    public $accept_answer_id = 0;
+
+    /**
+     * 标题
+     *
+     * @var string
+     */
+    public $title = '';
+
+    /**
+     * 封面
+     *
+     * @var string
+     */
+    public $cover = '';
+
+    /**
+     * 标签
+     *
+     * @var array|string
+     */
+    public $tags = [];
+
+    /**
+     * 概要
+     *
+     * @var string
+     */
+    public $summary = '';
+
+    /**
+     * 内容
+     *
+     * @var string
+     */
+    public $content = '';
+
+    /**
+     * 综合得分
+     *
+     * @var float
+     */
+    public $score = 0.00;
+
+    /**
+     * 悬赏积分
+     *
+     * @var integer
+     */
+    public $bounty = 0;
+
+    /**
+     * 匿名标识
+     *
+     * @var integer
+     */
+    public $anonymous = 0;
+
+    /**
+     * 解决标识
+     *
+     * @var integer
+     */
+    public $solved = 0;
+
+    /**
+     * 关闭标识
+     *
+     * @var integer
+     */
+    public $closed = 0;
+
+    /**
+     * 状态标识
+     *
+     * @var integer
+     */
+    public $published = self::PUBLISH_PENDING;
+
+    /**
+     * 删除标识
+     *
+     * @var integer
+     */
+    public $deleted = 0;
+
+    /**
+     * 终端类型
+     *
+     * @var integer
+     */
+    public $client_type = 0;
+
+    /**
+     * 终端IP
+     *
+     * @var integer
+     */
+    public $client_ip = '';
+
+    /**
+     * 浏览数
+     *
+     * @var integer
+     */
+    public $view_count = 0;
+
+    /**
+     * 答案数
+     *
+     * @var integer
+     */
+    public $answer_count = 0;
+
+    /**
+     * 评论数
+     *
+     * @var integer
+     */
+    public $comment_count = 0;
+
+    /**
+     * 收藏数
+     *
+     * @var integer
+     */
+    public $favorite_count = 0;
+
+    /**
+     * 点赞数
+     *
+     * @var integer
+     */
+    public $like_count = 0;
+
+    /**
+     * 举报数
+     *
+     * @var integer
+     */
+    public $report_count = 0;
+
+    /**
+     * 回应时间
+     *
+     * @var integer
+     */
+    public $last_reply_time = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var integer
+     */
+    public $create_time = 0;
+
+    /**
+     * 更新时间
+     *
+     * @var integer
+     */
+    public $update_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_question';
+    }
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        $this->addBehavior(
+            new SoftDelete([
+                'field' => 'deleted',
+                'value' => 1,
+            ])
+        );
+    }
+
+    public function beforeCreate()
+    {
+        if (is_array($this->tags) || is_object($this->tags)) {
+            $this->tags = kg_json_encode($this->tags);
+        }
+
+        if (empty($this->cover)) {
+            $this->cover = kg_parse_first_content_image($this->content);
+        }
+
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        if (time() - $this->update_time > 3 * 3600) {
+            $sync = new QuestionIndexSync();
+            $sync->addItem($this->id);
+
+            $sync = new QuestionScoreSync();
+            $sync->addItem($this->id);
+        }
+
+        if (is_array($this->tags) || is_object($this->tags)) {
+            $this->tags = kg_json_encode($this->tags);
+        }
+
+        if (empty($this->cover)) {
+            $this->cover = kg_parse_first_content_image($this->content);
+        }
+
+        if (empty($this->summary)) {
+            $this->summary = kg_parse_summary($this->content);
+        }
+
+        $this->update_time = time();
+    }
+
+    public function afterCreate()
+    {
+        $cache = new MaxQuestionIdCache();
+
+        $cache->rebuild();
+    }
+
+    public function afterFetch()
+    {
+        if (is_string($this->tags)) {
+            $this->tags = json_decode($this->tags, true);
+        }
+    }
+
+    public static function publishTypes()
+    {
+        return [
+            self::PUBLISH_PENDING => '审核中',
+            self::PUBLISH_APPROVED => '已发布',
+            self::PUBLISH_REJECTED => '未通过',
+        ];
+    }
+
+    public static function sortTypes()
+    {
+        return [
+            'latest' => '最新提问',
+            'active' => '最新回答',
+            'unanswered' => '尚未回答',
+        ];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/QuestionFavorite.php b/app/Models/QuestionFavorite.php
new file mode 100644
index 00000000..0a173593
--- /dev/null
+++ b/app/Models/QuestionFavorite.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+class QuestionFavorite extends Model
+{
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id = 0;
+
+    /**
+     * 问题编号
+     *
+     * @var int
+     */
+    public $question_id = 0;
+
+    /**
+     * 用户编号
+     *
+     * @var int
+     */
+    public $user_id = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_question_favorite';
+    }
+
+    public function beforeCreate()
+    {
+        $this->create_time = time();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/QuestionLike.php b/app/Models/QuestionLike.php
new file mode 100644
index 00000000..d4abfdfc
--- /dev/null
+++ b/app/Models/QuestionLike.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+class QuestionLike extends Model
+{
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id = 0;
+
+    /**
+     * 问题编号
+     *
+     * @var int
+     */
+    public $question_id = 0;
+
+    /**
+     * 用户编号
+     *
+     * @var int
+     */
+    public $user_id = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_question_like';
+    }
+
+    public function beforeCreate()
+    {
+        $this->create_time = time();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/QuestionTag.php b/app/Models/QuestionTag.php
new file mode 100644
index 00000000..da88e3e8
--- /dev/null
+++ b/app/Models/QuestionTag.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+class QuestionTag extends Model
+{
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id = 0;
+
+    /**
+     * 问题编号
+     *
+     * @var int
+     */
+    public $question_id = 0;
+
+    /**
+     * 标签编号
+     *
+     * @var int
+     */
+    public $tag_id = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_question_tag';
+    }
+
+    public function beforeCreate()
+    {
+        $this->create_time = time();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Reason.php b/app/Models/Reason.php
index 8ff03c0a..9b1ea57c 100644
--- a/app/Models/Reason.php
+++ b/app/Models/Reason.php
@@ -23,4 +23,38 @@ class Reason
         ];
     }
 
+    public static function questionRejectOptions()
+    {
+        return [
+            101 => '没有讨论价值',
+            102 => '错别字，病句过多',
+            103 => '内容不实',
+            104 => '标题夸张',
+            105 => '题文不符',
+            106 => '低俗色情',
+            107 => '广告软文',
+            108 => '恶意对比',
+            109 => '涉嫌歧视，恶意抹黑',
+            110 => '归类与主题不符',
+            111 => '内容涉嫌违法',
+            112 => '其它问题',
+        ];
+    }
+
+    public static function answerRejectOptions()
+    {
+        return [
+            101 => '答非所问',
+            102 => '内容质量差',
+            103 => '内容不实',
+            104 => '低俗色情',
+            105 => '广告软文',
+            106 => '恶意对比',
+            107 => '涉嫌歧视，恶意抹黑',
+            108 => '配图引起不适',
+            109 => '内容涉嫌违法',
+            110 => '其它问题',
+        ];
+    }
+
 }
\ No newline at end of file
diff --git a/app/Models/Report.php b/app/Models/Report.php
new file mode 100644
index 00000000..50d36574
--- /dev/null
+++ b/app/Models/Report.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Models;
+
+class Report extends Model
+{
+
+    /**
+     * 条目类型
+     */
+    const ITEM_USER = 100; // 用户
+    const ITEM_GROUP = 101; // 小组
+    const ITEM_COURSE = 102; // 课程
+    const ITEM_CHAPTER = 103; // 章节
+    const ITEM_CONSULT = 104; // 咨询
+    const ITEM_REVIEW = 105; // 评价
+    const ITEM_ARTICLE = 106; // 文章
+    const ITEM_QUESTION = 107; // 问题
+    const ITEM_ANSWER = 108; // 答案
+    const ITEM_COMMENT = 109; // 评论
+
+    /**
+     * 自增编号
+     *
+     * @var integer
+     */
+    public $id;
+
+    /**
+     * 用户编号
+     *
+     * @var integer
+     */
+    public $owner_id;
+
+    /**
+     * 条目编号
+     *
+     * @var integer
+     */
+    public $item_id;
+
+    /**
+     * 条目类型
+     *
+     * @var integer
+     */
+    public $item_type;
+
+    /**
+     * 举报理由
+     *
+     * @var string
+     */
+    public $reason;
+
+    /**
+     * 处理状态
+     *
+     * @var integer
+     */
+    public $reviewed;
+
+    /**
+     * 采纳标识
+     *
+     * @var integer
+     */
+    public $accepted;
+
+    /**
+     * 创建时间
+     *
+     * @var integer
+     */
+    public $create_time;
+
+    /**
+     * 更新时间
+     *
+     * @var integer
+     */
+    public $update_time;
+
+    public function getSource(): string
+    {
+        return 'kg_report';
+    }
+
+    public function beforeCreate()
+    {
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        $this->update_time = time();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Review.php b/app/Models/Review.php
index fc518ff8..83589aad 100644
--- a/app/Models/Review.php
+++ b/app/Models/Review.php
@@ -112,6 +112,13 @@ class Review extends Model
      */
     public $like_count = 0;
 
+    /**
+     * 举报数
+     *
+     * @var integer
+     */
+    public $report_count;
+
     /**
      * 创建时间
      *
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 72f62656..eca6f7ab 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Caches\MaxTagId as MaxTagIdCache;
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
+use Phalcon\Text;
 
 class Tag extends Model
 {
@@ -97,11 +98,21 @@ class Tag extends Model
 
     public function beforeCreate()
     {
+        if (empty($this->icon)) {
+            $this->icon = kg_default_icon_path();
+        } elseif (Text::startsWith($this->icon, 'http')) {
+            $this->icon = self::getIconPath($this->icon);
+        }
+        
         $this->create_time = time();
     }
 
     public function beforeUpdate()
     {
+        if (Text::startsWith($this->icon, 'http')) {
+            $this->icon = self::getIconPath($this->icon);
+        }
+        
         if ($this->deleted == 1) {
             $this->published = 0;
         }
@@ -116,4 +127,20 @@ class Tag extends Model
         $cache->rebuild();
     }
 
+    public function afterFetch()
+    {
+        if (!Text::startsWith($this->icon, 'http')) {
+            $this->icon = kg_cos_icon_url($this->icon);
+        }
+    }
+
+    public static function getIconPath($url)
+    {
+        if (Text::startsWith($url, 'http')) {
+            return parse_url($url, PHP_URL_PATH);
+        }
+
+        return $url;
+    }
+
 }
\ No newline at end of file
diff --git a/app/Models/TagFollow.php b/app/Models/TagFollow.php
new file mode 100644
index 00000000..4ce369d0
--- /dev/null
+++ b/app/Models/TagFollow.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+class TagFollow extends Model
+{
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id = 0;
+
+    /**
+     * 标签编号
+     *
+     * @var int
+     */
+    public $tag_id = 0;
+
+    /**
+     * 用户编号
+     *
+     * @var int
+     */
+    public $user_id = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_tag_follow';
+    }
+
+    public function beforeCreate()
+    {
+        $this->create_time = time();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/User.php b/app/Models/User.php
index ddf504ed..d07fab74 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -122,6 +122,20 @@ class User extends Model
      */
     public $article_count;
 
+    /**
+     * 提问数
+     *
+     * @var int
+     */
+    public $question_count;
+
+    /**
+     * 回答数
+     *
+     * @var int
+     */
+    public $answer_count;
+
     /**
      * 收藏数
      *
diff --git a/app/Repos/Answer.php b/app/Repos/Answer.php
new file mode 100644
index 00000000..8a036a3a
--- /dev/null
+++ b/app/Repos/Answer.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\Answer as AnswerModel;
+use App\Models\AnswerLike as AnswerLikeModel;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class Answer extends Repository
+{
+
+    public function paginate($where = [], $sort = 'accepted', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(AnswerModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['id'])) {
+            $builder->andWhere('id = :id:', ['id' => $where['id']]);
+        }
+
+        if (!empty($where['owner_id'])) {
+            $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]);
+        }
+
+        if (!empty($where['question_id'])) {
+            $builder->andWhere('question_id = :question_id:', ['question_id' => $where['question_id']]);
+        }
+
+        if (isset($where['published'])) {
+            $builder->andWhere('published = :published:', ['published' => $where['published']]);
+        }
+
+        if (isset($where['deleted'])) {
+            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
+        }
+
+        switch ($sort) {
+            case 'popular':
+                $orderBy = 'like_count DESC';
+                break;
+            case 'latest':
+                $orderBy = 'id DESC';
+                break;
+            default:
+                $orderBy = 'accepted DESC, like_count DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+    /**
+     * @param int $id
+     * @return AnswerModel|Model|bool
+     */
+    public function findById($id)
+    {
+        return AnswerModel::findFirst([
+            'conditions' => 'id = :id:',
+            'bind' => ['id' => $id],
+        ]);
+    }
+
+    /**
+     * @param array $ids
+     * @param array|string $columns
+     * @return ResultsetInterface|Resultset|AnswerModel[]
+     */
+    public function findByIds($ids, $columns = '*')
+    {
+        return AnswerModel::query()
+            ->columns($columns)
+            ->inWhere('id', $ids)
+            ->execute();
+    }
+
+    public function countAnswers()
+    {
+        return (int)AnswerModel::count([
+            'conditions' => 'published = :published: AND deleted = 0',
+            'bind' => ['published' => AnswerModel::PUBLISH_APPROVED],
+        ]);
+    }
+
+    public function countLikes($answerId)
+    {
+        return (int)AnswerLikeModel::count([
+            'conditions' => 'answer_id = :answer_id: AND deleted = 0',
+            'bind' => ['answer_id' => $answerId],
+        ]);
+    }
+
+}
diff --git a/app/Repos/AnswerLike.php b/app/Repos/AnswerLike.php
new file mode 100644
index 00000000..d883ce32
--- /dev/null
+++ b/app/Repos/AnswerLike.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Repos;
+
+use App\Models\AnswerLike as AnswerLikeModel;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class AnswerLike extends Repository
+{
+
+    /**
+     * @param int $answerId
+     * @param int $userId
+     * @return AnswerLikeModel|Model|bool
+     */
+    public function findAnswerLike($answerId, $userId)
+    {
+        return AnswerLikeModel::findFirst([
+            'conditions' => 'answer_id = :answer_id: AND user_id = :user_id:',
+            'bind' => ['answer_id' => $answerId, 'user_id' => $userId],
+        ]);
+    }
+
+    /**
+     * @param int $userId
+     * @return ResultsetInterface|Resultset|AnswerLikeModel[]
+     */
+    public function findByUserId($userId)
+    {
+        return AnswerLikeModel::query()
+            ->where('user_id = :user_id:', ['user_id' => $userId])
+            ->execute();
+    }
+
+}
diff --git a/app/Repos/Article.php b/app/Repos/Article.php
index 620e2f31..bbd4f36e 100644
--- a/app/Repos/Article.php
+++ b/app/Repos/Article.php
@@ -64,6 +64,10 @@ class Article extends Repository
             $builder->andWhere('published = :published:', ['published' => $where['published']]);
         }
 
+        if (isset($where['closed'])) {
+            $builder->andWhere('closed = :closed:', ['closed' => $where['closed']]);
+        }
+
         if (isset($where['deleted'])) {
             $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
         }
@@ -77,10 +81,7 @@ class Article extends Repository
                 $orderBy = 'like_count DESC';
                 break;
             case 'popular':
-                $orderBy = 'view_count DESC';
-                break;
-            case 'comment':
-                $orderBy = 'comment_count DESC';
+                $orderBy = 'score DESC';
                 break;
             default:
                 $orderBy = 'id DESC';
@@ -146,15 +147,15 @@ class Article extends Repository
     public function countComments($articleId)
     {
         return (int)CommentModel::count([
-            'conditions' => 'item_id = ?1 AND item_type = ?2 AND deleted = 0',
-            'bind' => [1 => $articleId, 2 => CommentModel::ITEM_ARTICLE],
+            'conditions' => 'item_id = ?1 AND item_type = ?2 AND published = ?3 AND deleted = 0',
+            'bind' => [1 => $articleId, 2 => CommentModel::ITEM_ARTICLE, 3 => CommentModel::PUBLISH_APPROVED],
         ]);
     }
 
     public function countLikes($articleId)
     {
         return (int)ArticleLikeModel::count([
-            'conditions' => 'article_id = :article_id:',
+            'conditions' => 'article_id = :article_id: AND deleted = 0',
             'bind' => ['article_id' => $articleId],
         ]);
     }
@@ -162,7 +163,7 @@ class Article extends Repository
     public function countFavorites($articleId)
     {
         return (int)ArticleFavoriteModel::count([
-            'conditions' => 'article_id = :article_id:',
+            'conditions' => 'article_id = :article_id: AND deleted = 0',
             'bind' => ['article_id' => $articleId],
         ]);
     }
diff --git a/app/Repos/Chapter.php b/app/Repos/Chapter.php
index e67fa3ef..7e26cef0 100644
--- a/app/Repos/Chapter.php
+++ b/app/Repos/Chapter.php
@@ -10,6 +10,7 @@ use App\Models\ChapterRead as ChapterReadModel;
 use App\Models\ChapterUser as ChapterUserModel;
 use App\Models\ChapterVod as ChapterVodModel;
 use App\Models\Comment as CommentModel;
+use App\Models\Consult as ConsultModel;
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
@@ -161,6 +162,14 @@ class Chapter extends Repository
         ]);
     }
 
+    public function countConsults($chapterId)
+    {
+        return (int)ConsultModel::count([
+            'conditions' => 'chapter_id = :chapter_id: AND published = 1 AND deleted = 0',
+            'bind' => ['chapter_id' => $chapterId],
+        ]);
+    }
+
     public function countUsers($chapterId)
     {
         return (int)ChapterUserModel::count([
diff --git a/app/Repos/Course.php b/app/Repos/Course.php
index 581c80a8..750afae0 100644
--- a/app/Repos/Course.php
+++ b/app/Repos/Course.php
@@ -294,7 +294,9 @@ class Course extends Repository
 
     public function countCourses()
     {
-        return (int)CourseModel::count(['conditions' => 'deleted = 0']);
+        return (int)CourseModel::count([
+            'conditions' => 'published = 1 AND deleted = 0',
+        ]);
     }
 
     public function countLessons($courseId)
@@ -324,7 +326,7 @@ class Course extends Repository
     public function countConsults($courseId)
     {
         return (int)ConsultModel::count([
-            'conditions' => 'course_id = :course_id: AND published = 1',
+            'conditions' => 'course_id = :course_id: AND published = 1 AND deleted = 0',
             'bind' => ['course_id' => $courseId],
         ]);
     }
@@ -332,7 +334,7 @@ class Course extends Repository
     public function countReviews($courseId)
     {
         return (int)ReviewModel::count([
-            'conditions' => 'course_id = :course_id: AND published = 1',
+            'conditions' => 'course_id = :course_id: AND published = 1 AND deleted = 0',
             'bind' => ['course_id' => $courseId],
         ]);
     }
@@ -340,7 +342,7 @@ class Course extends Repository
     public function countFavorites($courseId)
     {
         return (int)CourseFavoriteModel::count([
-            'conditions' => 'course_id = :course_id:',
+            'conditions' => 'course_id = :course_id: AND deleted = 0',
             'bind' => ['course_id' => $courseId],
         ]);
     }
diff --git a/app/Repos/Online.php b/app/Repos/Online.php
index 7a16ce30..eebad626 100644
--- a/app/Repos/Online.php
+++ b/app/Repos/Online.php
@@ -2,6 +2,7 @@
 
 namespace App\Repos;
 
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
 use App\Models\Online as OnlineModel;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
@@ -9,6 +10,38 @@ use Phalcon\Mvc\Model\ResultsetInterface;
 class Online extends Repository
 {
 
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(OnlineModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['user_id'])) {
+            $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
+        }
+
+        switch ($sort) {
+            case 'oldest':
+                $orderBy = 'id ASC';
+                break;
+            default:
+                $orderBy = 'id DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
     /**
      * @param int $userId
      * @param string $activeDate
diff --git a/app/Repos/Question.php b/app/Repos/Question.php
new file mode 100644
index 00000000..0e0c99dd
--- /dev/null
+++ b/app/Repos/Question.php
@@ -0,0 +1,205 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\Answer as AnswerModel;
+use App\Models\Comment as CommentModel;
+use App\Models\Question as QuestionModel;
+use App\Models\QuestionFavorite as QuestionFavoriteModel;
+use App\Models\QuestionLike as QuestionLikeModel;
+use App\Models\QuestionTag as QuestionTagModel;
+use App\Models\Tag as TagModel;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class Question extends Repository
+{
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(QuestionModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['tag_id'])) {
+            $where['id'] = $this->getTagQuestionIds($where['tag_id']);
+        }
+
+        if (!empty($where['id'])) {
+            if (is_array($where['id'])) {
+                $builder->inWhere('id', $where['id']);
+            } else {
+                $builder->andWhere('id = :id:', ['id' => $where['id']]);
+            }
+        }
+
+        if (!empty($where['owner_id'])) {
+            $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]);
+        }
+
+        if (!empty($where['title'])) {
+            $builder->andWhere('title LIKE :title:', ['title' => "%{$where['title']}%"]);
+        }
+
+        if (isset($where['anonymous'])) {
+            $builder->andWhere('anonymous = :anonymous:', ['anonymous' => $where['anonymous']]);
+        }
+
+        if (isset($where['closed'])) {
+            $builder->andWhere('closed = :closed:', ['closed' => $where['closed']]);
+        }
+
+        if (isset($where['solved'])) {
+            $builder->andWhere('solved = :solved:', ['solved' => $where['solved']]);
+        }
+
+        if (isset($where['published'])) {
+            $builder->andWhere('published = :published:', ['published' => $where['published']]);
+        }
+
+        if (isset($where['deleted'])) {
+            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
+        }
+
+        if ($sort == 'unanswered') {
+            $builder->andWhere('answer_count = 0');
+        }
+
+        switch ($sort) {
+            case 'active':
+                $orderBy = 'last_reply_time DESC';
+                break;
+            case 'score':
+                $orderBy = 'score DESC';
+                break;
+            default:
+                $orderBy = 'id DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+    /**
+     * @param int $id
+     * @return QuestionModel|Model|bool
+     */
+    public function findById($id)
+    {
+        return QuestionModel::findFirst([
+            'conditions' => 'id = :id:',
+            'bind' => ['id' => $id],
+        ]);
+    }
+
+    /**
+     * @param array $ids
+     * @param array|string $columns
+     * @return ResultsetInterface|Resultset|QuestionModel[]
+     */
+    public function findByIds($ids, $columns = '*')
+    {
+        return QuestionModel::query()
+            ->columns($columns)
+            ->inWhere('id', $ids)
+            ->execute();
+    }
+
+    /**
+     * @param int $questionId
+     * @return ResultsetInterface|Resultset|TagModel[]
+     */
+    public function findTags($questionId)
+    {
+        return $this->modelsManager->createBuilder()
+            ->columns('t.*')
+            ->addFrom(TagModel::class, 't')
+            ->join(QuestionTagModel::class, 't.id = qt.tag_id', 'qt')
+            ->where('qt.question_id = :question_id:', ['question_id' => $questionId])
+            ->andWhere('t.published = 1')
+            ->getQuery()->execute();
+    }
+
+    /**
+     * @param int $questionId
+     * @param int $userId
+     * @return ResultsetInterface|Resultset|AnswerModel[]
+     */
+    public function findUserAnswers($questionId, $userId)
+    {
+        return AnswerModel::query()
+            ->where('question_id = :question_id:', ['question_id' => $questionId])
+            ->andWhere('owner_id = :owner_id:', ['owner_id' => $userId])
+            ->execute();
+    }
+
+    public function countQuestions()
+    {
+        return (int)QuestionModel::count([
+            'conditions' => 'published = :published: AND deleted = 0',
+            'bind' => ['published' => QuestionModel::PUBLISH_APPROVED],
+        ]);
+    }
+
+    public function countAnswers($questionId)
+    {
+        return (int)AnswerModel::count([
+            'conditions' => 'question_id = ?1 AND published = ?2 AND deleted = 0',
+            'bind' => [1 => $questionId, 2 => AnswerModel::PUBLISH_APPROVED],
+        ]);
+    }
+
+    public function countComments($questionId)
+    {
+        return (int)CommentModel::count([
+            'conditions' => 'item_id = ?1 AND item_type = ?2 AND published = ?3 AND deleted = 0',
+            'bind' => [1 => $questionId, 2 => CommentModel::ITEM_QUESTION, 3 => CommentModel::PUBLISH_APPROVED],
+        ]);
+    }
+
+    public function countFavorites($questionId)
+    {
+        return (int)QuestionFavoriteModel::count([
+            'conditions' => 'question_id = :question_id: AND deleted = 0',
+            'bind' => ['question_id' => $questionId],
+        ]);
+    }
+
+    public function countLikes($questionId)
+    {
+        return (int)QuestionLikeModel::count([
+            'conditions' => 'question_id = :question_id: AND deleted = 0',
+            'bind' => ['question_id' => $questionId],
+        ]);
+    }
+
+    protected function getTagQuestionIds($tagId)
+    {
+        $tagIds = is_array($tagId) ? $tagId : [$tagId];
+
+        $repo = new QuestionTag();
+
+        $rows = $repo->findByTagIds($tagIds);
+
+        $result = [];
+
+        if ($rows->count() > 0) {
+            $result = kg_array_column($rows->toArray(), 'question_id');
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Repos/QuestionFavorite.php b/app/Repos/QuestionFavorite.php
new file mode 100644
index 00000000..a20d30de
--- /dev/null
+++ b/app/Repos/QuestionFavorite.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\QuestionFavorite as QuestionFavoriteModel;
+use Phalcon\Mvc\Model;
+
+class QuestionFavorite extends Repository
+{
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(QuestionFavoriteModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['question_id'])) {
+            $builder->andWhere('question_id = :question_id:', ['question_id' => $where['question_id']]);
+        }
+
+        if (!empty($where['user_id'])) {
+            $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
+        }
+
+        switch ($sort) {
+            default:
+                $orderBy = 'id DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+    /**
+     * @param int $questionId
+     * @param int $userId
+     * @return QuestionFavoriteModel|Model|bool
+     */
+    public function findQuestionFavorite($questionId, $userId)
+    {
+        return QuestionFavoriteModel::findFirst([
+            'conditions' => 'question_id = :question_id: AND user_id = :user_id:',
+            'bind' => ['question_id' => $questionId, 'user_id' => $userId],
+        ]);
+    }
+
+}
diff --git a/app/Repos/QuestionLike.php b/app/Repos/QuestionLike.php
new file mode 100644
index 00000000..e6903d0a
--- /dev/null
+++ b/app/Repos/QuestionLike.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Repos;
+
+use App\Models\QuestionLike as QuestionLikeModel;
+use Phalcon\Mvc\Model;
+
+class QuestionLike extends Repository
+{
+
+    /**
+     * @param int $questionId
+     * @param int $userId
+     * @return QuestionLikeModel|Model|bool
+     */
+    public function findQuestionLike($questionId, $userId)
+    {
+        return QuestionLikeModel::findFirst([
+            'conditions' => 'question_id = :question_id: AND user_id = :user_id:',
+            'bind' => ['question_id' => $questionId, 'user_id' => $userId],
+        ]);
+    }
+
+}
diff --git a/app/Repos/QuestionTag.php b/app/Repos/QuestionTag.php
new file mode 100644
index 00000000..05c3410c
--- /dev/null
+++ b/app/Repos/QuestionTag.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Repos;
+
+use App\Models\QuestionTag as QuestionTagModel;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class QuestionTag extends Repository
+{
+
+    /**
+     * @param int $questionId
+     * @param int $tagId
+     * @return QuestionTagModel|Model|bool
+     */
+    public function findQuestionTag($questionId, $tagId)
+    {
+        return QuestionTagModel::findFirst([
+            'conditions' => 'question_id = :question_id: AND tag_id = :tag_id:',
+            'bind' => ['question_id' => $questionId, 'tag_id' => $tagId],
+        ]);
+    }
+
+    /**
+     * @param array $tagIds
+     * @return ResultsetInterface|Resultset|QuestionTagModel[]
+     */
+    public function findByTagIds($tagIds)
+    {
+        return QuestionTagModel::query()
+            ->inWhere('tag_id', $tagIds)
+            ->execute();
+    }
+
+    /**
+     * @param array $questionIds
+     * @return ResultsetInterface|Resultset|QuestionTagModel[]
+     */
+    public function findByQuestionIds($questionIds)
+    {
+        return QuestionTagModel::query()
+            ->inWhere('question_id', $questionIds)
+            ->execute();
+    }
+
+}
diff --git a/app/Repos/Tag.php b/app/Repos/Tag.php
index 0c567ee6..32387dfe 100644
--- a/app/Repos/Tag.php
+++ b/app/Repos/Tag.php
@@ -37,10 +37,10 @@ class Tag extends Repository
 
         switch ($sort) {
             case 'popular':
-                $orderBy = 'follow_count DESC';
+                $orderBy = 'follow_count DESC, id DESC';
                 break;
             case 'priority':
-                $orderBy = 'priority ASC';
+                $orderBy = 'priority ASC, id ASC';
                 break;
             default:
                 $orderBy = 'id DESC';
diff --git a/app/Repos/TagFollow.php b/app/Repos/TagFollow.php
new file mode 100644
index 00000000..cfc3791b
--- /dev/null
+++ b/app/Repos/TagFollow.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\TagFollow as TagFollowModel;
+use Phalcon\Mvc\Model;
+
+class TagFollow extends Repository
+{
+
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(TagFollowModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['tag_id'])) {
+            $builder->andWhere('tag_id = :tag_id:', ['tag_id' => $where['tag_id']]);
+        }
+
+        if (!empty($where['user_id'])) {
+            $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
+        }
+
+        switch ($sort) {
+            default:
+                $orderBy = 'id DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+    /**
+     * @param int $tagId
+     * @param int $userId
+     * @return TagFollowModel|Model|bool
+     */
+    public function findTagFollow($tagId, $userId)
+    {
+        return TagFollowModel::findFirst([
+            'conditions' => 'tag_id = :tag_id: AND user_id = :user_id:',
+            'bind' => ['tag_id' => $tagId, 'user_id' => $userId],
+        ]);
+    }
+
+}
diff --git a/app/Repos/User.php b/app/Repos/User.php
index 8602a3b7..c6b19ea9 100644
--- a/app/Repos/User.php
+++ b/app/Repos/User.php
@@ -3,12 +3,14 @@
 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\ArticleFavorite as ArticleFavoriteModel;
 use App\Models\CourseFavorite as CourseFavoriteModel;
 use App\Models\CourseUser as CourseUserModel;
 use App\Models\ImUser as ImUserModel;
 use App\Models\Notification as NotificationModel;
+use App\Models\Question as QuestionModel;
 use App\Models\User as UserModel;
 use App\Models\UserBalance as UserBalanceModel;
 use App\Models\UserContact as UserContactModel;
@@ -176,15 +178,31 @@ class User extends Repository
     public function countArticles($userId)
     {
         return (int)ArticleModel::count([
-            'conditions' => 'owner_id = :owner_id: AND published = 1',
-            'bind' => ['owner_id' => $userId],
+            'conditions' => 'owner_id = ?1 AND published = ?2',
+            'bind' => [1 => $userId, 2 => ArticleModel::PUBLISH_APPROVED],
+        ]);
+    }
+
+    public function countQuestions($userId)
+    {
+        return (int)QuestionModel::count([
+            'conditions' => 'owner_id = ?1 AND published = ?2',
+            'bind' => [1 => $userId, 2 => QuestionModel::PUBLISH_APPROVED],
+        ]);
+    }
+
+    public function countAnswers($userId)
+    {
+        return (int)AnswerModel::count([
+            'conditions' => 'owner_id = ?1 AND published = ?2',
+            'bind' => [1 => $userId, 2 => AnswerModel::PUBLISH_APPROVED],
         ]);
     }
 
     public function countCourseFavorites($userId)
     {
         return (int)CourseFavoriteModel::count([
-            'conditions' => 'user_id = :user_id:',
+            'conditions' => 'user_id = :user_id: AND deleted = 0',
             'bind' => ['user_id' => $userId],
         ]);
     }
@@ -192,7 +210,7 @@ class User extends Repository
     public function countArticleFavorites($userId)
     {
         return (int)ArticleFavoriteModel::count([
-            'conditions' => 'user_id = :user_id:',
+            'conditions' => 'user_id = :user_id: AND deleted = 0',
             'bind' => ['user_id' => $userId],
         ]);
     }
diff --git a/app/Services/CourseStat.php b/app/Services/CourseStat.php
index 3596d987..38967cbd 100644
--- a/app/Services/CourseStat.php
+++ b/app/Services/CourseStat.php
@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Models\Course as CourseModel;
 use App\Repos\Course as CourseRepo;
 use App\Repos\CourseRating as CourseRatingRepo;
 
@@ -57,23 +56,6 @@ class CourseStat extends Service
         $course->update();
     }
 
-    public function updateScore($courseId)
-    {
-        $courseRepo = new CourseRepo();
-
-        $course = $courseRepo->findById($courseId);
-
-        if ($course->market_price == 0) {
-            $score = $this->calculateFreeCourseScore($course);
-        } else {
-            $score = $this->calculateChargeCourseScore($course);
-        }
-
-        $course->score = $score;
-
-        $course->update();
-    }
-
     public function updateReadAttrs($courseId)
     {
         $courseRepo = new CourseRepo();
@@ -173,72 +155,4 @@ class CourseStat extends Service
 
     }
 
-    protected function calculateFreeCourseScore(CourseModel $course)
-    {
-        $weight = [
-            'factor1' => 0.1,
-            'factor2' => 0.25,
-            'factor3' => 0.2,
-            'factor4' => 0.1,
-            'factor5' => 0.25,
-            'factor6' => 0.1,
-        ];
-
-        return $this->calculateCourseScore($course, $weight);
-    }
-
-    protected function calculateChargeCourseScore(CourseModel $course)
-    {
-        $weight = [
-            'factor1' => 0.1,
-            'factor2' => 0.3,
-            'factor3' => 0.15,
-            'factor4' => 0.15,
-            'factor5' => 0.2,
-            'factor6' => 0.1,
-        ];
-
-        return $this->calculateCourseScore($course, $weight);
-    }
-
-    protected function calculateCourseScore(CourseModel $course, $weight)
-    {
-        $items = [
-            'factor1' => 0.0,
-            'factor2' => 0.0,
-            'factor3' => 0.0,
-            'factor4' => 0.0,
-            'factor5' => 0.0,
-            'factor6' => 0.0,
-        ];
-
-        $items['factor1'] = ($course->featured == 1 ? 1 : 0) * 10 * $weight['factor1'];
-
-        if ($course->user_count > 0) {
-            $items['factor2'] = log($course->user_count) * $weight['factor2'];
-        }
-
-        if ($course->favorite_count > 0) {
-            $items['factor3'] = log($course->favorite_count) * $weight['factor3'];
-        }
-
-        if ($course->consult_count > 0) {
-            $items['factor4'] = log($course->consult_count) * $weight['factor4'];
-        }
-
-        if ($course->review_count > 0 && $course->rating > 0) {
-            $items['factor5'] = log($course->review_count * $course->rating) * $weight['factor5'];
-        }
-
-        $sumCount = $course->lesson_count + $course->package_count + $course->resource_count;
-
-        if ($sumCount > 0) {
-            $items['factor6'] = log($sumCount) * $weight['factor6'];
-        }
-
-        $score = array_sum($items) / log(time() - $course->create_time);
-
-        return round($score, 4);
-    }
-
 }
diff --git a/app/Services/Logic/Answer/AnswerAccept.php b/app/Services/Logic/Answer/AnswerAccept.php
new file mode 100644
index 00000000..09855573
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerAccept.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Services\Logic\Answer;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\User as UserModel;
+use App\Services\Logic\AnswerTrait;
+use App\Services\Logic\Notice\System\AnswerAccepted as AnswerAcceptedNotice;
+use App\Services\Logic\Point\History\AnswerAccepted as AnswerAcceptPointHistory;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+use App\Validators\Answer as AnswerValidator;
+
+class AnswerAccept extends LogicService
+{
+
+    use AnswerTrait;
+    use QuestionTrait;
+
+    public function handle($id)
+    {
+        $answer = $this->checkAnswer($id);
+
+        $question = $this->checkQuestion($answer->question_id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new AnswerValidator();
+
+        $validator->checkOwner($user->id, $answer->owner_id);
+
+        if ($question->solved == 1) return;
+
+        $answer->accepted = 1;
+
+        $answer->update();
+
+        $question->last_answer_id = $answer->id;
+        $question->last_reply_time = time();
+        $question->solved = 1;
+
+        $question->update();
+
+        $this->handleAcceptNotice($answer, $user);
+
+        $this->eventsManager->fire('Answer:afterAccept', $this, $answer);
+
+        return $answer;
+    }
+
+    protected function handleAcceptPoint(AnswerModel $answer)
+    {
+        $service = new AnswerAcceptPointHistory();
+
+        $service->handle($answer);
+    }
+
+    protected function handleAcceptNotice(AnswerModel $answer, UserModel $sender)
+    {
+        $notice = new AnswerAcceptedNotice();
+
+        $notice->handle($answer, $sender);
+    }
+
+}
diff --git a/app/Services/Logic/Answer/AnswerCreate.php b/app/Services/Logic/Answer/AnswerCreate.php
new file mode 100644
index 00000000..ec848439
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerCreate.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Services\Logic\Answer;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\AnswerTrait;
+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\Services\Sync\QuestionScore as QuestionScoreSync;
+use App\Traits\Client as ClientTrait;
+use App\Validators\Answer as AnswerValidator;
+
+class AnswerCreate extends LogicService
+{
+
+    use ClientTrait;
+    use QuestionTrait;
+    use AnswerTrait;
+
+    public function handle()
+    {
+        $post = $this->request->getPost();
+
+        $question = $this->checkQuestion($post['question_id']);
+
+        $user = $this->getLoginUser();
+
+        $validator = new AnswerValidator();
+
+        $validator->checkIfAllowAnswer($question, $user);
+
+        $answer = new AnswerModel();
+
+        $answer->published = $this->getPublishStatus($user);
+
+        $answer->content = $validator->checkContent($post['content']);
+        $answer->client_type = $this->getClientType();
+        $answer->client_ip = $this->getClientIp();
+        $answer->question_id = $question->id;
+        $answer->owner_id = $user->id;
+
+        $answer->create();
+
+        $this->recountQuestionAnswers($question);
+        $this->recountUserAnswers($user);
+
+        if ($answer->published == AnswerModel::PUBLISH_APPROVED) {
+
+            $question->last_answer_id = $answer->id;
+            $question->last_replier_id = $answer->owner_id;
+            $question->last_reply_time = $answer->create_time;
+
+            $question->update();
+
+            $this->syncQuestionScore($question);
+            $this->handleAnswerPostPoint($answer);
+            $this->handleQuestionAnsweredNotice($answer);
+        }
+
+        $this->eventsManager->fire('Answer:afterCreate', $this, $answer);
+
+        return $answer;
+    }
+
+    protected function getPublishStatus(UserModel $user)
+    {
+        return $user->answer_count > 2 ? AnswerModel::PUBLISH_APPROVED : AnswerModel::PUBLISH_PENDING;
+    }
+
+    protected function recountQuestionAnswers(QuestionModel $question)
+    {
+        $questionRepo = new QuestionRepo();
+
+        $answerCount = $questionRepo->countAnswers($question->id);
+
+        $question->answer_count = $answerCount;
+
+        $question->update();
+    }
+
+    protected function recountUserAnswers(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $answerCount = $userRepo->countAnswers($user->id);
+
+        $user->answer_count = $answerCount;
+
+        $user->update();
+    }
+
+    protected function syncQuestionScore(QuestionModel $question)
+    {
+        $sync = new QuestionScoreSync();
+
+        $sync->addItem($question->id);
+    }
+
+    protected function handleQuestionAnsweredNotice(AnswerModel $answer)
+    {
+        if ($answer->published != AnswerModel::PUBLISH_APPROVED) return;
+
+        $notice = new QuestionAnsweredNotice();
+
+        $notice->handle($answer);
+    }
+
+    protected function handleAnswerPostPoint(AnswerModel $answer)
+    {
+        if ($answer->published != AnswerModel::PUBLISH_APPROVED) return;
+
+        $service = new AnswerPostPointHistory();
+
+        $service->handle($answer);
+    }
+
+}
diff --git a/app/Services/Logic/Answer/AnswerDelete.php b/app/Services/Logic/Answer/AnswerDelete.php
new file mode 100644
index 00000000..a707efb3
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerDelete.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Services\Logic\Answer;
+
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\AnswerTrait;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+use App\Services\Sync\QuestionScore as QuestionScoreSync;
+use App\Validators\Answer as AnswerValidator;
+
+class AnswerDelete extends LogicService
+{
+
+    use QuestionTrait;
+    use AnswerTrait;
+
+    public function handle($id)
+    {
+        $answer = $this->checkAnswer($id);
+
+        $question = $this->checkQuestion($answer->question_id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new AnswerValidator();
+
+        $validator->checkOwner($user->id, $answer->owner_id);
+
+        $validator->checkIfAllowDelete($answer);
+
+        $answer->deleted = 1;
+
+        $answer->update();
+
+        $this->recountQuestionAnswers($question);
+        $this->recountUserAnswers($user);
+
+        $this->eventsManager->fire('Answer:afterDelete', $this, $answer);
+
+        return $answer;
+    }
+
+    protected function recountQuestionAnswers(QuestionModel $question)
+    {
+        $questionRepo = new QuestionRepo();
+
+        $answerCount = $questionRepo->countAnswers($question->id);
+
+        $question->answer_count = $answerCount;
+
+        $question->update();
+    }
+
+    protected function recountUserAnswers(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $answerCount = $userRepo->countAnswers($user->id);
+
+        $user->answer_count = $answerCount;
+
+        $user->update();
+    }
+
+    protected function syncQuestionScore(QuestionModel $question)
+    {
+        $sync = new QuestionScoreSync();
+
+        $sync->addItem($question->id);
+    }
+
+}
diff --git a/app/Services/Logic/Answer/AnswerInfo.php b/app/Services/Logic/Answer/AnswerInfo.php
new file mode 100644
index 00000000..62466332
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerInfo.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Services\Logic\Answer;
+
+use App\Models\Answer as AnswerModel;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\AnswerTrait;
+use App\Services\Logic\Service as LogicService;
+
+class AnswerInfo extends LogicService
+{
+
+    use AnswerTrait;
+
+    public function handle($id)
+    {
+        $answer = $this->checkAnswer($id);
+
+        return $this->handleAnswer($answer);
+    }
+
+    protected function handleAnswer(AnswerModel $answer)
+    {
+        $answer->content = kg_parse_markdown($answer->content);
+
+        $result = [
+            'id' => $answer->id,
+            'content' => $answer->content,
+            'anonymous' => $answer->anonymous,
+            'accepted' => $answer->accepted,
+            'like_count' => $answer->like_count,
+            'create_time' => $answer->create_time,
+            'update_time' => $answer->update_time,
+        ];
+
+        $result['question'] = $this->handleQuestionInfo($answer);
+        $result['owner'] = $this->handleOwnerInfo($answer);
+
+        return $result;
+    }
+
+    protected function handleQuestionInfo(AnswerModel $answer)
+    {
+        $questionRepo = new QuestionRepo();
+
+        $question = $questionRepo->findById($answer->question_id);
+
+        return [
+            'id' => $question->id,
+            'title' => $question->title,
+        ];
+    }
+
+    protected function handleOwnerInfo(AnswerModel $answer)
+    {
+        $userRepo = new UserRepo();
+
+        $owner = $userRepo->findById($answer->owner_id);
+
+        return [
+            'id' => $owner->id,
+            'name' => $owner->name,
+            'avatar' => $owner->avatar,
+        ];
+    }
+
+}
diff --git a/app/Services/Logic/Answer/AnswerLike.php b/app/Services/Logic/Answer/AnswerLike.php
new file mode 100644
index 00000000..1b7a7dfb
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerLike.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Services\Logic\Answer;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\AnswerLike as AnswerLikeModel;
+use App\Models\User as UserModel;
+use App\Repos\AnswerLike as AnswerLikeRepo;
+use App\Services\Logic\AnswerTrait;
+use App\Services\Logic\Notice\System\AnswerLiked as AnswerLikedNotice;
+use App\Services\Logic\Service as LogicService;
+use App\Validators\UserLimit as UserLimitValidator;
+
+class AnswerLike extends LogicService
+{
+
+    use AnswerTrait;
+
+    public function handle($id)
+    {
+        $answer = $this->checkAnswer($id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new UserLimitValidator();
+
+        $validator->checkDailyAnswerLikeLimit($user);
+
+        $likeRepo = new AnswerLikeRepo();
+
+        $answerLike = $likeRepo->findAnswerLike($answer->id, $user->id);
+
+        if (!$answerLike) {
+
+            $action = 'do';
+
+            $answerLike = new AnswerLikeModel();
+
+            $answerLike->answer_id = $answer->id;
+            $answerLike->user_id = $user->id;
+
+            $answerLike->create();
+
+            $this->incrAnswerLikeCount($answer);
+
+            $this->handleLikeNotice($answer, $user);
+
+            $this->eventsManager->fire('Answer:afterLike', $this, $answer);
+
+        } else {
+
+            $action = 'undo';
+
+            $answerLike->delete();
+
+            $this->decrAnswerLikeCount($answer);
+
+            $this->eventsManager->fire('Answer:afterUndoLike', $this, $answer);
+        }
+
+        $this->incrUserDailyAnswerLikeCount($user);
+
+        return [
+            'action' => $action,
+            'count' => $answer->like_count,
+        ];
+    }
+
+    protected function incrAnswerLikeCount(AnswerModel $answer)
+    {
+        $answer->like_count += 1;
+
+        $answer->update();
+    }
+
+    protected function decrAnswerLikeCount(AnswerModel $answer)
+    {
+        if ($answer->like_count > 0) {
+            $answer->like_count -= 1;
+            $answer->update();
+        }
+    }
+
+    protected function incrUserDailyAnswerLikeCount(UserModel $user)
+    {
+        $this->eventsManager->fire('UserDailyCounter:incrAnswerLikeCount', $this, $user);
+    }
+
+    protected function handleLikeNotice(AnswerModel $answer, UserModel $sender)
+    {
+        $notice = new AnswerLikedNotice();
+
+        $notice->handle($answer, $sender);
+    }
+
+}
diff --git a/app/Services/Logic/Answer/AnswerUpdate.php b/app/Services/Logic/Answer/AnswerUpdate.php
new file mode 100644
index 00000000..2ecf551b
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerUpdate.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Services\Logic\Answer;
+
+use App\Models\Question as QuestionModel;
+use App\Services\Logic\AnswerTrait;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+use App\Services\Sync\QuestionScore as QuestionScoreSync;
+use App\Traits\Client as ClientTrait;
+use App\Validators\Answer as AnswerValidator;
+
+class AnswerUpdate extends LogicService
+{
+
+    use ClientTrait;
+    use QuestionTrait;
+    use AnswerTrait;
+
+    public function handle($id)
+    {
+        $post = $this->request->getPost();
+
+        $answer = $this->checkAnswer($id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new AnswerValidator();
+
+        $validator->checkOwner($user->id, $answer->owner_id);
+
+        $validator->checkIfAllowEdit($answer);
+
+        $answer->content = $validator->checkContent($post['content']);
+        $answer->client_type = $this->getClientType();
+        $answer->client_ip = $this->getClientIp();
+
+        $answer->update();
+
+        $this->eventsManager->fire('Answer:afterUpdate', $this, $answer);
+
+        return $answer;
+    }
+
+    protected function syncQuestionScore(QuestionModel $question)
+    {
+        $sync = new QuestionScoreSync();
+
+        $sync->addItem($question->id);
+    }
+
+}
diff --git a/app/Services/Logic/Answer/CommentList.php b/app/Services/Logic/Answer/CommentList.php
new file mode 100644
index 00000000..175487e1
--- /dev/null
+++ b/app/Services/Logic/Answer/CommentList.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services\Logic\Answer;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Comment as CommentModel;
+use App\Repos\Comment as CommentRepo;
+use App\Services\Logic\AnswerTrait;
+use App\Services\Logic\Comment\CommentListTrait;
+use App\Services\Logic\Service as LogicService;
+
+class CommentList extends LogicService
+{
+
+    use AnswerTrait;
+    use CommentListTrait;
+
+    public function handle($id)
+    {
+        $answer = $this->checkAnswer($id);
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['item_id'] = $answer->id;
+        $params['item_type'] = CommentModel::ITEM_ANSWER;
+        $params['published'] = CommentModel::PUBLISH_APPROVED;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $commentRepo = new CommentRepo();
+
+        $pager = $commentRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleComments($pager);
+    }
+
+}
diff --git a/app/Services/Logic/AnswerTrait.php b/app/Services/Logic/AnswerTrait.php
new file mode 100644
index 00000000..acf188ba
--- /dev/null
+++ b/app/Services/Logic/AnswerTrait.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Services\Logic;
+
+use App\Validators\Answer as AnswerValidator;
+
+trait AnswerTrait
+{
+
+    public function checkAnswer($id)
+    {
+        $validator = new AnswerValidator();
+
+        return $validator->checkAnswer($id);
+    }
+
+}
diff --git a/app/Services/Logic/Article/ArticleCreate.php b/app/Services/Logic/Article/ArticleCreate.php
new file mode 100644
index 00000000..616d7857
--- /dev/null
+++ b/app/Services/Logic/Article/ArticleCreate.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Services\Logic\Article;
+
+use App\Models\Article as ArticleModel;
+use App\Models\User as UserModel;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Service as LogicService;
+
+class ArticleCreate extends LogicService
+{
+
+    use ArticleDataTrait;
+
+    public function handle()
+    {
+        $post = $this->request->getPost();
+
+        $user = $this->getLoginUser();
+
+        $article = new ArticleModel();
+
+        $data = $this->handlePostData($post);
+
+        $data['published'] = $this->getPublishStatus($user);
+        $data['owner_id'] = $user->id;
+
+        $article->create($data);
+
+        if (isset($post['xm_tag_ids'])) {
+            $this->saveTags($article, $post['xm_tag_ids']);
+        }
+
+        $this->recountUserArticles($user);
+
+        $this->eventsManager->fire('Article:afterCreate', $this, $article);
+
+        return $article;
+    }
+
+    protected function getPublishStatus(UserModel $user)
+    {
+        return $user->article_count > 100 ? ArticleModel::PUBLISH_APPROVED : ArticleModel::PUBLISH_PENDING;
+    }
+
+    protected function recountUserArticles(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $articleCount = $userRepo->countArticles($user->id);
+
+        $user->article_count = $articleCount;
+
+        $user->update();
+    }
+
+}
diff --git a/app/Services/Logic/Article/ArticleDataTrait.php b/app/Services/Logic/Article/ArticleDataTrait.php
new file mode 100644
index 00000000..8dc2bfba
--- /dev/null
+++ b/app/Services/Logic/Article/ArticleDataTrait.php
@@ -0,0 +1,106 @@
+<?php
+
+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\Repos\ArticleTag as ArticleTagRepo;
+use App\Repos\Tag as TagRepo;
+use App\Traits\Client as ClientTrait;
+use App\Validators\Article as ArticleValidator;
+
+trait ArticleDataTrait
+{
+
+    use ClientTrait;
+
+    protected function handlePostData($post)
+    {
+        $data = [];
+
+        $validator = new ArticleValidator();
+
+        $data['title'] = $validator->checkTitle($post['title']);
+        $data['content'] = $validator->checkContent($post['content']);
+        $data['word_count'] = WordUtil::getWordCount($data['content']);
+
+        if (isset($post['category_id'])) {
+            $category = $validator->checkCategory($post['category_id']);
+            $data['category_id'] = $category->id;
+        }
+
+        if (isset($post['source_type'])) {
+            $data['source_type'] = $validator->checkSourceType($post['source_type']);
+            if ($post['source_type'] != ArticleModel::SOURCE_ORIGIN) {
+                $data['source_url'] = $validator->checkSourceUrl($post['source_url']);
+            }
+        }
+
+        if (isset($post['closed'])) {
+            $data['closed'] = $validator->checkCloseStatus($post['closed']);
+        }
+
+        if (isset($post['private'])) {
+            $data['private'] = $validator->checkPrivateStatus($post['private']);
+        }
+
+        return $data;
+    }
+
+    protected function saveTags(ArticleModel $article, $tagIds)
+    {
+        $originTagIds = [];
+
+        /**
+         * 修改数据后，afterFetch设置的属性会失效，重新执行
+         */
+        $article->afterFetch();
+
+        if ($article->tags) {
+            $originTagIds = kg_array_column($article->tags, 'id');
+        }
+
+        $newTagIds = $tagIds ? explode(',', $tagIds) : [];
+        $addedTagIds = array_diff($newTagIds, $originTagIds);
+
+        if ($addedTagIds) {
+            foreach ($addedTagIds as $tagId) {
+                $articleTag = new ArticleTagModel();
+                $articleTag->article_id = $article->id;
+                $articleTag->tag_id = $tagId;
+                $articleTag->create();
+            }
+        }
+
+        $deletedTagIds = array_diff($originTagIds, $newTagIds);
+
+        if ($deletedTagIds) {
+            $articleTagRepo = new ArticleTagRepo();
+            foreach ($deletedTagIds as $tagId) {
+                $articleTag = $articleTagRepo->findArticleTag($article->id, $tagId);
+                if ($articleTag) {
+                    $articleTag->delete();
+                }
+            }
+        }
+
+        $articleTags = [];
+
+        if ($newTagIds) {
+            $tagRepo = new TagRepo();
+            $tags = $tagRepo->findByIds($newTagIds);
+            if ($tags->count() > 0) {
+                $articleTags = [];
+                foreach ($tags as $tag) {
+                    $articleTags[] = ['id' => $tag->id, 'name' => $tag->name];
+                }
+            }
+        }
+
+        $article->tags = $articleTags;
+
+        $article->update();
+    }
+
+}
diff --git a/app/Services/Logic/Article/ArticleDelete.php b/app/Services/Logic/Article/ArticleDelete.php
new file mode 100644
index 00000000..3affcb7c
--- /dev/null
+++ b/app/Services/Logic/Article/ArticleDelete.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Services\Logic\Article;
+
+use App\Models\Article as ArticleModel;
+use App\Models\User as UserModel;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\ArticleTrait;
+use App\Services\Logic\Service as LogicService;
+use App\Services\Sync\ArticleIndex as ArticleIndexSync;
+use App\Validators\Article as ArticleValidator;
+
+class ArticleDelete extends LogicService
+{
+
+    use ArticleTrait;
+
+    public function handle($id)
+    {
+        $article = $this->checkArticle($id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new ArticleValidator();
+
+        $validator->checkOwner($user->id, $article->owner_id);
+
+        $article->deleted = 1;
+
+        $article->update();
+
+        $this->recountUserArticles($user);
+
+        $this->rebuildArticleIndex($article);
+
+        $this->eventsManager->fire('Article:afterDelete', $this, $article);
+    }
+
+    protected function recountUserArticles(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $articleCount = $userRepo->countArticles($user->id);
+
+        $user->article_count = $articleCount;
+
+        $user->update();
+    }
+
+    protected function rebuildArticleIndex(ArticleModel $article)
+    {
+        $sync = new ArticleIndexSync();
+
+        $sync->addItem($article->id);
+    }
+
+}
diff --git a/app/Services/Logic/Article/ArticleInfo.php b/app/Services/Logic/Article/ArticleInfo.php
index bbf6c933..29d9cb6a 100644
--- a/app/Services/Logic/Article/ArticleInfo.php
+++ b/app/Services/Logic/Article/ArticleInfo.php
@@ -51,7 +51,7 @@ class ArticleInfo extends LogicService
             'owner' => $owner,
             'me' => $me,
             'private' => $article->private,
-            'allow_comment' => $article->allow_comment,
+            'closed' => $article->closed,
             'source_type' => $article->source_type,
             'source_url' => $article->source_url,
             'word_count' => $article->word_count,
diff --git a/app/Services/Logic/Article/ArticleList.php b/app/Services/Logic/Article/ArticleList.php
index 07ffcd70..ae58b3ea 100644
--- a/app/Services/Logic/Article/ArticleList.php
+++ b/app/Services/Logic/Article/ArticleList.php
@@ -8,6 +8,7 @@ use App\Models\Article as ArticleModel;
 use App\Repos\Article as ArticleRepo;
 use App\Services\Logic\Service as LogicService;
 use App\Validators\ArticleQuery as ArticleQueryValidator;
+use Phalcon\Text;
 
 class ArticleList extends LogicService
 {
@@ -55,13 +56,15 @@ class ArticleList extends LogicService
 
         foreach ($articles as $article) {
 
-            $article['cover'] = $baseUrl . $article['cover'];
+            if (!empty($article['cover']) && !Text::startsWith($article['cover'], 'http')) {
+                $article['cover'] = $baseUrl . $article['cover'];
+            }
 
             if (empty($article['summary'])) {
                 $article['summary'] = kg_parse_summary($article['content']);
             }
 
-            $article['tags'] = json_decode($article['tags']);
+            $article['tags'] = json_decode($article['tags'], true);
 
             $category = $categories[$article['category_id']] ?? new \stdClass();
 
@@ -79,7 +82,7 @@ class ArticleList extends LogicService
                 'owner' => $owner,
                 'private' => $article['private'],
                 'published' => $article['published'],
-                'allow_comment' => $article['allow_comment'],
+                'closed' => $article['closed'],
                 'view_count' => $article['view_count'],
                 'like_count' => $article['like_count'],
                 'comment_count' => $article['comment_count'],
@@ -108,6 +111,10 @@ class ArticleList extends LogicService
             $query['tag_id'] = $validator->checkTag($params['tag_id']);
         }
 
+        if (isset($params['sort'])) {
+            $query['sort'] = $validator->checkSort($params['sort']);
+        }
+
         return $query;
     }
 
diff --git a/app/Services/Logic/Article/ArticleUpdate.php b/app/Services/Logic/Article/ArticleUpdate.php
new file mode 100644
index 00000000..9046a313
--- /dev/null
+++ b/app/Services/Logic/Article/ArticleUpdate.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Services\Logic\Article;
+
+use App\Models\Article as ArticleModel;
+use App\Services\Logic\ArticleTrait;
+use App\Services\Logic\Service as LogicService;
+
+class ArticleUpdate extends LogicService
+{
+
+    use ArticleTrait;
+    use ArticleDataTrait;
+
+    public function handle($id)
+    {
+        $post = $this->request->getPost();
+
+        $article = $this->checkArticle($id);
+
+        $data = $this->handlePostData($post);
+
+        if ($article->published == ArticleModel::PUBLISH_REJECTED) {
+            $data['published'] = ArticleModel::PUBLISH_PENDING;
+        }
+
+        /**
+         * 当通过审核后，禁止修改部分文章属性
+         */
+        if ($article->published == ArticleModel::PUBLISH_APPROVED) {
+            unset(
+                $data['title'],
+                $data['content'],
+                $data['source_type'],
+                $data['source_url'],
+                $data['category_id'],
+                $post['xm_tag_ids'],
+            );
+        }
+
+        $article->update($data);
+
+        if (isset($post['xm_tag_ids'])) {
+            $this->saveTags($article, $post['xm_tag_ids']);
+        }
+
+        $this->eventsManager->fire('Article:afterUpdate', $this, $article);
+
+        return $article;
+    }
+
+}
diff --git a/app/Services/Logic/Article/RelatedArticleList.php b/app/Services/Logic/Article/RelatedArticleList.php
new file mode 100644
index 00000000..d1049632
--- /dev/null
+++ b/app/Services/Logic/Article/RelatedArticleList.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Services\Logic\Article;
+
+use App\Caches\TaggedArticleList as TaggedArticleListCache;
+use App\Services\Logic\ArticleTrait;
+use App\Services\Logic\Service as LogicService;
+
+class RelatedArticleList extends LogicService
+{
+
+    use ArticleTrait;
+
+    public function handle($id)
+    {
+        $article = $this->checkArticle($id);
+
+        if (empty($article->tags)) return [];
+
+        $tagIds = kg_array_column($article->tags, 'id');
+
+        $randKey = array_rand($tagIds);
+
+        $tagId = $tagIds[$randKey];
+
+        $cache = new TaggedArticleListCache();
+
+        $result = $cache->get($tagId);
+
+        return $result ?: [];
+    }
+
+}
diff --git a/app/Services/Logic/Article/RelatedList.php b/app/Services/Logic/Article/RelatedList.php
deleted file mode 100644
index adb82af5..00000000
--- a/app/Services/Logic/Article/RelatedList.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Services\Logic\Article;
-
-use App\Caches\ArticleRelatedList as ArticleRelatedListCache;
-use App\Services\Logic\Service as LogicService;
-
-class RelatedList extends LogicService
-{
-
-    public function handle($id)
-    {
-        $cache = new ArticleRelatedListCache();
-
-        $result = $cache->get($id);
-
-        return $result ?: [];
-    }
-
-}
diff --git a/app/Services/Logic/Comment/CommentCountTrait.php b/app/Services/Logic/Comment/CommentCountTrait.php
index a4407656..25ee8079 100644
--- a/app/Services/Logic/Comment/CommentCountTrait.php
+++ b/app/Services/Logic/Comment/CommentCountTrait.php
@@ -6,6 +6,8 @@ use App\Models\Article as ArticleModel;
 use App\Models\Chapter as ChapterModel;
 use App\Models\Comment as CommentModel;
 use App\Models\User as UserModel;
+use App\Services\Logic\ArticleTrait;
+use App\Services\Logic\ChapterTrait;
 use App\Services\Logic\Notice\System\ArticleCommented as ArticleCommentedNotice;
 use App\Services\Logic\Notice\System\ChapterCommented as ChapterCommentedNotice;
 use Phalcon\Di as Di;
@@ -14,6 +16,9 @@ use Phalcon\Events\Manager as EventsManager;
 trait CommentCountTrait
 {
 
+    use ArticleTrait;
+    use ChapterTrait;
+
     protected function incrItemCommentCount(CommentModel $comment)
     {
         if ($comment->item_type == CommentModel::ITEM_CHAPTER) {
diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php
index ff6d8260..6336a490 100644
--- a/app/Services/Logic/Consult/ConsultCreate.php
+++ b/app/Services/Logic/Consult/ConsultCreate.php
@@ -6,6 +6,8 @@ use App\Models\Chapter as ChapterModel;
 use App\Models\Consult as ConsultModel;
 use App\Models\Course as CourseModel;
 use App\Models\User as UserModel;
+use App\Repos\Chapter as ChapterRepo;
+use App\Repos\Course as CourseRepo;
 use App\Services\Logic\ChapterTrait;
 use App\Services\Logic\CourseTrait;
 use App\Services\Logic\Notice\DingTalk\ConsultCreate as ConsultCreateNotice;
@@ -76,10 +78,8 @@ class ConsultCreate extends LogicService
 
         $consult->create();
 
-        $this->incrCourseConsultCount($course);
-
+        $this->recountCourseConsults($course);
         $this->incrUserDailyConsultCount($user);
-
         $this->handleConsultCreateNotice($consult);
 
         $this->eventsManager->fire('Consult:afterCreate', $this, $consult);
@@ -116,12 +116,9 @@ class ConsultCreate extends LogicService
 
         $consult->create();
 
-        $this->incrCourseConsultCount($course);
-
-        $this->incrChapterConsultCount($chapter);
-
+        $this->recountCourseConsults($course);
+        $this->recountChapterConsults($chapter);
         $this->incrUserDailyConsultCount($user);
-
         $this->handleConsultCreateNotice($consult);
 
         $this->eventsManager->fire('Consult:afterCreate', $this, $consult);
@@ -146,16 +143,24 @@ class ConsultCreate extends LogicService
         return $priority;
     }
 
-    protected function incrCourseConsultCount(CourseModel $course)
+    protected function recountCourseConsults(CourseModel $course)
     {
-        $course->consult_count += 1;
+        $courseRepo = new CourseRepo();
+
+        $consultCount = $courseRepo->countConsults($course->id);
+
+        $course->consult_count = $consultCount;
 
         $course->update();
     }
 
-    protected function incrChapterConsultCount(ChapterModel $chapter)
+    protected function recountChapterConsults(ChapterModel $chapter)
     {
-        $chapter->consult_count += 1;
+        $chapterRepo = new ChapterRepo();
+
+        $consultCount = $chapterRepo->countConsults($chapter->id);
+
+        $chapter->consult_count = $consultCount;
 
         $chapter->update();
     }
diff --git a/app/Services/Logic/Consult/ConsultDelete.php b/app/Services/Logic/Consult/ConsultDelete.php
index 26aaee0a..42ab290a 100644
--- a/app/Services/Logic/Consult/ConsultDelete.php
+++ b/app/Services/Logic/Consult/ConsultDelete.php
@@ -4,6 +4,8 @@ namespace App\Services\Logic\Consult;
 
 use App\Models\Chapter as ChapterModel;
 use App\Models\Course as CourseModel;
+use App\Repos\Chapter as ChapterRepo;
+use App\Repos\Course as CourseRepo;
 use App\Services\Logic\ChapterTrait;
 use App\Services\Logic\ConsultTrait;
 use App\Services\Logic\CourseTrait;
@@ -35,33 +37,39 @@ class ConsultDelete extends LogicService
 
             $course = $this->checkCourse($consult->course_id);
 
-            $this->decrCourseConsultCount($course);
+            $this->recountCourseConsults($course);
         }
 
         if ($consult->chapter_id > 0) {
 
             $chapter = $this->checkChapter($consult->chapter_id);
 
-            $this->decrChapterConsultCount($chapter);
+            $this->recountChapterConsults($chapter);
         }
 
         $this->eventsManager->fire('Consult:afterDelete', $this, $consult);
     }
 
-    protected function decrCourseConsultCount(CourseModel $course)
+    protected function recountCourseConsults(CourseModel $course)
     {
-        if ($course->consult_count > 0) {
-            $course->consult_count -= 1;
-            $course->update();
-        }
+        $courseRepo = new CourseRepo();
+
+        $consultCount = $courseRepo->countConsults($course->id);
+
+        $course->consult_count = $consultCount;
+
+        $course->update();
     }
 
-    protected function decrChapterConsultCount(ChapterModel $chapter)
+    protected function recountChapterConsults(ChapterModel $chapter)
     {
-        if ($chapter->consult_count > 0) {
-            $chapter->consult_count -= 1;
-            $chapter->update();
-        }
+        $chapterRepo = new ChapterRepo();
+
+        $consultCount = $chapterRepo->countConsults($chapter->id);
+
+        $chapter->consult_count = $consultCount;
+
+        $chapter->update();
     }
 
 }
diff --git a/app/Services/Logic/Course/CourseList.php b/app/Services/Logic/Course/CourseList.php
index 95b2432e..627b28f3 100644
--- a/app/Services/Logic/Course/CourseList.php
+++ b/app/Services/Logic/Course/CourseList.php
@@ -108,6 +108,10 @@ class CourseList extends LogicService
             $query['level'] = $validator->checkLevel($params['level']);
         }
 
+        if (isset($params['sort'])) {
+            $query['sort'] = $validator->checkSort($params['sort']);
+        }
+
         return $query;
     }
 
diff --git a/app/Services/Logic/Notice/System/AnswerAccepted.php b/app/Services/Logic/Notice/System/AnswerAccepted.php
new file mode 100644
index 00000000..3acd421a
--- /dev/null
+++ b/app/Services/Logic/Notice/System/AnswerAccepted.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\Notification as NotificationModel;
+use App\Models\User as UserModel;
+use App\Repos\Question as QuestionRepo;
+use App\Services\Logic\Service as LogicService;
+
+class AnswerAccepted extends LogicService
+{
+
+    public function handle(AnswerModel $answer, UserModel $sender)
+    {
+        $answerSummary = kg_substr($answer->summary, 0, 32);
+
+        $questionRepo = new QuestionRepo();
+
+        $question = $questionRepo->findById($answer->question_id);
+
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $sender->id;
+        $notification->receiver_id = $answer->owner_id;
+        $notification->event_id = $answer->id;
+        $notification->event_type = NotificationModel::TYPE_ANSWER_ACCEPTED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+            'answer' => ['id' => $answer->id, 'summary' => $answerSummary],
+        ];
+
+        $notification->create();
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/AnswerApproved.php b/app/Services/Logic/Notice/System/AnswerApproved.php
new file mode 100644
index 00000000..4c882c43
--- /dev/null
+++ b/app/Services/Logic/Notice/System/AnswerApproved.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\Notification as NotificationModel;
+use App\Models\User as UserModel;
+use App\Repos\Question as QuestionRepo;
+use App\Services\Logic\Service as LogicService;
+
+class AnswerApproved extends LogicService
+{
+
+    public function handle(AnswerModel $answer, UserModel $sender)
+    {
+        $answerSummary = kg_substr($answer->summary, 0, 32);
+
+        $question = $this->findQuestion($answer->question_id);
+
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $sender->id;
+        $notification->receiver_id = $answer->owner_id;
+        $notification->event_id = $answer->id;
+        $notification->event_type = NotificationModel::TYPE_ANSWER_APPROVED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+            'answer' => ['id' => $answer->id, 'summary' => $answerSummary],
+        ];
+
+        $notification->create();
+    }
+
+    protected function findQuestion($id)
+    {
+        $questionRepo = new QuestionRepo();
+
+        return $questionRepo->findById($id);
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/AnswerLiked.php b/app/Services/Logic/Notice/System/AnswerLiked.php
new file mode 100644
index 00000000..40c826ae
--- /dev/null
+++ b/app/Services/Logic/Notice/System/AnswerLiked.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\Notification as NotificationModel;
+use App\Models\User as UserModel;
+use App\Repos\Question as QuestionRepo;
+use App\Services\Logic\Service as LogicService;
+
+class AnswerLiked extends LogicService
+{
+
+    public function handle(AnswerModel $answer, UserModel $sender)
+    {
+        $answerSummary = kg_substr($answer->summary, 0, 32);
+
+        $questionRepo = new QuestionRepo();
+
+        $question = $questionRepo->findById($answer->question_id);
+
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $sender->id;
+        $notification->receiver_id = $answer->owner_id;
+        $notification->event_id = $answer->id;
+        $notification->event_type = NotificationModel::TYPE_ANSWER_LIKED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+            'answer' => ['id' => $answer->id, 'summary' => $answerSummary],
+        ];
+
+        $notification->create();
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/AnswerRejected.php b/app/Services/Logic/Notice/System/AnswerRejected.php
new file mode 100644
index 00000000..1df58962
--- /dev/null
+++ b/app/Services/Logic/Notice/System/AnswerRejected.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\Notification as NotificationModel;
+use App\Models\User as UserModel;
+use App\Repos\Question as QuestionRepo;
+use App\Services\Logic\Service as LogicService;
+
+class AnswerRejected extends LogicService
+{
+
+    public function handle(AnswerModel $answer, UserModel $sender, $reason)
+    {
+        $answerSummary = kg_substr($answer->summary, 0, 32);
+
+        $question = $this->findQuestion($answer->question_id);
+
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $sender->id;
+        $notification->receiver_id = $answer->owner_id;
+        $notification->event_id = $answer->id;
+        $notification->event_type = NotificationModel::TYPE_ANSWER_REJECTED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+            'answer' => ['id' => $answer->id, 'summary' => $answerSummary],
+            'reason' => $reason,
+        ];
+
+        $notification->create();
+    }
+
+    protected function findQuestion($id)
+    {
+        $questionRepo = new QuestionRepo();
+
+        return $questionRepo->findById($id);
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/ArticleCommented.php b/app/Services/Logic/Notice/System/ArticleCommented.php
index 4bf1b412..7f5927e7 100644
--- a/app/Services/Logic/Notice/System/ArticleCommented.php
+++ b/app/Services/Logic/Notice/System/ArticleCommented.php
@@ -13,7 +13,7 @@ class ArticleCommented extends LogicService
 
     public function handle(CommentModel $comment)
     {
-        $comment->content = kg_substr($comment->content, 0, 32);
+        $commentContent = kg_substr($comment->content, 0, 32);
 
         $article = $this->findArticle($comment->item_id);
 
@@ -25,7 +25,7 @@ class ArticleCommented extends LogicService
         $notification->event_type = NotificationModel::TYPE_ARTICLE_COMMENTED;
         $notification->event_info = [
             'article' => ['id' => $article->id, 'title' => $article->title],
-            'comment' => ['id' => $comment->id, 'content' => $comment->content],
+            'comment' => ['id' => $comment->id, 'content' => $commentContent],
         ];
 
         $notification->create();
diff --git a/app/Services/Logic/Notice/System/CommentLiked.php b/app/Services/Logic/Notice/System/CommentLiked.php
index 538f7dfe..8a771b4c 100644
--- a/app/Services/Logic/Notice/System/CommentLiked.php
+++ b/app/Services/Logic/Notice/System/CommentLiked.php
@@ -12,7 +12,7 @@ class CommentLiked extends LogicService
 
     public function handle(CommentModel $comment, UserModel $sender)
     {
-        $comment->content = kg_substr($comment->content, 0, 32);
+        $commentContent = kg_substr($comment->content, 0, 32);
 
         $notification = new NotificationModel();
 
@@ -22,7 +22,7 @@ class CommentLiked extends LogicService
         $notification->event_type = NotificationModel::TYPE_COMMENT_LIKED;
         $notification->event_info = [
             'sender' => ['id' => $sender->id, 'name' => $sender->name],
-            'comment' => ['id' => $comment->id, 'content' => $comment->content],
+            'comment' => ['id' => $comment->id, 'content' => $commentContent],
         ];
 
         $notification->create();
diff --git a/app/Services/Logic/Notice/System/CommentReplied.php b/app/Services/Logic/Notice/System/CommentReplied.php
index 3c41f672..b4d87513 100644
--- a/app/Services/Logic/Notice/System/CommentReplied.php
+++ b/app/Services/Logic/Notice/System/CommentReplied.php
@@ -13,11 +13,11 @@ class CommentReplied extends LogicService
 
     public function handle(CommentModel $reply)
     {
-        $reply->content = kg_substr($reply->content, 0, 32);
+        $replyContent = kg_substr($reply->content, 0, 32);
 
         $comment = $this->findComment($reply->parent_id);
 
-        $comment->content = kg_substr($comment->content, 0, 32);
+        $commentContent = kg_substr($comment->content, 0, 32);
 
         $notification = new NotificationModel();
 
@@ -26,8 +26,8 @@ class CommentReplied extends LogicService
         $notification->event_id = $reply->id;
         $notification->event_type = NotificationModel::TYPE_COMMENT_REPLIED;
         $notification->event_info = [
-            'comment' => ['id' => $comment->id, 'content' => $comment->content],
-            'reply' => ['id' => $reply->id, 'content' => $reply->content],
+            'comment' => ['id' => $comment->id, 'content' => $commentContent],
+            'reply' => ['id' => $reply->id, 'content' => $replyContent],
         ];
 
         $notification->create();
diff --git a/app/Services/Logic/Notice/System/ConsultLiked.php b/app/Services/Logic/Notice/System/ConsultLiked.php
index 759d9661..1503454b 100644
--- a/app/Services/Logic/Notice/System/ConsultLiked.php
+++ b/app/Services/Logic/Notice/System/ConsultLiked.php
@@ -13,7 +13,7 @@ class ConsultLiked extends LogicService
 
     public function handle(ConsultModel $consult, UserModel $sender)
     {
-        $consult->question = kg_substr($consult->question, 0, 32);
+        $consultQuestion = kg_substr($consult->question, 0, 32);
 
         $course = $this->findCourse($consult->course_id);
 
@@ -25,7 +25,7 @@ class ConsultLiked extends LogicService
         $notification->event_type = NotificationModel::TYPE_CONSULT_LIKED;
         $notification->event_info = [
             'course' => ['id' => $course->id, 'title' => $course->title],
-            'consult' => ['id' => $consult->id, 'question' => $consult->question],
+            'consult' => ['id' => $consult->id, 'question' => $consultQuestion],
         ];
 
         $notification->create();
diff --git a/app/Services/Logic/Notice/System/QuestionAnswered.php b/app/Services/Logic/Notice/System/QuestionAnswered.php
new file mode 100644
index 00000000..a263b376
--- /dev/null
+++ b/app/Services/Logic/Notice/System/QuestionAnswered.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\Notification as NotificationModel;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Service as LogicService;
+
+class QuestionAnswered extends LogicService
+{
+
+    public function handle(AnswerModel $answer)
+    {
+        $answerSummary = kg_substr($answer->summary, 0, 32);
+
+        $question = $this->findQuestion($answer->question_id);
+
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $answer->owner_id;
+        $notification->receiver_id = $question->owner_id;
+        $notification->event_id = $answer->id;
+        $notification->event_type = NotificationModel::TYPE_QUESTION_ANSWERED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+            'answer' => ['id' => $answer->id, 'summary' => $answerSummary],
+        ];
+
+        $notification->create();
+    }
+
+    protected function findQuestion($id)
+    {
+        $questionRepo = new QuestionRepo();
+
+        return $questionRepo->findById($id);
+    }
+
+    protected function findUser($id)
+    {
+        $userRepo = new UserRepo();
+
+        return $userRepo->findById($id);
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/QuestionApproved.php b/app/Services/Logic/Notice/System/QuestionApproved.php
new file mode 100644
index 00000000..6eecd4c1
--- /dev/null
+++ b/app/Services/Logic/Notice/System/QuestionApproved.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Notification as NotificationModel;
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Services\Logic\Service as LogicService;
+
+class QuestionApproved extends LogicService
+{
+
+    public function handle(QuestionModel $question, UserModel $sender)
+    {
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $sender->id;
+        $notification->receiver_id = $question->owner_id;
+        $notification->event_id = $question->id;
+        $notification->event_type = NotificationModel::TYPE_QUESTION_APPROVED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+        ];
+
+        $notification->create();
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/QuestionFavorited.php b/app/Services/Logic/Notice/System/QuestionFavorited.php
new file mode 100644
index 00000000..c47c06b0
--- /dev/null
+++ b/app/Services/Logic/Notice/System/QuestionFavorited.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Notification as NotificationModel;
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Services\Logic\Service as LogicService;
+
+class QuestionFavorited extends LogicService
+{
+
+    public function handle(QuestionModel $question, UserModel $sender)
+    {
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $sender->id;
+        $notification->receiver_id = $question->owner_id;
+        $notification->event_id = $question->id;
+        $notification->event_type = NotificationModel::TYPE_QUESTION_FAVORITED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+        ];
+
+        $notification->create();
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/QuestionLiked.php b/app/Services/Logic/Notice/System/QuestionLiked.php
new file mode 100644
index 00000000..622e4e55
--- /dev/null
+++ b/app/Services/Logic/Notice/System/QuestionLiked.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Notification as NotificationModel;
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Services\Logic\Service as LogicService;
+
+class QuestionLiked extends LogicService
+{
+
+    public function handle(QuestionModel $question, UserModel $sender)
+    {
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $sender->id;
+        $notification->receiver_id = $question->owner_id;
+        $notification->event_id = $question->id;
+        $notification->event_type = NotificationModel::TYPE_QUESTION_LIKED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+        ];
+
+        $notification->create();
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/QuestionRejected.php b/app/Services/Logic/Notice/System/QuestionRejected.php
new file mode 100644
index 00000000..e2711f6d
--- /dev/null
+++ b/app/Services/Logic/Notice/System/QuestionRejected.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Services\Logic\Notice\System;
+
+use App\Models\Notification as NotificationModel;
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Services\Logic\Service as LogicService;
+
+class QuestionRejected extends LogicService
+{
+
+    public function handle(QuestionModel $question, UserModel $sender, $reason = null)
+    {
+        $notification = new NotificationModel();
+
+        $notification->sender_id = $sender->id;
+        $notification->receiver_id = $question->owner_id;
+        $notification->event_id = $question->id;
+        $notification->event_type = NotificationModel::TYPE_QUESTION_REJECTED;
+        $notification->event_info = [
+            'question' => ['id' => $question->id, 'title' => $question->title],
+            'reason' => $reason ?: '',
+        ];
+
+        $notification->create();
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/ReviewLiked.php b/app/Services/Logic/Notice/System/ReviewLiked.php
index 9de50536..23fce6b9 100644
--- a/app/Services/Logic/Notice/System/ReviewLiked.php
+++ b/app/Services/Logic/Notice/System/ReviewLiked.php
@@ -13,7 +13,7 @@ class ReviewLiked extends LogicService
 
     public function handle(ReviewModel $review, UserModel $sender)
     {
-        $review->content = kg_substr($review->content, 0, 32);
+        $reviewContent = kg_substr($review->content, 0, 32);
 
         $course = $this->findCourse($review->course_id);
 
@@ -25,7 +25,7 @@ class ReviewLiked extends LogicService
         $notification->event_type = NotificationModel::TYPE_REVIEW_LIKED;
         $notification->event_info = [
             'course' => ['id' => $course->id, 'title' => $course->title],
-            'review' => ['id' => $review->id, 'content' => $review->content],
+            'review' => ['id' => $review->id, 'content' => $reviewContent],
         ];
 
         $notification->create();
diff --git a/app/Services/Logic/Point/History/AnswerAccepted.php b/app/Services/Logic/Point/History/AnswerAccepted.php
new file mode 100644
index 00000000..927a9e1c
--- /dev/null
+++ b/app/Services/Logic/Point/History/AnswerAccepted.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Services\Logic\Point\History;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\PointHistory as PointHistoryModel;
+use App\Repos\PointHistory as PointHistoryRepo;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Point\PointHistory;
+
+class AnswerAccepted extends PointHistory
+{
+
+    public function handle(AnswerModel $answer)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['answer_accepted']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['answer_accepted']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $eventId = $answer->id;
+        $eventType = PointHistoryModel::EVENT_ANSWER_ACCEPTED;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        $questionRepo = new QuestionRepo();
+
+        $question = $questionRepo->findById($answer->question_id);
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($answer->owner_id);
+
+        $eventInfo = [
+            'question' => [
+                'id' => $question->id,
+                'title' => $question->title,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_info = $eventInfo;
+        $history->event_point = $eventPoint;
+
+        $this->handlePointHistory($history);
+    }
+
+}
diff --git a/app/Services/Logic/Point/History/AnswerLiked.php b/app/Services/Logic/Point/History/AnswerLiked.php
new file mode 100644
index 00000000..1c1451a1
--- /dev/null
+++ b/app/Services/Logic/Point/History/AnswerLiked.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Services\Logic\Point\History;
+
+use App\Models\AnswerLike as AnswerLikeModel;
+use App\Models\PointHistory as PointHistoryModel;
+use App\Repos\Answer as AnswerRepo;
+use App\Repos\PointHistory as PointHistoryRepo;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Point\PointHistory;
+
+class AnswerLiked extends PointHistory
+{
+
+    public function handle(AnswerLikeModel $answerLike)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['answer_liked']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['answer_liked']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $dailyPointLimit = $eventRule['answer_liked']['limit'] ?? 0;
+
+        if ($dailyPointLimit <= 0) return;
+
+        $eventId = $answerLike->id;
+        $eventType = PointHistoryModel::EVENT_ANSWER_LIKED;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        $answerRepo = new AnswerRepo();
+
+        $answer = $answerRepo->findById($answerLike->answer_id);
+
+        /**
+         * @todo 使用缓存优化
+         */
+        $dailyPoints = $historyRepo->sumUserDailyEventPoints($answer->owner_id, $eventType, date('Ymd'));
+
+        if ($dailyPoints >= $dailyPointLimit) return;
+
+        $questionRepo = new QuestionRepo();
+
+        $question = $questionRepo->findById($answer->question_id);
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($answer->owner_id);
+
+        $eventInfo = [
+            'question' => [
+                'id' => $question->id,
+                'title' => $question->title,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_info = $eventInfo;
+        $history->event_point = $eventPoint;
+
+        $this->handlePointHistory($history);
+    }
+
+}
diff --git a/app/Services/Logic/Point/History/AnswerPost.php b/app/Services/Logic/Point/History/AnswerPost.php
new file mode 100644
index 00000000..3f4da0e4
--- /dev/null
+++ b/app/Services/Logic/Point/History/AnswerPost.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Services\Logic\Point\History;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\PointHistory as PointHistoryModel;
+use App\Repos\PointHistory as PointHistoryRepo;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Point\PointHistory;
+
+class AnswerPost extends PointHistory
+{
+
+    public function handle(AnswerModel $answer)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['answer_post']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['answer_post']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $dailyPointLimit = $eventRule['answer_post']['limit'] ?? 0;
+
+        if ($dailyPointLimit <= 0) return;
+
+        $eventId = $answer->id;
+        $eventType = PointHistoryModel::EVENT_ANSWER_POST;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        /**
+         * @todo 使用缓存优化
+         */
+        $dailyPoints = $historyRepo->sumUserDailyEventPoints($answer->owner_id, $eventType, date('Ymd'));
+
+        if ($dailyPoints >= $dailyPointLimit) return;
+
+        $questionRepo = new QuestionRepo();
+
+        $question = $questionRepo->findById($answer->question_id);
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($answer->owner_id);
+
+        $eventInfo = [
+            'question' => [
+                'id' => $question->id,
+                'title' => $question->title,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_info = $eventInfo;
+        $history->event_point = $eventPoint;
+
+        $this->handlePointHistory($history);
+    }
+
+}
diff --git a/app/Services/Logic/Point/History/QuestionPost.php b/app/Services/Logic/Point/History/QuestionPost.php
new file mode 100644
index 00000000..3434dc14
--- /dev/null
+++ b/app/Services/Logic/Point/History/QuestionPost.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Services\Logic\Point\History;
+
+use App\Models\PointHistory as PointHistoryModel;
+use App\Models\Question as QuestionModel;
+use App\Repos\PointHistory as PointHistoryRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Point\PointHistory;
+
+class QuestionPost extends PointHistory
+{
+
+    public function handle(QuestionModel $question)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['question_post']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['question_post']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $dailyPointLimit = $eventRule['question_post']['limit'] ?? 0;
+
+        if ($dailyPointLimit <= 0) return;
+
+        $eventId = $question->id;
+        $eventType = PointHistoryModel::EVENT_QUESTION_POST;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        /**
+         * @todo 使用缓存优化
+         */
+        $dailyPoints = $historyRepo->sumUserDailyEventPoints($question->owner_id, $eventType, date('Ymd'));
+
+        if ($dailyPoints >= $dailyPointLimit) return;
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($question->owner_id);
+
+        $eventInfo = [
+            'question' => [
+                'id' => $question->id,
+                'title' => $question->title,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_info = $eventInfo;
+        $history->event_point = $eventPoint;
+
+        $this->handlePointHistory($history);
+    }
+
+}
diff --git a/app/Services/Logic/Question/AnswerList.php b/app/Services/Logic/Question/AnswerList.php
new file mode 100644
index 00000000..04e42a8e
--- /dev/null
+++ b/app/Services/Logic/Question/AnswerList.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Builders\AnswerList as AnswerListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Question as QuestionModel;
+use App\Repos\Answer as AnswerRepo;
+use App\Repos\AnswerLike as AnswerLikeRepo;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+
+class AnswerList extends LogicService
+{
+
+    use QuestionTrait;
+
+    public function handle($id)
+    {
+        $question = $this->checkQuestion($id);
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['question_id'] = $question->id;
+        $params['published'] = QuestionModel::PUBLISH_APPROVED;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $answerRepo = new AnswerRepo();
+
+        $pager = $answerRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleAnswers($pager);
+    }
+
+    protected function handleAnswers($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new AnswerListBuilder();
+
+        $answers = $pager->items->toArray();
+
+        $users = $builder->getUsers($answers);
+
+        $meMappings = $this->getMeMappings($answers);
+
+        $items = [];
+
+        foreach ($answers as $answer) {
+
+            $answer['content'] = kg_parse_markdown($answer['content']);
+
+            $owner = $users[$answer['owner_id']] ?? new \stdClass();
+            $me = $meMappings[$answer['id']];
+
+            $items[] = [
+                'id' => $answer['id'],
+                'content' => $answer['content'],
+                'anonymous' => $answer['anonymous'],
+                'accepted' => $answer['accepted'],
+                'published' => $answer['published'],
+                'like_count' => $answer['like_count'],
+                'comment_count' => $answer['comment_count'],
+                'create_time' => $answer['create_time'],
+                'update_time' => $answer['update_time'],
+                'owner' => $owner,
+                'me' => $me,
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+    protected function getMeMappings($answers)
+    {
+        $user = $this->getCurrentUser(true);
+
+        $likeRepo = new AnswerLikeRepo();
+
+        $likedIds = [];
+
+        if ($user->id > 0) {
+            $likes = $likeRepo->findByUserId($user->id);
+            $likedIds = array_column($likes->toArray(), 'answer_id');
+        }
+
+        $result = [];
+
+        foreach ($answers as $answer) {
+            $result[$answer['id']] = [
+                'liked' => in_array($answer['id'], $likedIds) ? 1 : 0,
+            ];
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Services/Logic/Question/CommentList.php b/app/Services/Logic/Question/CommentList.php
new file mode 100644
index 00000000..30fac4d9
--- /dev/null
+++ b/app/Services/Logic/Question/CommentList.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Comment as CommentModel;
+use App\Repos\Comment as CommentRepo;
+use App\Services\Logic\Comment\CommentListTrait;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+
+class CommentList extends LogicService
+{
+
+    use QuestionTrait;
+    use CommentListTrait;
+
+    public function handle($id)
+    {
+        $question = $this->checkQuestion($id);
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['item_id'] = $question->id;
+        $params['item_type'] = CommentModel::ITEM_QUESTION;
+        $params['published'] = CommentModel::PUBLISH_APPROVED;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $commentRepo = new CommentRepo();
+
+        $pager = $commentRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleComments($pager);
+    }
+
+}
diff --git a/app/Services/Logic/Question/HotQuestionList.php b/app/Services/Logic/Question/HotQuestionList.php
new file mode 100644
index 00000000..2de98e72
--- /dev/null
+++ b/app/Services/Logic/Question/HotQuestionList.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Caches\HotQuestionList as HotQuestionListCache;
+use App\Services\Logic\Service as LogicService;
+
+class HotQuestionList extends LogicService
+{
+
+    public function handle()
+    {
+        $cache = new HotQuestionListCache();
+
+        $result = $cache->get();
+
+        return $result ?: [];
+    }
+
+}
diff --git a/app/Services/Logic/Question/QuestionCreate.php b/app/Services/Logic/Question/QuestionCreate.php
new file mode 100644
index 00000000..96cd6b92
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionCreate.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Service as LogicService;
+
+class QuestionCreate extends LogicService
+{
+
+    use QuestionDataTrait;
+
+    public function handle()
+    {
+        $post = $this->request->getPost();
+
+        $user = $this->getLoginUser();
+
+        $question = new QuestionModel();
+
+        $data = $this->handlePostData($post);
+
+        $data['owner_id'] = $user->id;
+
+        $question->create($data);
+
+        if (isset($post['xm_tag_ids'])) {
+            $this->saveTags($question, $post['xm_tag_ids']);
+        }
+
+        $this->recountUserQuestions($user);
+
+        $this->eventsManager->fire('Question:afterCreate', $this, $question);
+
+        return $question;
+    }
+
+    protected function getPublishStatus(UserModel $user)
+    {
+        return $user->question_count > 3 ? QuestionModel::PUBLISH_APPROVED : QuestionModel::PUBLISH_PENDING;
+    }
+
+    protected function recountUserQuestions(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $questionCount = $userRepo->countQuestions($user->id);
+
+        $user->question_count = $questionCount;
+
+        $user->update();
+    }
+
+}
diff --git a/app/Services/Logic/Question/QuestionDataTrait.php b/app/Services/Logic/Question/QuestionDataTrait.php
new file mode 100644
index 00000000..b412332a
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionDataTrait.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Models\Question as QuestionModel;
+use App\Models\QuestionTag as QuestionTagModel;
+use App\Repos\QuestionTag as QuestionTagRepo;
+use App\Repos\Tag as TagRepo;
+use App\Traits\Client as ClientTrait;
+use App\Validators\Question as QuestionValidator;
+
+trait QuestionDataTrait
+{
+
+    use ClientTrait;
+
+    protected function handlePostData($post)
+    {
+        $data = [];
+
+        $data['client_type'] = $this->getClientType();
+        $data['client_ip'] = $this->getClientIp();
+
+        $validator = new QuestionValidator();
+
+        $data['title'] = $validator->checkTitle($post['title']);
+        $data['content'] = $validator->checkContent($post['content']);
+
+        if (isset($post['closed'])) {
+            $data['closed'] = $validator->checkCloseStatus($post['closed']);
+        }
+
+        if (isset($post['anonymous'])) {
+            $data['anonymous'] = $validator->checkAnonymousStatus($post['anonymous']);
+        }
+
+        return $data;
+    }
+    
+    protected function saveTags(QuestionModel $question, $tagIds)
+    {
+        $originTagIds = [];
+
+        /**
+         * 修改数据后，afterFetch设置的属性会失效，重新执行
+         */
+        $question->afterFetch();
+
+        if ($question->tags) {
+            $originTagIds = kg_array_column($question->tags, 'id');
+        }
+
+        $newTagIds = $tagIds ? explode(',', $tagIds) : [];
+        $addedTagIds = array_diff($newTagIds, $originTagIds);
+
+        if ($addedTagIds) {
+            foreach ($addedTagIds as $tagId) {
+                $questionTag = new QuestionTagModel();
+                $questionTag->question_id = $question->id;
+                $questionTag->tag_id = $tagId;
+                $questionTag->create();
+            }
+        }
+
+        $deletedTagIds = array_diff($originTagIds, $newTagIds);
+
+        if ($deletedTagIds) {
+            $questionTagRepo = new QuestionTagRepo();
+            foreach ($deletedTagIds as $tagId) {
+                $questionTag = $questionTagRepo->findQuestionTag($question->id, $tagId);
+                if ($questionTag) {
+                    $questionTag->delete();
+                }
+            }
+        }
+
+        $questionTags = [];
+
+        if ($newTagIds) {
+            $tagRepo = new TagRepo();
+            $tags = $tagRepo->findByIds($newTagIds);
+            if ($tags->count() > 0) {
+                $questionTags = [];
+                foreach ($tags as $tag) {
+                    $questionTags[] = ['id' => $tag->id, 'name' => $tag->name];
+                }
+            }
+        }
+
+        $question->tags = $questionTags;
+
+        $question->update();
+
+        /**
+         * 重新执行afterFetch
+         */
+        $question->afterFetch();
+    }
+
+}
diff --git a/app/Services/Logic/Question/QuestionDelete.php b/app/Services/Logic/Question/QuestionDelete.php
new file mode 100644
index 00000000..85b720bc
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionDelete.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+use App\Services\Sync\QuestionIndex as QuestionIndexSync;
+use App\Validators\Question as QuestionValidator;
+
+class QuestionDelete extends LogicService
+{
+
+    use QuestionTrait;
+
+    public function handle($id)
+    {
+        $question = $this->checkQuestion($id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new QuestionValidator();
+
+        $validator->checkOwner($user->id, $question->owner_id);
+
+        $validator->checkIfAllowDelete($question);
+
+        $question->deleted = 1;
+
+        $question->update();
+
+        $this->recountUserQuestions($user);
+
+        $this->rebuildQuestionIndex($question);
+
+        $this->eventsManager->fire('Question:afterDelete', $this, $question);
+
+        return $question;
+    }
+
+    protected function recountUserQuestions(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $questionCount = $userRepo->countQuestions($user->id);
+
+        $user->question_count = $questionCount;
+
+        $user->update();
+    }
+
+    protected function rebuildQuestionIndex(QuestionModel $question)
+    {
+        $sync = new QuestionIndexSync();
+
+        $sync->addItem($question->id);
+    }
+
+}
diff --git a/app/Services/Logic/Question/QuestionFavorite.php b/app/Services/Logic/Question/QuestionFavorite.php
new file mode 100644
index 00000000..1350fed9
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionFavorite.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Models\Question as QuestionModel;
+use App\Models\QuestionFavorite as QuestionFavoriteModel;
+use App\Models\User as UserModel;
+use App\Repos\QuestionFavorite as QuestionFavoriteRepo;
+use App\Services\Logic\Notice\System\QuestionFavorited as QuestionFavoritedNotice;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+use App\Validators\UserLimit as UserLimitValidator;
+
+class QuestionFavorite extends LogicService
+{
+
+    use QuestionTrait;
+
+    public function handle($id)
+    {
+        $question = $this->checkQuestion($id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new UserLimitValidator();
+
+        $validator->checkFavoriteLimit($user);
+
+        $favoriteRepo = new QuestionFavoriteRepo();
+
+        $favorite = $favoriteRepo->findQuestionFavorite($question->id, $user->id);
+
+        if (!$favorite) {
+
+            $action = 'do';
+
+            $favorite = new QuestionFavoriteModel();
+
+            $favorite->question_id = $question->id;
+            $favorite->user_id = $user->id;
+
+            $favorite->create();
+
+            $this->incrQuestionFavoriteCount($question);
+
+            $this->incrUserFavoriteCount($user);
+
+            $this->handleFavoriteNotice($question, $user);
+
+            $this->eventsManager->fire('Question:afterFavorite', $this, $question);
+
+        } else {
+
+            $action = 'undo';
+
+            $favorite->delete();
+
+            $this->decrQuestionFavoriteCount($question);
+
+            $this->decrUserFavoriteCount($user);
+
+            $this->eventsManager->fire('Question:afterUndoFavorite', $this, $question);
+        }
+
+        return [
+            'action' => $action,
+            'count' => $question->favorite_count,
+        ];
+    }
+
+    protected function incrQuestionFavoriteCount(QuestionModel $question)
+    {
+        $question->favorite_count += 1;
+
+        $question->update();
+    }
+
+    protected function decrQuestionFavoriteCount(QuestionModel $question)
+    {
+        if ($question->favorite_count > 0) {
+            $question->favorite_count -= 1;
+            $question->update();
+        }
+    }
+
+    protected function incrUserFavoriteCount(UserModel $user)
+    {
+        $user->favorite_count += 1;
+
+        $user->update();
+    }
+
+    protected function decrUserFavoriteCount(UserModel $user)
+    {
+        if ($user->favorite_count > 0) {
+            $user->favorite_count -= 1;
+            $user->update();
+        }
+    }
+
+    protected function handleFavoriteNotice(QuestionModel $question, UserModel $sender)
+    {
+        $notice = new QuestionFavoritedNotice();
+
+        $notice->handle($question, $sender);
+    }
+
+}
diff --git a/app/Services/Logic/Question/QuestionInfo.php b/app/Services/Logic/Question/QuestionInfo.php
new file mode 100644
index 00000000..18745d92
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionInfo.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Caches\Category as CategoryCache;
+use App\Models\Category as CategoryModel;
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Repos\Question as QuestionRepo;
+use App\Repos\QuestionFavorite as QuestionFavoriteRepo;
+use App\Repos\QuestionLike as QuestionLikeRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+
+class QuestionInfo extends LogicService
+{
+
+    use QuestionTrait;
+
+    public function handle($id)
+    {
+        $user = $this->getCurrentUser(true);
+
+        $question = $this->checkQuestion($id);
+
+        $result = $this->handleQuestion($question, $user);
+
+        $this->incrQuestionViewCount($question);
+
+        $this->eventsManager->fire('Question:afterView', $this, $question);
+
+        return $result;
+    }
+
+    protected function handleQuestion(QuestionModel $question, UserModel $user)
+    {
+        $content = kg_parse_markdown($question->content);
+
+        $lastReplier = $this->handleUserInfo($question->last_replier_id);
+        $category = $this->handleCategoryInfo($question);
+        $owner = $this->handleUserInfo($question->owner_id);
+        $me = $this->handleMeInfo($question, $user);
+
+        return [
+            'id' => $question->id,
+            'title' => $question->title,
+            'summary' => $question->summary,
+            'content' => $content,
+            'tags' => $question->tags,
+            'bounty' => $question->bounty,
+            'anonymous' => $question->anonymous,
+            'solved' => $question->solved,
+            'closed' => $question->closed,
+            'view_count' => $question->view_count,
+            'like_count' => $question->like_count,
+            'answer_count' => $question->answer_count,
+            'comment_count' => $question->comment_count,
+            'favorite_count' => $question->favorite_count,
+            'last_reply_time' => $question->last_reply_time,
+            'create_time' => $question->create_time,
+            'update_time' => $question->update_time,
+            'last_replier' => $lastReplier,
+            'category' => $category,
+            'owner' => $owner,
+            'me' => $me,
+        ];
+    }
+
+    protected function handleCategoryInfo(QuestionModel $question)
+    {
+        $cache = new CategoryCache();
+
+        /**
+         * @var CategoryModel $category
+         */
+        $category = $cache->get($question->category_id);
+
+        if (!$category) return new \stdClass();
+
+        return [
+            'id' => $category->id,
+            'name' => $category->name,
+        ];
+    }
+
+    protected function handleMeInfo(QuestionModel $question, UserModel $user)
+    {
+        $me = [
+            'liked' => 0,
+            'favorited' => 0,
+            'answered' => 0,
+        ];
+
+        if ($user->id > 0) {
+
+            $likeRepo = new QuestionLikeRepo();
+
+            $like = $likeRepo->findQuestionLike($question->id, $user->id);
+
+            if ($like) {
+                $me['liked'] = 1;
+            }
+
+            $favoriteRepo = new QuestionFavoriteRepo();
+
+            $favorite = $favoriteRepo->findQuestionFavorite($question->id, $user->id);
+
+            if ($favorite) {
+                $me['favorited'] = 1;
+            }
+
+            $questionRepo = new QuestionRepo();
+
+            $userAnswers = $questionRepo->findUserAnswers($question->id, $user->id);
+
+            if ($userAnswers->count() > 0) {
+                $me['answered'] = 1;
+            }
+        }
+
+        return $me;
+    }
+
+    protected function handleUserInfo($userId)
+    {
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($userId);
+
+        if (!$user) return new \stdClass();
+
+        return [
+            'id' => $user->id,
+            'name' => $user->name,
+            'avatar' => $user->avatar,
+            'title' => $user->title,
+            'about' => $user->about,
+            'vip' => $user->vip,
+        ];
+    }
+
+    protected function incrQuestionViewCount(QuestionModel $question)
+    {
+        $question->view_count += 1;
+
+        $question->update();
+    }
+
+}
diff --git a/app/Services/Logic/Question/QuestionLike.php b/app/Services/Logic/Question/QuestionLike.php
new file mode 100644
index 00000000..5e5c27f2
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionLike.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Models\Question as QuestionModel;
+use App\Models\QuestionLike as QuestionLikeModel;
+use App\Models\User as UserModel;
+use App\Repos\QuestionLike as QuestionLikeRepo;
+use App\Services\Logic\Notice\System\QuestionLiked as QuestionLikedNotice;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+use App\Validators\UserLimit as UserLimitValidator;
+
+class QuestionLike extends LogicService
+{
+
+    use QuestionTrait;
+
+    public function handle($id)
+    {
+        $question = $this->checkQuestion($id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new UserLimitValidator();
+
+        $validator->checkDailyQuestionLikeLimit($user);
+
+        $likeRepo = new QuestionLikeRepo();
+
+        $questionLike = $likeRepo->findQuestionLike($question->id, $user->id);
+
+        if (!$questionLike) {
+
+            $action = 'do';
+
+            $questionLike = new QuestionLikeModel();
+
+            $questionLike->question_id = $question->id;
+            $questionLike->user_id = $user->id;
+
+            $questionLike->create();
+
+            $this->incrQuestionLikeCount($question);
+
+            $this->handleLikeNotice($question, $user);
+
+            $this->eventsManager->fire('Question:afterLike', $this, $question);
+
+        } else {
+
+            $action = 'undo';
+
+            $questionLike->delete();
+
+            $this->decrQuestionLikeCount($question);
+
+            $this->eventsManager->fire('Question:afterUndoLike', $this, $question);
+        }
+
+        $this->incrUserDailyQuestionLikeCount($user);
+
+        return [
+            'action' => $action,
+            'count' => $question->like_count,
+        ];
+    }
+
+    protected function incrQuestionLikeCount(QuestionModel $question)
+    {
+        $question->like_count += 1;
+
+        $question->update();
+    }
+
+    protected function decrQuestionLikeCount(QuestionModel $question)
+    {
+        if ($question->like_count > 0) {
+            $question->like_count -= 1;
+            $question->update();
+        }
+    }
+
+    protected function incrUserDailyQuestionLikeCount(UserModel $user)
+    {
+        $this->eventsManager->fire('UserDailyCounter:incrQuestionLikeCount', $this, $user);
+    }
+
+    protected function handleLikeNotice(QuestionModel $question, UserModel $sender)
+    {
+        $notice = new QuestionLikedNotice();
+
+        $notice->handle($question, $sender);
+    }
+
+}
diff --git a/app/Services/Logic/Question/QuestionList.php b/app/Services/Logic/Question/QuestionList.php
new file mode 100644
index 00000000..cc90cc02
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionList.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Builders\QuestionList as QuestionListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Question as QuestionModel;
+use App\Repos\Question as QuestionRepo;
+use App\Services\Logic\Service as LogicService;
+use App\Validators\QuestionQuery as QuestionQueryValidator;
+use Phalcon\Text;
+
+class QuestionList extends LogicService
+{
+
+    public function handle()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params = $this->checkQueryParams($params);
+
+        $params['published'] = QuestionModel::PUBLISH_APPROVED;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $questionRepo = new QuestionRepo();
+
+        $pager = $questionRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleQuestions($pager);
+    }
+
+    public function handleQuestions($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new QuestionListBuilder();
+
+        $questions = $pager->items->toArray();
+
+        $users = $builder->getUsers($questions);
+
+        $items = [];
+
+        $baseUrl = kg_cos_url();
+
+        foreach ($questions as $question) {
+
+            if (!empty($question['cover']) && !Text::startsWith($question['cover'], 'http')) {
+                $question['cover'] = $baseUrl . $question['cover'];
+            }
+
+            if (empty($question['summary'])) {
+                $question['summary'] = kg_parse_summary($question['content'], 80);
+            }
+
+            $question['tags'] = json_decode($question['tags'], true);
+
+            $owner = $users[$question['owner_id']] ?? new \stdClass();
+            $lastReplier = $users[$question['last_replier_id']] ?? new \stdClass();
+
+            $items[] = [
+                'id' => $question['id'],
+                'title' => $question['title'],
+                'cover' => $question['cover'],
+                'summary' => $question['summary'],
+                'tags' => $question['tags'],
+                'bounty' => $question['bounty'],
+                'anonymous' => $question['anonymous'],
+                'closed' => $question['closed'],
+                'solved' => $question['solved'],
+                'published' => $question['published'],
+                'view_count' => $question['view_count'],
+                'like_count' => $question['like_count'],
+                'answer_count' => $question['answer_count'],
+                'comment_count' => $question['comment_count'],
+                'favorite_count' => $question['favorite_count'],
+                'last_reply_time' => $question['last_reply_time'],
+                'create_time' => $question['create_time'],
+                'update_time' => $question['update_time'],
+                'last_replier' => $lastReplier,
+                'owner' => $owner,
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+    protected function checkQueryParams($params)
+    {
+        $validator = new QuestionQueryValidator();
+
+        $query = [];
+
+        if (isset($params['tag_id'])) {
+            $query['tag_id'] = $validator->checkTag($params['tag_id']);
+        }
+
+        if (isset($params['sort'])) {
+            $query['sort'] = $validator->checkSort($params['sort']);
+        }
+
+        return $query;
+    }
+
+}
diff --git a/app/Services/Logic/Question/QuestionUpdate.php b/app/Services/Logic/Question/QuestionUpdate.php
new file mode 100644
index 00000000..ed6979b5
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionUpdate.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Models\Question as QuestionModel;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+use App\Validators\Question as QuestionValidator;
+
+class QuestionUpdate extends LogicService
+{
+
+    use QuestionTrait;
+    use QuestionDataTrait;
+
+    public function handle($id)
+    {
+        $post = $this->request->getPost();
+
+        $question = $this->checkQuestion($id);
+
+        $validator = new QuestionValidator();
+
+        $user = $this->getLoginUser();
+
+        $validator->checkOwner($user->id, $question->owner_id);
+
+        $validator->checkIfAllowEdit($question);
+
+        $data = $this->handlePostData($post);
+
+        if ($question->published == QuestionModel::PUBLISH_REJECTED) {
+            $data['published'] = QuestionModel::PUBLISH_PENDING;
+        }
+
+        /**
+         * 当通过审核后，禁止修改部分属性
+         */
+        if ($question->published == QuestionModel::PUBLISH_APPROVED) {
+            unset(
+                $data['title'],
+                $data['content'],
+                $post['xm_tag_ids'],
+            );
+        }
+
+        $question->update($data);
+
+        if (isset($post['xm_tag_ids'])) {
+            $this->saveTags($question, $post['xm_tag_ids']);
+        }
+
+        $this->eventsManager->fire('Question:afterUpdate', $this, $question);
+
+        return $question;
+    }
+
+}
diff --git a/app/Services/Logic/Question/RelatedQuestionList.php b/app/Services/Logic/Question/RelatedQuestionList.php
new file mode 100644
index 00000000..fab001e0
--- /dev/null
+++ b/app/Services/Logic/Question/RelatedQuestionList.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Caches\TaggedQuestionList as TaggedQuestionListCache;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+
+class RelatedQuestionList extends LogicService
+{
+
+    use QuestionTrait;
+
+    public function handle($id)
+    {
+        $question = $this->checkQuestion($id);
+
+        if (empty($question->tags)) return [];
+
+        $tagIds = kg_array_column($question->tags, 'id');
+
+        $randKey = array_rand($tagIds);
+
+        $tagId = $tagIds[$randKey];
+
+        $cache = new TaggedQuestionListCache();
+
+        $result = $cache->get($tagId);
+
+        return $result ?: [];
+    }
+
+}
diff --git a/app/Services/Logic/Question/TopAnswererList.php b/app/Services/Logic/Question/TopAnswererList.php
new file mode 100644
index 00000000..84e5e505
--- /dev/null
+++ b/app/Services/Logic/Question/TopAnswererList.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Caches\TopAnswererList as TopAnswererListCache;
+use App\Services\Logic\Service as LogicService;
+
+class TopAnswererList extends LogicService
+{
+
+    public function handle()
+    {
+        $cache = new TopAnswererListCache();
+
+        $result = $cache->get();
+
+        return $result ?: [];
+    }
+
+}
diff --git a/app/Services/Logic/QuestionTrait.php b/app/Services/Logic/QuestionTrait.php
new file mode 100644
index 00000000..d01812c7
--- /dev/null
+++ b/app/Services/Logic/QuestionTrait.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Services\Logic;
+
+use App\Validators\Question as QuestionValidator;
+
+trait QuestionTrait
+{
+
+    public function checkQuestion($id)
+    {
+        $validator = new QuestionValidator();
+
+        return $validator->checkQuestion($id);
+    }
+
+    public function checkQuestionCache($id)
+    {
+        $validator = new QuestionValidator();
+
+        return $validator->checkQuestionCache($id);
+    }
+
+}
diff --git a/app/Services/Logic/Review/ReviewCreate.php b/app/Services/Logic/Review/ReviewCreate.php
index 3cd6090e..001044a3 100644
--- a/app/Services/Logic/Review/ReviewCreate.php
+++ b/app/Services/Logic/Review/ReviewCreate.php
@@ -5,6 +5,7 @@ namespace App\Services\Logic\Review;
 use App\Models\Course as CourseModel;
 use App\Models\CourseUser as CourseUserModel;
 use App\Models\Review as ReviewModel;
+use App\Repos\Course as CourseRepo;
 use App\Services\CourseStat as CourseStatService;
 use App\Services\Logic\CourseTrait;
 use App\Services\Logic\Point\History\CourseReview as CourseReviewPointHistory;
@@ -48,17 +49,15 @@ class ReviewCreate extends LogicService
         $data['rating1'] = $validator->checkRating($post['rating1']);
         $data['rating2'] = $validator->checkRating($post['rating2']);
         $data['rating3'] = $validator->checkRating($post['rating3']);
+        $data['published'] = 1;
 
         $review = new ReviewModel();
 
         $review->create($data);
 
         $this->updateCourseUserReview($courseUser);
-
-        $this->incrCourseReviewCount($course);
-
+        $this->recountCourseReviews($course);
         $this->updateCourseRating($course);
-
         $this->handleReviewPoint($review);
 
         $this->eventsManager->fire('Review:afterCreate', $this, $review);
@@ -73,13 +72,6 @@ class ReviewCreate extends LogicService
         $courseUser->update();
     }
 
-    protected function incrCourseReviewCount(CourseModel $course)
-    {
-        $course->review_count += 1;
-
-        $course->update();
-    }
-
     protected function updateCourseRating(CourseModel $course)
     {
         $service = new CourseStatService();
@@ -87,6 +79,17 @@ class ReviewCreate extends LogicService
         $service->updateRating($course->id);
     }
 
+    protected function recountCourseReviews(CourseModel $course)
+    {
+        $courseRepo = new CourseRepo();
+
+        $reviewCount = $courseRepo->countReviews($course->id);
+
+        $course->review_count = $reviewCount;
+
+        $course->update();
+    }
+
     protected function handleReviewPoint(ReviewModel $review)
     {
         $service = new CourseReviewPointHistory();
diff --git a/app/Services/Logic/Review/ReviewDelete.php b/app/Services/Logic/Review/ReviewDelete.php
index 7553eb36..f40bee79 100644
--- a/app/Services/Logic/Review/ReviewDelete.php
+++ b/app/Services/Logic/Review/ReviewDelete.php
@@ -3,6 +3,7 @@
 namespace App\Services\Logic\Review;
 
 use App\Models\Course as CourseModel;
+use App\Repos\Course as CourseRepo;
 use App\Services\CourseStat as CourseStatService;
 use App\Services\Logic\CourseTrait;
 use App\Services\Logic\ReviewTrait;
@@ -31,19 +32,21 @@ class ReviewDelete extends LogicService
 
         $review->update();
 
-        $this->decrCourseReviewCount($course);
-
+        $this->recountCourseReviews($course);
         $this->updateCourseRating($course);
 
         $this->eventsManager->fire('Review:afterDelete', $this, $review);
     }
 
-    protected function decrCourseReviewCount(CourseModel $course)
+    protected function recountCourseReviews(CourseModel $course)
     {
-        if ($course->review_count > 0) {
-            $course->review_count -= 1;
-            $course->update();
-        }
+        $courseRepo = new CourseRepo();
+
+        $reviewCount = $courseRepo->countReviews($course->id);
+
+        $course->review_count = $reviewCount;
+
+        $course->update();
     }
 
     protected function updateCourseRating(CourseModel $course)
diff --git a/app/Services/Logic/Search/Article.php b/app/Services/Logic/Search/Article.php
index 1b25b1c6..fb72e115 100644
--- a/app/Services/Logic/Search/Article.php
+++ b/app/Services/Logic/Search/Article.php
@@ -5,6 +5,7 @@ namespace App\Services\Logic\Search;
 use App\Library\Paginator\Adapter\XunSearch as XunSearchPaginator;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Services\Search\ArticleSearcher as ArticleSearcherService;
+use Phalcon\Text;
 
 class Article extends Handler
 {
@@ -58,7 +59,9 @@ class Article extends Handler
 
         foreach ($pager->items as $item) {
 
-            $item['cover'] = $baseUrl . $item['cover'];
+            if (!empty($item['cover']) && !Text::startsWith($item['cover'], 'http')) {
+                $item['cover'] = $baseUrl . $item['cover'];
+            }
 
             $items[] = [
                 'id' => (int)$item['id'],
diff --git a/app/Services/Logic/Search/Question.php b/app/Services/Logic/Search/Question.php
new file mode 100644
index 00000000..46701e56
--- /dev/null
+++ b/app/Services/Logic/Search/Question.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Services\Logic\Search;
+
+use App\Library\Paginator\Adapter\XunSearch as XunSearchPaginator;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Services\Search\QuestionSearcher as QuestionSearcherService;
+use Phalcon\Text;
+
+class Question extends Handler
+{
+
+    public function search()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $searcher = new QuestionSearcherService();
+
+        $paginator = new XunSearchPaginator([
+            'xs' => $searcher->getXS(),
+            'highlight' => $searcher->getHighlightFields(),
+            'query' => $params['query'],
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        $pager = $paginator->getPaginate();
+
+        return $this->handleQuestions($pager);
+    }
+
+    public function getHotQuery($limit = 10, $type = 'total')
+    {
+        $searcher = new QuestionSearcherService();
+
+        return $searcher->getHotQuery($limit, $type);
+    }
+
+    public function getRelatedQuery($query, $limit = 10)
+    {
+        $searcher = new QuestionSearcherService();
+
+        return $searcher->getRelatedQuery($query, $limit);
+    }
+
+    protected function handleQuestions($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $items = [];
+
+        $baseUrl = kg_cos_url();
+
+        foreach ($pager->items as $item) {
+
+            if (!empty($item['cover']) && !Text::startsWith($item['cover'], 'http')) {
+                $item['cover'] = $baseUrl . $item['cover'];
+            }
+
+            $lastAnswer = json_decode($item['last_answer'], true);
+
+            if (!empty($lastAnswer['cover']) && !Text::startsWith($lastAnswer['cover'], 'http')) {
+                $item['last_answer'] = $baseUrl . $lastAnswer['cover'];
+            }
+
+            $acceptAnswer = json_decode($item['accept_answer'], true);
+
+            if (!empty($acceptAnswer['cover']) && !Text::startsWith($acceptAnswer['cover'], 'http')) {
+                $item['accept_answer'] = $baseUrl . $acceptAnswer['cover'];
+            }
+
+            $items[] = [
+                'id' => (int)$item['id'],
+                'title' => (string)$item['title'],
+                'cover' => (string)$item['cover'],
+                'summary' => (string)$item['summary'],
+                'bounty' => (int)$item['bounty'],
+                'anonymous' => (int)$item['anonymous'],
+                'solved' => (int)$item['solved'],
+                'create_time' => (int)$item['create_time'],
+                'last_reply_time' => (int)$item['last_reply_time'],
+                'view_count' => (int)$item['view_count'],
+                'like_count' => (int)$item['like_count'],
+                'answer_count' => (int)$item['answer_count'],
+                'comment_count' => (int)$item['comment_count'],
+                'favorite_count' => (int)$item['favorite_count'],
+                'category' => json_decode($item['category'], true),
+                'tags' => json_decode($item['tags'], true),
+                'owner' => json_decode($item['owner'], true),
+                'last_replier' => json_decode($item['last_replier'], true),
+                'last_answer' => $item['last_answer'],
+                'accept_answer' => $item['accept_answer'],
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/Tag/FollowList.php b/app/Services/Logic/Tag/FollowList.php
new file mode 100644
index 00000000..2b3051b4
--- /dev/null
+++ b/app/Services/Logic/Tag/FollowList.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Services\Logic\Tag;
+
+use App\Builders\TagFollowList as TagFollowListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\TagFollow as TagFollowRepo;
+use App\Services\Logic\Service as LogicService;
+
+class FollowList extends LogicService
+{
+
+    public function handle()
+    {
+        $user = $this->getLoginUser();
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['user_id'] = $user->id;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $followRepo = new TagFollowRepo();
+
+        $pager = $followRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleTags($pager);
+    }
+
+    public function handleTags($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new TagFollowListBuilder();
+
+        $relations = $pager->items->toArray();
+
+        $tags = $builder->getTags($relations);
+
+        $items = [];
+
+        foreach ($relations as $relation) {
+            $tag = $tags[$relation['tag_id']] ?? new \stdClass();
+            $items[] = $tag;
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/Tag/TagFollow.php b/app/Services/Logic/Tag/TagFollow.php
new file mode 100644
index 00000000..8b4adfc6
--- /dev/null
+++ b/app/Services/Logic/Tag/TagFollow.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Services\Logic\Tag;
+
+use App\Models\Tag as TagModel;
+use App\Models\TagFollow as TagFollowModel;
+use App\Repos\TagFollow as TagFollowRepo;
+use App\Services\Logic\Service as LogicService;
+use App\Services\Logic\TagTrait;
+
+class TagFollow extends LogicService
+{
+
+    use TagTrait;
+
+    public function handle($id)
+    {
+        $tag = $this->checkTag($id);
+
+        $user = $this->getLoginUser();
+
+        $followRepo = new TagFollowRepo();
+
+        $tagFollow = $followRepo->findTagFollow($tag->id, $user->id);
+
+        if (!$tagFollow) {
+
+            $action = 'do';
+
+            $tagFollow = new TagFollowModel();
+
+            $tagFollow->tag_id = $tag->id;
+            $tagFollow->user_id = $user->id;
+
+            $tagFollow->create();
+
+            $this->incrTagFollowCount($tag);
+
+        } else {
+
+            $action = 'undo';
+
+            $tagFollow->delete();
+
+            $this->decrTagFollowCount($tag);
+        }
+
+        return [
+            'action' => $action,
+            'count' => $tag->follow_count,
+        ];
+    }
+
+    protected function incrTagFollowCount(TagModel $tag)
+    {
+        $tag->follow_count += 1;
+
+        $tag->update();
+    }
+
+    protected function decrTagFollowCount(TagModel $tag)
+    {
+        if ($tag->follow_count > 0) {
+            $tag->follow_count -= 1;
+            $tag->update();
+        }
+    }
+
+}
diff --git a/app/Services/Logic/Tag/TagList.php b/app/Services/Logic/Tag/TagList.php
new file mode 100644
index 00000000..ee8ec99f
--- /dev/null
+++ b/app/Services/Logic/Tag/TagList.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Services\Logic\Tag;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\User as UserModel;
+use App\Repos\Tag as TagRepo;
+use App\Repos\TagFollow as TagFollowRepo;
+use App\Services\Logic\Service as LogicService;
+
+class TagList extends LogicService
+{
+
+    public function handle()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['published'] = 1;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $tagRepo = new TagRepo();
+
+        $pager = $tagRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleTags($pager);
+    }
+
+    public function handleTags($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $user = $this->getLoginUser();
+
+        $followTagIds = $this->getFollowTagIds($user);
+
+        $tags = $pager->items->toArray();
+
+        $baseUrl = kg_cos_url();
+
+        $items = [];
+
+        foreach ($tags as $tag) {
+
+            $tag['icon'] = $baseUrl . $tag['icon'];
+            $tag['me']['followed'] = in_array($tag['id'], $followTagIds) ? 1 : 0;
+
+            $items[] = [
+                'id' => $tag['id'],
+                'name' => $tag['name'],
+                'icon' => $tag['icon'],
+                'follow_count' => $tag['follow_count'],
+                'me' => $tag['me'],
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+    protected function getFollowTagIds(UserModel $user)
+    {
+        if ($user->id == 0) return [];
+
+        $followRepo = new TagFollowRepo();
+
+        $where = ['user_id' => $user->id];
+
+        $pager = $followRepo->paginate($where, 'latest', 1, 1000);
+
+        $result = [];
+
+        if ($pager->total_items > 0) {
+            foreach ($pager->items as $item) {
+                $result[] = $item->tag_id;
+            }
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Services/Logic/TagTrait.php b/app/Services/Logic/TagTrait.php
new file mode 100644
index 00000000..8d2d4512
--- /dev/null
+++ b/app/Services/Logic/TagTrait.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Services\Logic;
+
+use App\Validators\Tag as TagValidator;
+
+trait TagTrait
+{
+
+    public function checkTag($id)
+    {
+        $validator = new TagValidator();
+
+        return $validator->checkTag($id);
+    }
+
+    public function checkTagCache($id)
+    {
+        $validator = new TagValidator();
+
+        return $validator->checkTagCache($id);
+    }
+
+}
diff --git a/app/Services/Logic/User/ArticleList.php b/app/Services/Logic/User/ArticleList.php
index ad596aa8..b5364b05 100644
--- a/app/Services/Logic/User/ArticleList.php
+++ b/app/Services/Logic/User/ArticleList.php
@@ -5,7 +5,7 @@ namespace App\Services\Logic\User;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Models\Article as ArticleModel;
 use App\Repos\Article as ArticleRepo;
-use App\Services\Logic\Article\ArticleList as ArticleListService;
+use App\Services\Logic\Article\QuestionList as ArticleListService;
 use App\Services\Logic\Service as LogicService;
 use App\Services\Logic\UserTrait;
 
diff --git a/app/Services/Logic/User/Console/AnswerList.php b/app/Services/Logic/User/Console/AnswerList.php
new file mode 100644
index 00000000..b956f440
--- /dev/null
+++ b/app/Services/Logic/User/Console/AnswerList.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Services\Logic\User\Console;
+
+use App\Builders\AnswerList as AnswerListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\Answer as AnswerRepo;
+use App\Services\Logic\Service as LogicService;
+
+class AnswerList extends LogicService
+{
+
+    public function handle()
+    {
+        $user = $this->getLoginUser();
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['owner_id'] = $user->id;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $answerRepo = new AnswerRepo();
+
+        $pager = $answerRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleAnswers($pager);
+    }
+
+    protected function handleAnswers($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new AnswerListBuilder();
+
+        $answers = $pager->items->toArray();
+
+        $questions = $builder->getQuestions($answers);
+
+        $users = $builder->getUsers($answers);
+
+        $items = [];
+
+        foreach ($answers as $answer) {
+
+            $answer['summary'] = kg_parse_summary($answer['content'], 64);
+
+            $question = $questions[$answer['question_id']] ?? new \stdClass();
+            $owner = $users[$answer['owner_id']] ?? new \stdClass();
+
+            $items[] = [
+                'id' => $answer['id'],
+                'summary' => $answer['summary'],
+                'published' => $answer['published'],
+                'accepted' => $answer['accepted'],
+                'comment_count' => $answer['comment_count'],
+                'like_count' => $answer['like_count'],
+                'create_time' => $answer['create_time'],
+                'update_time' => $answer['update_time'],
+                'question' => $question,
+                'owner' => $owner,
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/User/Console/FavoriteList.php b/app/Services/Logic/User/Console/FavoriteList.php
index b614adf4..27ece367 100644
--- a/app/Services/Logic/User/Console/FavoriteList.php
+++ b/app/Services/Logic/User/Console/FavoriteList.php
@@ -4,9 +4,11 @@ namespace App\Services\Logic\User\Console;
 
 use App\Builders\ArticleFavoriteList as ArticleFavoriteListBuilder;
 use App\Builders\CourseFavoriteList as CourseFavoriteListBuilder;
+use App\Builders\QuestionFavoriteList as QuestionFavoriteListBuilder;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Repos\ArticleFavorite as ArticleFavoriteRepo;
 use App\Repos\CourseFavorite as CourseFavoriteRepo;
+use App\Repos\QuestionFavorite as QuestionFavoriteRepo;
 use App\Services\Logic\Service as LogicService;
 
 class FavoriteList extends LogicService
@@ -43,6 +45,14 @@ class FavoriteList extends LogicService
             $pager = $favoriteRepo->paginate($params, $sort, $page, $limit);
 
             return $this->handleArticles($pager);
+
+        } elseif ($type == 'question') {
+
+            $favoriteRepo = new QuestionFavoriteRepo();
+
+            $pager = $favoriteRepo->paginate($params, $sort, $page, $limit);
+
+            return $this->handleQuestions($pager);
         }
     }
 
@@ -94,4 +104,28 @@ class FavoriteList extends LogicService
         return $pager;
     }
 
+    protected function handleQuestions($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new QuestionFavoriteListBuilder();
+
+        $relations = $pager->items->toArray();
+
+        $questions = $builder->getQuestions($relations);
+
+        $items = [];
+
+        foreach ($relations as $relation) {
+            $question = $questions[$relation['question_id']] ?? new \stdClass();
+            $items[] = $question;
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
 }
diff --git a/app/Services/Logic/User/Console/QuestionList.php b/app/Services/Logic/User/Console/QuestionList.php
new file mode 100644
index 00000000..46b41168
--- /dev/null
+++ b/app/Services/Logic/User/Console/QuestionList.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Services\Logic\User\Console;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\Question as QuestionRepo;
+use App\Services\Logic\Question\QuestionList as QuestionListService;
+use App\Services\Logic\Service as LogicService;
+
+class QuestionList extends LogicService
+{
+
+    public function handle()
+    {
+        $user = $this->getLoginUser();
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['owner_id'] = $user->id;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $questionRepo = new QuestionRepo();
+
+        $pager = $questionRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleQuestions($pager);
+    }
+
+    protected function handleQuestions($pager)
+    {
+        $service = new QuestionListService();
+
+        return $service->handleQuestions($pager);
+    }
+
+}
diff --git a/app/Services/MyStorage.php b/app/Services/MyStorage.php
index 2feb4da1..1446fbf8 100644
--- a/app/Services/MyStorage.php
+++ b/app/Services/MyStorage.php
@@ -58,20 +58,6 @@ class MyStorage extends Storage
         return $this->putFile($key, $filename);
     }
 
-    /**
-     * 上传默认文章封面
-     *
-     * @return false|mixed|string
-     */
-    public function uploadDefaultArticleCover()
-    {
-        $filename = static_path('admin/img/default/article_cover.png');
-
-        $key = '/img/default/article_cover.png';
-
-        return $this->putFile($key, $filename);
-    }
-
     /**
      * 上传默认课程封面
      *
@@ -165,7 +151,9 @@ class MyStorage extends Storage
      */
     public function uploadContentImage()
     {
-        return $this->upload('/img/content/', self::MIME_IMAGE, UploadModel::TYPE_CONTENT_IMG);
+        $dir = date('Y') . '/' . date('m') . '/';
+
+        return $this->upload("/img/content/{$dir}", self::MIME_IMAGE, UploadModel::TYPE_CONTENT_IMG);
     }
 
     /**
@@ -175,7 +163,19 @@ class MyStorage extends Storage
      */
     public function uploadAvatarImage()
     {
-        return $this->upload('/img/avatar/', self::MIME_IMAGE, UploadModel::TYPE_AVATAR_IMG);
+        $dir = date('Y') . '/' . date('m') . '/';
+
+        return $this->upload("/img/avatar/{$dir}", self::MIME_IMAGE, UploadModel::TYPE_AVATAR_IMG);
+    }
+
+    /**
+     * 上传图标图片
+     *
+     * @return UploadModel|bool
+     */
+    public function uploadIconImage()
+    {
+        return $this->upload('/img/icon/', self::MIME_IMAGE, UploadModel::TYPE_AVATAR_IMG);
     }
 
     /**
@@ -195,7 +195,9 @@ class MyStorage extends Storage
      */
     public function uploadImImage()
     {
-        return $this->upload('/im/img/', self::MIME_IMAGE, UploadModel::TYPE_IM_IMG);
+        $dir = date('Y') . '/' . date('m') . '/';
+
+        return $this->upload("/im/img/{$dir}", self::MIME_IMAGE, UploadModel::TYPE_IM_IMG);
     }
 
     /**
@@ -203,7 +205,9 @@ class MyStorage extends Storage
      */
     public function uploadImFile()
     {
-        return $this->upload('/im/file/', self::MIME_FILE, UploadModel::TYPE_IM_FILE);
+        $dir = date('Y') . '/' . date('m') . '/';
+
+        return $this->upload("/im/file/{$dir}", self::MIME_FILE, UploadModel::TYPE_IM_FILE);
     }
 
     /**
diff --git a/app/Services/Search/ArticleDocument.php b/app/Services/Search/ArticleDocument.php
index dff8dc23..2ac3c4a2 100644
--- a/app/Services/Search/ArticleDocument.php
+++ b/app/Services/Search/ArticleDocument.php
@@ -3,8 +3,8 @@
 namespace App\Services\Search;
 
 use App\Models\Article as ArticleModel;
-use App\Models\Category as CategoryModel;
-use App\Models\User as UserModel;
+use App\Repos\Category as CategoryRepo;
+use App\Repos\User as UserRepo;
 use Phalcon\Mvc\User\Component;
 
 class ArticleDocument extends Component
@@ -35,34 +35,24 @@ class ArticleDocument extends Component
      */
     public function formatDocument(ArticleModel $article)
     {
+        if (empty($article->summary)) {
+            $article->summary = kg_parse_summary($article->content);
+        }
+
         if (is_array($article->tags) || is_object($article->tags)) {
             $article->tags = kg_json_encode($article->tags);
         }
 
-        $owner = '';
+        $owner = '{}';
 
         if ($article->owner_id > 0) {
-            $record = UserModel::findFirst($article->owner_id);
-            $owner = kg_json_encode([
-                'id' => $record->id,
-                'name' => $record->name,
-            ]);
+            $owner = $this->handleUser($article->owner_id);
         }
 
-        $category = '';
+        $category = '{}';
 
         if ($article->category_id > 0) {
-            $record = CategoryModel::findFirst($article->category_id);
-            $category = kg_json_encode([
-                'id' => $record->id,
-                'name' => $record->name,
-            ]);
-        }
-
-        $article->cover = ArticleModel::getCoverPath($article->cover);
-
-        if (empty($article->summary)) {
-            $article->summary = kg_parse_summary($article->content);
+            $category = $this->handleCategory($article->category_id);
         }
 
         return [
@@ -70,17 +60,41 @@ class ArticleDocument extends Component
             'title' => $article->title,
             'cover' => $article->cover,
             'summary' => $article->summary,
+            'tags' => $article->tags,
             'category_id' => $article->category_id,
             'owner_id' => $article->owner_id,
             'create_time' => $article->create_time,
-            'tags' => $article->tags,
-            'category' => $category,
-            'owner' => $owner,
             'view_count' => $article->view_count,
             'like_count' => $article->like_count,
             'comment_count' => $article->comment_count,
             'favorite_count' => $article->favorite_count,
+            'category' => $category,
+            'owner' => $owner,
         ];
     }
 
+    protected function handleUser($id)
+    {
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($id);
+
+        return kg_json_encode([
+            'id' => $user->id,
+            'name' => $user->name,
+        ]);
+    }
+
+    protected function handleCategory($id)
+    {
+        $categoryRepo = new CategoryRepo();
+
+        $category = $categoryRepo->findById($id);
+
+        return kg_json_encode([
+            'id' => $category->id,
+            'name' => $category->name,
+        ]);
+    }
+
 }
diff --git a/app/Services/Search/CourseDocument.php b/app/Services/Search/CourseDocument.php
index 96727276..6e8853b9 100644
--- a/app/Services/Search/CourseDocument.php
+++ b/app/Services/Search/CourseDocument.php
@@ -39,7 +39,7 @@ class CourseDocument extends Component
             $course->attrs = kg_json_encode($course->attrs);
         }
 
-        $teacher = '';
+        $teacher = '{}';
 
         if ($course->teacher_id > 0) {
             $record = UserModel::findFirst($course->teacher_id);
@@ -49,7 +49,7 @@ class CourseDocument extends Component
             ]);
         }
 
-        $category = '';
+        $category = '{}';
 
         if ($course->category_id > 0) {
             $record = CategoryModel::findFirst($course->category_id);
diff --git a/app/Services/Search/GroupDocument.php b/app/Services/Search/GroupDocument.php
index f3367d1a..653c121c 100644
--- a/app/Services/Search/GroupDocument.php
+++ b/app/Services/Search/GroupDocument.php
@@ -34,12 +34,10 @@ class GroupDocument extends Component
      */
     public function formatDocument(GroupModel $group)
     {
-        $owner = '';
+        $owner = '{}';
 
         if ($group->owner_id > 0) {
-
             $record = UserModel::findFirst($group->owner_id);
-
             $owner = kg_json_encode([
                 'id' => $record->id,
                 'name' => $record->name,
diff --git a/app/Services/Search/QuestionDocument.php b/app/Services/Search/QuestionDocument.php
new file mode 100644
index 00000000..64b8de41
--- /dev/null
+++ b/app/Services/Search/QuestionDocument.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace App\Services\Search;
+
+use App\Models\Question as QuestionModel;
+use App\Repos\Answer as AnswerRepo;
+use App\Repos\Category as CategoryRepo;
+use App\Repos\User as UserRepo;
+use Phalcon\Mvc\User\Component;
+
+class QuestionDocument extends Component
+{
+
+    /**
+     * 设置文档
+     *
+     * @param QuestionModel $question
+     * @return \XSDocument
+     */
+    public function setDocument(QuestionModel $question)
+    {
+        $doc = new \XSDocument();
+
+        $data = $this->formatDocument($question);
+
+        $doc->setFields($data);
+
+        return $doc;
+    }
+
+    /**
+     * 格式化文档
+     *
+     * @param QuestionModel $question
+     * @return array
+     */
+    public function formatDocument(QuestionModel $question)
+    {
+        if (empty($question->summary)) {
+            $question->summary = kg_parse_summary($question->content);
+        }
+
+        if (is_array($question->tags) || is_object($question->tags)) {
+            $question->tags = kg_json_encode($question->tags);
+        }
+
+        $category = '{}';
+
+        if ($question->category_id > 0) {
+            $category = $this->handleCategory($question->category_id);
+        }
+
+        $owner = '{}';
+
+        if ($question->owner_id > 0) {
+            $owner = $this->handleUser($question->owner_id);
+        }
+
+        $lastReplier = '{}';
+
+        if ($question->last_replier_id > 0) {
+            $lastReplier = $this->handleUser($question->last_replier_id);
+        }
+
+        $lastAnswer = '{}';
+
+        if ($question->last_answer_id > 0) {
+            $lastAnswer = $this->handleAnswer($question->last_answer_id);
+        }
+
+        $acceptAnswer = '{}';
+
+        if ($question->accept_answer_id > 0) {
+            $acceptAnswer = $this->handleAnswer($question->accept_answer_id);
+        }
+
+        return [
+            'id' => $question->id,
+            'title' => $question->title,
+            'cover' => $question->cover,
+            'summary' => $question->summary,
+            'tags' => $question->tags,
+            'category_id' => $question->category_id,
+            'owner_id' => $question->owner_id,
+            'create_time' => $question->create_time,
+            'last_reply_time' => $question->last_reply_time,
+            'bounty' => $question->bounty,
+            'anonymous' => $question->anonymous,
+            'solved' => $question->solved,
+            'view_count' => $question->view_count,
+            'like_count' => $question->like_count,
+            'answer_count' => $question->answer_count,
+            'comment_count' => $question->comment_count,
+            'favorite_count' => $question->favorite_count,
+            'category' => $category,
+            'owner' => $owner,
+            'last_replier' => $lastReplier,
+            'last_answer' => $lastAnswer,
+            'accept_answer' => $acceptAnswer,
+        ];
+    }
+
+    protected function handleUser($id)
+    {
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($id);
+
+        return kg_json_encode([
+            'id' => $user->id,
+            'name' => $user->name,
+        ]);
+    }
+
+    protected function handleCategory($id)
+    {
+        $categoryRepo = new CategoryRepo();
+
+        $category = $categoryRepo->findById($id);
+
+        return kg_json_encode([
+            'id' => $category->id,
+            'name' => $category->name,
+        ]);
+    }
+
+    protected function handleAnswer($id)
+    {
+        $answerRepo = new AnswerRepo();
+
+        $answer = $answerRepo->findById($id);
+
+        return kg_json_encode([
+            'id' => $answer->id,
+            'summary' => $answer->summary,
+            'cover' => $answer->cover,
+        ]);
+    }
+
+}
diff --git a/app/Services/Search/QuestionSearcher.php b/app/Services/Search/QuestionSearcher.php
new file mode 100644
index 00000000..48750507
--- /dev/null
+++ b/app/Services/Search/QuestionSearcher.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Services\Search;
+
+class QuestionSearcher extends Searcher
+{
+
+    public function __construct()
+    {
+        $this->xs = $this->getXS();
+    }
+
+    public function getXS()
+    {
+        $filename = config_path('xs.question.ini');
+
+        return new \XS($filename);
+    }
+
+    public function getHighlightFields()
+    {
+        return ['title', 'summary'];
+    }
+
+}
diff --git a/app/Services/Storage.php b/app/Services/Storage.php
index 432a2f3b..85e06b70 100644
--- a/app/Services/Storage.php
+++ b/app/Services/Storage.php
@@ -248,11 +248,9 @@ class Storage extends Service
      */
     protected function generateFileName($extension = '', $prefix = '')
     {
-        $dir = date('Y') . '/' . date('m') . '/';
-
         $name = uniqid();
 
-        return sprintf('%s%s%s.%s', $prefix, $dir, $name, $extension);
+        return sprintf('%s%s.%s', $prefix, $name, $extension);
     }
 
     /**
diff --git a/app/Services/Sync/ArticleScore.php b/app/Services/Sync/ArticleScore.php
new file mode 100644
index 00000000..2b7f85b1
--- /dev/null
+++ b/app/Services/Sync/ArticleScore.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Services\Sync;
+
+use App\Services\Service;
+
+class ArticleScore extends Service
+{
+
+    /**
+     * @var int
+     */
+    protected $lifetime = 86400;
+
+    public function addItem($courseId)
+    {
+        $redis = $this->getRedis();
+
+        $key = $this->getSyncKey();
+
+        $redis->sAdd($key, $courseId);
+
+        if ($redis->sCard($key) == 1) {
+            $redis->expire($key, $this->lifetime);
+        }
+    }
+
+    public function getSyncKey()
+    {
+        return 'sync_article_score';
+    }
+
+}
diff --git a/app/Services/Sync/QuestionIndex.php b/app/Services/Sync/QuestionIndex.php
new file mode 100644
index 00000000..24ed22a9
--- /dev/null
+++ b/app/Services/Sync/QuestionIndex.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Services\Sync;
+
+use App\Services\Service;
+
+class QuestionIndex extends Service
+{
+
+    /**
+     * @var int
+     */
+    protected $lifetime = 86400;
+
+    public function addItem($articleId)
+    {
+        $redis = $this->getRedis();
+
+        $key = $this->getSyncKey();
+
+        $redis->sAdd($key, $articleId);
+
+        if ($redis->sCard($key) == 1) {
+            $redis->expire($key, $this->lifetime);
+        }
+    }
+
+    public function getSyncKey()
+    {
+        return 'sync_question_index';
+    }
+
+}
diff --git a/app/Services/Sync/QuestionScore.php b/app/Services/Sync/QuestionScore.php
new file mode 100644
index 00000000..14c3b278
--- /dev/null
+++ b/app/Services/Sync/QuestionScore.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Services\Sync;
+
+use App\Services\Service;
+
+class QuestionScore extends Service
+{
+
+    /**
+     * @var int
+     */
+    protected $lifetime = 86400;
+
+    public function addItem($questionId)
+    {
+        $redis = $this->getRedis();
+
+        $key = $this->getSyncKey();
+
+        $redis->sAdd($key, $questionId);
+
+        if ($redis->sCard($key) == 1) {
+            $redis->expire($key, $this->lifetime);
+        }
+    }
+
+    public function getSyncKey()
+    {
+        return 'sync_question_score';
+    }
+
+}
diff --git a/app/Services/Utils/ArticleScore.php b/app/Services/Utils/ArticleScore.php
new file mode 100644
index 00000000..235d91e6
--- /dev/null
+++ b/app/Services/Utils/ArticleScore.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Services\Utils;
+
+use App\Models\Article as ArticleModel;
+use App\Services\Service as AppService;
+
+class ArticleScore extends AppService
+{
+
+    public function handle(ArticleModel $article)
+    {
+       return $this->calculateScore($article);
+    }
+
+    protected function calculateScore(ArticleModel $article)
+    {
+        $weight = [
+            'factor1' => 0.2,
+            'factor2' => 0.1,
+            'factor3' => 0.15,
+            'factor4' => 0.2,
+            'factor5' => 0.15,
+            'factor6' => 0.2,
+        ];
+        
+        $items = [
+            'factor1' => 0.0,
+            'factor2' => 0.0,
+            'factor3' => 0.0,
+            'factor4' => 0.0,
+            'factor5' => 0.0,
+            'factor6' => 0.0,
+        ];
+
+        if ($article->featured == 1) {
+            $items['factor1'] =  7 * $weight['factor1'];
+        }
+
+        if ($article->source_type == ArticleModel::SOURCE_ORIGIN) {
+            $items['factor2'] = 5 * $weight['factor2'];
+        }
+
+        if ($article->view_count > 0) {
+            $items['factor3'] = log($article->view_count) * $weight['factor3'];
+        }
+
+        if ($article->favorite_count > 0) {
+            $items['factor4'] = log($article->favorite_count) * $weight['factor4'];
+        }
+
+        if ($article->like_count > 0) {
+            $items['factor5'] = log($article->like_count) * $weight['factor5'];
+        }
+
+        if ($article->comment_count > 0 ) {
+            $items['factor6'] = log($article->comment_count) * $weight['factor6'];
+        }
+
+        $score = array_sum($items) / log(time() - $article->create_time);
+
+        return round($score, 4);
+    }
+
+}
diff --git a/app/Services/Utils/CourseScore.php b/app/Services/Utils/CourseScore.php
new file mode 100644
index 00000000..5ef6652f
--- /dev/null
+++ b/app/Services/Utils/CourseScore.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Services\Utils;
+
+use App\Models\Course as CourseModel;
+use App\Services\Service as AppService;
+
+class CourseScore extends AppService
+{
+
+    public function handle(CourseModel $course)
+    {
+        if ($course->market_price == 0) {
+            $score = $this->calculateFreeCourseScore($course);
+        } else {
+            $score = $this->calculateChargeCourseScore($course);
+        }
+
+        $course->score = $score;
+
+        $course->update();
+    }
+
+    protected function calculateFreeCourseScore(CourseModel $course)
+    {
+        $weight = [
+            'factor1' => 0.1,
+            'factor2' => 0.25,
+            'factor3' => 0.2,
+            'factor4' => 0.1,
+            'factor5' => 0.25,
+            'factor6' => 0.1,
+        ];
+
+        return $this->calculateCourseScore($course, $weight);
+    }
+
+    protected function calculateChargeCourseScore(CourseModel $course)
+    {
+        $weight = [
+            'factor1' => 0.1,
+            'factor2' => 0.3,
+            'factor3' => 0.15,
+            'factor4' => 0.15,
+            'factor5' => 0.2,
+            'factor6' => 0.1,
+        ];
+
+        return $this->calculateCourseScore($course, $weight);
+    }
+
+    protected function calculateCourseScore(CourseModel $course, $weight)
+    {
+        $items = [
+            'factor1' => 0.0,
+            'factor2' => 0.0,
+            'factor3' => 0.0,
+            'factor4' => 0.0,
+            'factor5' => 0.0,
+            'factor6' => 0.0,
+        ];
+
+        if ($course->featured == 1) {
+            $items['factor1'] = 7 * $weight['factor1'];
+        }
+
+        if ($course->user_count > 0) {
+            $items['factor2'] = log($course->user_count) * $weight['factor2'];
+        }
+
+        if ($course->favorite_count > 0) {
+            $items['factor3'] = log($course->favorite_count) * $weight['factor3'];
+        }
+
+        if ($course->consult_count > 0) {
+            $items['factor4'] = log($course->consult_count) * $weight['factor4'];
+        }
+
+        if ($course->review_count > 0 && $course->rating > 0) {
+            $items['factor5'] = log($course->review_count * $course->rating) * $weight['factor5'];
+        }
+
+        $sumCount = $course->lesson_count + $course->package_count + $course->resource_count;
+
+        if ($sumCount > 0) {
+            $items['factor6'] = log($sumCount) * $weight['factor6'];
+        }
+
+        $score = array_sum($items) / log(time() - $course->create_time);
+
+        return round($score, 4);
+    }
+
+}
diff --git a/app/Services/Utils/QuestionScore.php b/app/Services/Utils/QuestionScore.php
new file mode 100644
index 00000000..00691823
--- /dev/null
+++ b/app/Services/Utils/QuestionScore.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Services\Utils;
+
+use App\Models\Question as QuestionModel;
+use App\Services\Service as AppService;
+
+class QuestionScore extends AppService
+{
+
+    public function handle(QuestionModel $question)
+    {
+        return $this->calculateScore($question);
+    }
+
+    protected function calculateScore(QuestionModel $question)
+    {
+        $weight = [
+            'factor1' => 0.2,
+            'factor2' => 0.1,
+            'factor3' => 0.15,
+            'factor4' => 0.2,
+            'factor5' => 0.15,
+            'factor6' => 0.2,
+        ];
+
+        $items = [
+            'factor1' => 0.0,
+            'factor2' => 0.0,
+            'factor3' => 0.0,
+            'factor4' => 0.0,
+            'factor5' => 0.0,
+            'factor6' => 0.0,
+        ];
+
+        if ($question->bounty > 0) {
+            $items['factor1'] = 5 * $weight['factor1'];
+        }
+
+        if ($question->answer_count > 0) {
+            $items['factor2'] = 5 * $weight['factor2'];
+        }
+
+        if ($question->view_count > 0) {
+            $items['factor3'] = log($question->view_count) * $weight['factor3'];
+        }
+
+        if ($question->favorite_count > 0) {
+            $items['factor4'] = log($question->favorite_count) * $weight['factor4'];
+        }
+
+        if ($question->like_count > 0) {
+            $items['factor5'] = log($question->like_count) * $weight['factor5'];
+        }
+
+        if ($question->comment_count > 0) {
+            $items['factor6'] = log($question->comment_count) * $weight['factor6'];
+        }
+
+        $score = array_sum($items) / log(time() - $question->create_time);
+
+        return round($score, 4);
+    }
+
+}
diff --git a/app/Validators/Answer.php b/app/Validators/Answer.php
new file mode 100644
index 00000000..0c3cecd5
--- /dev/null
+++ b/app/Validators/Answer.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace App\Validators;
+
+use App\Caches\MaxAnswerId as MaxAnswerIdCache;
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Models\Answer as AnswerModel;
+use App\Models\Question as QuestionModel;
+use App\Models\Reason as ReasonModel;
+use App\Models\User as UserModel;
+use App\Repos\Answer as AnswerRepo;
+use App\Repos\Question as QuestionRepo;
+
+class Answer extends Validator
+{
+
+    public function checkAnswer($id)
+    {
+        $this->checkId($id);
+
+        $answerRepo = new AnswerRepo();
+
+        $answer = $answerRepo->findById($id);
+
+        if (!$answer) {
+            throw new BadRequestException('answer.not_found');
+        }
+
+        return $answer;
+    }
+
+    public function checkId($id)
+    {
+        $id = intval($id);
+
+        $maxIdCache = new MaxAnswerIdCache();
+
+        $maxId = $maxIdCache->get();
+
+        if ($id < 1 || $id > $maxId) {
+            throw new BadRequestException('answer.not_found');
+        }
+    }
+
+    public function checkQuestion($id)
+    {
+        $validator = new Question();
+
+        return $validator->checkQuestion($id);
+    }
+
+    public function checkContent($content)
+    {
+        $value = $this->filter->sanitize($content, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 10) {
+            throw new BadRequestException('answer.content_too_short');
+        }
+
+        if ($length > 30000) {
+            throw new BadRequestException('answer.content_too_long');
+        }
+
+        return $value;
+    }
+
+    public function checkPublishStatus($status)
+    {
+        if (!array_key_exists($status, AnswerModel::publishTypes())) {
+            throw new BadRequestException('answer.invalid_publish_status');
+        }
+
+        return $status;
+    }
+
+    public function checkRejectReason($reason)
+    {
+        if (!array_key_exists($reason, ReasonModel::answerRejectOptions())) {
+            throw new BadRequestException('answer.invalid_reject_reason');
+        }
+    }
+
+    public function checkIfAllowAnswer(QuestionModel $question, UserModel $user)
+    {
+        $allowed = true;
+
+        $questionRepo = new QuestionRepo();
+
+        $answers = $questionRepo->findUserAnswers($question->id, $user->id);
+
+        if ($answers->count() > 0) {
+            $allowed = false;
+        }
+
+        if ($question->closed == 1 || $question->solved == 1) {
+            $allowed = false;
+        }
+
+        if (!$allowed) {
+            throw new BadRequestException('answer.post_not_allowed');
+        }
+    }
+
+    public function checkIfAllowEdit(AnswerModel $answer)
+    {
+        if ($answer->accepted == 1) {
+            throw new BadRequestException('answer.edit_not_allowed');
+        }
+
+        $case1 = $answer->published == AnswerModel::PUBLISH_APPROVED;
+        $case2 = time() - $answer->create_time > 3600;
+
+        if ($case1 && $case2) {
+            throw new BadRequestException('answer.edit_not_allowed');
+        }
+    }
+
+    public function checkIfAllowDelete(AnswerModel $answer)
+    {
+        if ($answer->accepted == 1) {
+            throw new BadRequestException('answer.delete_not_allowed');
+        }
+    }
+
+}
diff --git a/app/Validators/Article.php b/app/Validators/Article.php
index 28ccfdef..077c4c04 100644
--- a/app/Validators/Article.php
+++ b/app/Validators/Article.php
@@ -7,6 +7,7 @@ use App\Caches\MaxArticleId as MaxArticleIdCache;
 use App\Exceptions\BadRequest as BadRequestException;
 use App\Library\Validators\Common as CommonValidator;
 use App\Models\Article as ArticleModel;
+use App\Models\Reason as ReasonModel;
 use App\Repos\Article as ArticleRepo;
 
 class Article extends Validator
@@ -84,30 +85,6 @@ class Article extends Validator
         return $value;
     }
 
-    public function checkCover($cover)
-    {
-        $value = $this->filter->sanitize($cover, ['trim', 'string']);
-
-        if (!CommonValidator::url($value)) {
-            throw new BadRequestException('article.invalid_cover');
-        }
-
-        return kg_cos_img_style_trim($value);
-    }
-
-    public function checkSummary($summary)
-    {
-        $value = $this->filter->sanitize($summary, ['trim', 'string']);
-
-        $length = kg_strlen($value);
-
-        if ($length > 255) {
-            throw new BadRequestException('article.summary_too_long');
-        }
-
-        return $value;
-    }
-
     public function checkContent($content)
     {
         $value = $this->filter->sanitize($content, ['trim']);
@@ -172,13 +149,20 @@ class Article extends Validator
         return $status;
     }
 
-    public function checkAllowCommentStatus($status)
+    public function checkCloseStatus($status)
     {
         if (!in_array($status, [0, 1])) {
-            throw new BadRequestException('article.invalid_allow_comment_status');
+            throw new BadRequestException('article.invalid_close_status');
         }
 
         return $status;
     }
 
+    public function checkRejectReason($reason)
+    {
+        if (!array_key_exists($reason, ReasonModel::questionRejectOptions())) {
+            throw new BadRequestException('article.invalid_reject_reason');
+        }
+    }
+
 }
diff --git a/app/Validators/ArticleQuery.php b/app/Validators/ArticleQuery.php
index 2cb141a6..2d0b12b1 100644
--- a/app/Validators/ArticleQuery.php
+++ b/app/Validators/ArticleQuery.php
@@ -5,7 +5,7 @@ namespace App\Validators;
 use App\Caches\Category as CategoryCache;
 use App\Caches\Tag as TagCache;
 use App\Exceptions\BadRequest as BadRequestException;
-use App\Models\Course as CourseModel;
+use App\Models\Article as ArticleModel;
 
 class ArticleQuery extends Validator
 {
@@ -38,7 +38,7 @@ class ArticleQuery extends Validator
 
     public function checkSort($sort)
     {
-        $types = CourseModel::sortTypes();
+        $types = ArticleModel::sortTypes();
 
         if (!isset($types[$sort])) {
             throw new BadRequestException('article_query.invalid_sort');
diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php
index 96fe6e7c..7e8f2e5b 100644
--- a/app/Validators/Consult.php
+++ b/app/Validators/Consult.php
@@ -115,10 +115,10 @@ class Consult extends Validator
 
         /**
          * (1)已回复不允许修改提问
-         * (2)发表三天以后不能修改提问
+         * (2)发表1小时以后不能修改提问
          */
         $case1 = $consult->reply_time > 0;
-        $case2 = time() - $consult->create_time > 3 * 86400;
+        $case2 = time() - $consult->create_time > 3600;
 
         if ($case1 || $case2) {
             throw new BadRequestException('consult.edit_not_allowed');
diff --git a/app/Validators/Question.php b/app/Validators/Question.php
new file mode 100644
index 00000000..b337ce49
--- /dev/null
+++ b/app/Validators/Question.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Validators;
+
+use App\Caches\MaxQuestionId as MaxQuestionIdCache;
+use App\Caches\Question as QuestionCache;
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Models\Question as QuestionModel;
+use App\Models\Reason as ReasonModel;
+use App\Repos\Question as QuestionRepo;
+
+class Question extends Validator
+{
+
+    /**
+     * @param int $id
+     * @return QuestionModel
+     * @throws BadRequestException
+     */
+    public function checkQuestionCache($id)
+    {
+        $this->checkId($id);
+
+        $questionCache = new QuestionCache();
+
+        $question = $questionCache->get($id);
+
+        if (!$question) {
+            throw new BadRequestException('question.not_found');
+        }
+
+        return $question;
+    }
+
+    public function checkQuestion($id)
+    {
+        $this->checkId($id);
+
+        $questionRepo = new QuestionRepo();
+
+        $question = $questionRepo->findById($id);
+
+        if (!$question) {
+            throw new BadRequestException('question.not_found');
+        }
+
+        return $question;
+    }
+
+    public function checkId($id)
+    {
+        $id = intval($id);
+
+        $maxIdCache = new MaxQuestionIdCache();
+
+        $maxId = $maxIdCache->get();
+
+        if ($id < 1 || $id > $maxId) {
+            throw new BadRequestException('question.not_found');
+        }
+    }
+
+    public function checkCategory($id)
+    {
+        $validator = new Category();
+
+        return $validator->checkCategory($id);
+    }
+
+    public function checkTitle($title)
+    {
+        $value = $this->filter->sanitize($title, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 5) {
+            throw new BadRequestException('question.title_too_short');
+        }
+
+        if ($length > 50) {
+            throw new BadRequestException('question.title_too_long');
+        }
+
+        return $value;
+    }
+
+    public function checkContent($content)
+    {
+        $value = $this->filter->sanitize($content, ['trim']);
+
+        $length = kg_strlen($value);
+
+        if ($length > 30000) {
+            throw new BadRequestException('question.content_too_long');
+        }
+
+        return $value;
+    }
+
+    public function checkPublishStatus($status)
+    {
+        if (!array_key_exists($status, QuestionModel::publishTypes())) {
+            throw new BadRequestException('question.invalid_publish_status');
+        }
+
+        return $status;
+    }
+
+    public function checkAnonymousStatus($status)
+    {
+        if (!in_array($status, [0, 1])) {
+            throw new BadRequestException('question.invalid_anonymous_status');
+        }
+
+        return $status;
+    }
+
+    public function checkCloseStatus($status)
+    {
+        if (!in_array($status, [0, 1])) {
+            throw new BadRequestException('question.invalid_close_status');
+        }
+
+        return $status;
+    }
+
+    public function checkRejectReason($reason)
+    {
+        if (!array_key_exists($reason, ReasonModel::questionRejectOptions())) {
+            throw new BadRequestException('question.invalid_reject_reason');
+        }
+    }
+
+    public function checkIfAllowEdit(QuestionModel $question)
+    {
+        $approved = $question->published == QuestionModel::PUBLISH_APPROVED;
+
+        $answered = $question->answer_count > 0;
+
+        if ($approved || $answered) {
+            throw new BadRequestException('question.edit_not_allowed');
+        }
+    }
+
+    public function checkIfAllowDelete(QuestionModel $question)
+    {
+        $approved = $question->published == QuestionModel::PUBLISH_APPROVED;
+
+        $answered = $question->answer_count > 0;
+
+        if ($approved && $answered) {
+            throw new BadRequestException('question.delete_not_allowed');
+        }
+    }
+
+}
diff --git a/app/Validators/QuestionQuery.php b/app/Validators/QuestionQuery.php
new file mode 100644
index 00000000..9f5b4b1b
--- /dev/null
+++ b/app/Validators/QuestionQuery.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Validators;
+
+use App\Caches\Tag as TagCache;
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Models\Question as QuestionModel;
+
+class QuestionQuery extends Validator
+{
+
+    public function checkTag($id)
+    {
+        $tagCache = new TagCache();
+
+        $tag = $tagCache->get($id);
+
+        if (!$tag) {
+            throw new BadRequestException('question_query.invalid_tag');
+        }
+
+        return $tag->id;
+    }
+
+    public function checkSort($sort)
+    {
+        $types = QuestionModel::sortTypes();
+
+        if (!isset($types[$sort])) {
+            throw new BadRequestException('question_query.invalid_sort');
+        }
+
+        return $sort;
+    }
+
+}
diff --git a/app/Validators/Review.php b/app/Validators/Review.php
index 393d617b..1a275c36 100644
--- a/app/Validators/Review.php
+++ b/app/Validators/Review.php
@@ -67,7 +67,7 @@ class Review extends Validator
 
     public function checkIfAllowEdit(ReviewModel $review)
     {
-        $case = time() - $review->create_time > 7 * 86400;
+        $case = time() - $review->create_time > 3600;
 
         if ($case) {
             throw new BadRequestException('review.edit_not_allowed');
diff --git a/app/Validators/Tag.php b/app/Validators/Tag.php
index 470eb906..101a36da 100644
--- a/app/Validators/Tag.php
+++ b/app/Validators/Tag.php
@@ -5,6 +5,7 @@ namespace App\Validators;
 use App\Caches\MaxTagId as MaxTagIdCache;
 use App\Caches\Tag as TagCache;
 use App\Exceptions\BadRequest as BadRequestException;
+use App\Library\Validators\Common as CommonValidator;
 use App\Models\Tag as TagModel;
 use App\Repos\Tag as TagRepo;
 
@@ -76,6 +77,17 @@ class Tag extends Validator
         return $value;
     }
 
+    public function checkIcon($icon)
+    {
+        $value = $this->filter->sanitize($icon, ['trim', 'string']);
+
+        if (!CommonValidator::url($value)) {
+            throw new BadRequestException('tag.invalid_icon');
+        }
+
+        return kg_cos_img_style_trim($value);
+    }
+
     public function checkPriority($priority)
     {
         $value = $this->filter->sanitize($priority, ['trim', 'int']);
diff --git a/app/Validators/UserLimit.php b/app/Validators/UserLimit.php
index 3b9a3441..6247d0e6 100644
--- a/app/Validators/UserLimit.php
+++ b/app/Validators/UserLimit.php
@@ -71,7 +71,29 @@ class UserLimit extends Validator
     {
         $count = $this->counter->hGet($user->id, 'article_like_count');
 
-        $limit = $user->vip ? 200 : 100;
+        $limit = $user->vip ? 100 : 50;
+
+        if ($count > $limit) {
+            throw new BadRequestException('user_limit.reach_daily_like_limit');
+        }
+    }
+
+    public function checkDailyQuestionLikeLimit(UserModel $user)
+    {
+        $count = $this->counter->hGet($user->id, 'question_like_count');
+
+        $limit = $user->vip ? 100 : 50;
+
+        if ($count > $limit) {
+            throw new BadRequestException('user_limit.reach_daily_like_limit');
+        }
+    }
+
+    public function checkDailyAnswerLikeLimit(UserModel $user)
+    {
+        $count = $this->counter->hGet($user->id, 'answer_like_count');
+
+        $limit = $user->vip ? 100 : 50;
 
         if ($count > $limit) {
             throw new BadRequestException('user_limit.reach_daily_like_limit');
@@ -82,7 +104,7 @@ class UserLimit extends Validator
     {
         $count = $this->counter->hGet($user->id, 'chapter_like_count');
 
-        $limit = $user->vip ? 200 : 100;
+        $limit = $user->vip ? 100 : 50;
 
         if ($count > $limit) {
             throw new BadRequestException('user_limit.reach_daily_like_limit');
@@ -93,7 +115,7 @@ class UserLimit extends Validator
     {
         $count = $this->counter->hGet($user->id, 'consult_like_count');
 
-        $limit = $user->vip ? 200 : 100;
+        $limit = $user->vip ? 100 : 50;
 
         if ($count > $limit) {
             throw new BadRequestException('user_limit.reach_daily_like_limit');
@@ -104,7 +126,7 @@ class UserLimit extends Validator
     {
         $count = $this->counter->hGet($user->id, 'review_like_count');
 
-        $limit = $user->vip ? 200 : 100;
+        $limit = $user->vip ? 100 : 50;
 
         if ($count > $limit) {
             throw new BadRequestException('user_limit.reach_daily_like_limit');
diff --git a/config/errors.php b/config/errors.php
index a27f6968..c17ca271 100644
--- a/config/errors.php
+++ b/config/errors.php
@@ -87,6 +87,7 @@ $error['category.has_child_node'] = '不允许相关操作（存在子节点）'
  * 标签相关
  */
 $error['tag.not_found'] = '标签不存在';
+$error['tag.invalid_icon'] = '无效的图标';
 $error['tag.invalid_priority'] = '无效的排序值（范围：1-255）';
 $error['tag.invalid_publish_status'] = '无效的发布状态';
 $error['tag.name_too_short'] = '名称太短（少于2个字符）';
@@ -112,16 +113,34 @@ $error['nav.has_child_node'] = '不允许相关操作（存在子节点）';
 $error['article.not_found'] = '课程不存在';
 $error['article.title_too_short'] = '标题太短（少于5个字符）';
 $error['article.title_too_long'] = '标题太长（多于50个字符）';
-$error['article.summary_too_long'] = '标题太长（多于255个字符）';
 $error['article.content_too_short'] = '内容太短（少于10个字符）';
 $error['article.content_too_long'] = '内容太长（多于30000个字符）';
-$error['course.invalid_cover'] = '无效的封面';
 $error['article.invalid_source_type'] = '无效的来源类型';
 $error['article.invalid_source_url'] = '无效的来源网址';
-$error['course.invalid_feature_status'] = '无效的推荐状态';
-$error['course.invalid_publish_status'] = '无效的发布状态';
-$error['course.invalid_private_status'] = '无效的私有状态';
-$error['course.invalid_allow_comment_status'] = '无效的允许评论状态';
+$error['article.invalid_feature_status'] = '无效的推荐状态';
+$error['article.invalid_publish_status'] = '无效的发布状态';
+$error['article.invalid_private_status'] = '无效的私有状态';
+$error['article.invalid_close_status'] = '无效的关闭状态';
+$error['article.invalid_reject_reason'] = '无效的拒绝理由';
+
+/**
+ * 问答相关
+ */
+$error['question.not_found'] = '问题不存在';
+$error['question.title_too_short'] = '标题太短（少于5个字符）';
+$error['question.title_too_long'] = '标题太长（多于50个字符）';
+$error['question.content_too_short'] = '内容太短（少于10个字符）';
+$error['question.content_too_long'] = '内容太长（多于30000个字符）';
+$error['question.invalid_publish_status'] = '无效的发布状态';
+$error['question.invalid_reject_reason'] = '无效的拒绝理由';
+$error['question.edit_not_allowed'] = '当前不允许编辑问题';
+$error['question.delete_not_allowed'] = '当前不允许删除问题';
+
+$error['answer.content_too_short'] = '内容太短（少于10个字符）';
+$error['answer.content_too_long'] = '内容太长（多于30000个字符）';
+$error['answer.post_not_allowed'] = '当前不允许发布回答';
+$error['answer.edit_not_allowed'] = '当前不允许编辑回答';
+$error['answer.delete_not_allowed'] = '当前不允许删除回答';
 
 /**
  * 评论相关
diff --git a/config/events.php b/config/events.php
index 56d4b99e..1f8e694c 100644
--- a/config/events.php
+++ b/config/events.php
@@ -1,10 +1,12 @@
 <?php
 
 use App\Listeners\Account;
+use App\Listeners\Answer;
 use App\Listeners\Article;
 use App\Listeners\Comment;
 use App\Listeners\Consult;
 use App\Listeners\ImMessage;
+use App\Listeners\Question;
 use App\Listeners\Review;
 use App\Listeners\Site;
 use App\Listeners\Trade;
@@ -14,9 +16,11 @@ return [
     'UserDailyCounter' => UserDailyCounter::class,
     'ImMessage' => ImMessage::class,
     'Account' => Account::class,
+    'Answer' => Answer::class,
     'Article' => Article::class,
     'Comment' => Comment::class,
     'Consult' => Consult::class,
+    'Question' => Question::class,
     'Review' => Review::class,
     'Trade' => Trade::class,
     'Site' => Site::class,
diff --git a/config/xs.question.default.ini b/config/xs.question.default.ini
new file mode 100644
index 00000000..56e946d8
--- /dev/null
+++ b/config/xs.question.default.ini
@@ -0,0 +1,75 @@
+project.name = question
+project.default_charset = UTF-8
+
+server.index = xunsearch:8383
+server.search = xunsearch:8384
+
+[id]
+type = id
+
+[title]
+type = title
+
+[cover]
+type = string
+
+[summary]
+type = body
+
+[category_id]
+type = string
+index = self
+tokenizer = full
+
+[owner_id]
+type = string
+index = self
+tokenizer = full
+
+[create_time]
+type = string
+
+[last_reply_time]
+type = string
+
+[tags]
+type = string
+
+[category]
+type = string
+
+[owner]
+type = string
+
+[last_replier]
+type = string
+
+[last_answer]
+type = string
+
+[accept_answer]
+type = string
+
+[bounty]
+type = string
+
+[anonymous]
+type = string
+
+[solved]
+type = string
+
+[view_count]
+type = string
+
+[like_count]
+type = string
+
+[answer_count]
+type = string
+
+[comment_count]
+type = string
+
+[favorite_count]
+type = string
\ No newline at end of file
diff --git a/config/xs.question.ini b/config/xs.question.ini
new file mode 100644
index 00000000..d591a1f6
--- /dev/null
+++ b/config/xs.question.ini
@@ -0,0 +1,75 @@
+project.name = question
+project.default_charset = UTF-8
+
+server.index = 8383
+server.search = 8384
+
+[id]
+type = id
+
+[title]
+type = title
+
+[cover]
+type = string
+
+[summary]
+type = body
+
+[category_id]
+type = string
+index = self
+tokenizer = full
+
+[owner_id]
+type = string
+index = self
+tokenizer = full
+
+[create_time]
+type = string
+
+[last_reply_time]
+type = string
+
+[tags]
+type = string
+
+[category]
+type = string
+
+[owner]
+type = string
+
+[last_replier]
+type = string
+
+[last_answer]
+type = string
+
+[accept_answer]
+type = string
+
+[bounty]
+type = string
+
+[anonymous]
+type = string
+
+[solved]
+type = string
+
+[view_count]
+type = string
+
+[like_count]
+type = string
+
+[answer_count]
+type = string
+
+[comment_count]
+type = string
+
+[favorite_count]
+type = string
\ No newline at end of file
diff --git a/db/migrations/20200901121917_insert_role_data.php b/db/migrations/20200901121917_insert_role_data.php
index b305309f..9fd9dec7 100644
--- a/db/migrations/20200901121917_insert_role_data.php
+++ b/db/migrations/20200901121917_insert_role_data.php
@@ -15,7 +15,7 @@ final class InsertRoleData extends AbstractMigration
                 'type' => 1,
                 'name' => '管理员',
                 'summary' => '管理员',
-                'routes' => '',
+                'routes' => '[]',
                 'user_count' => 1,
                 'create_time' => $now,
             ],
@@ -24,7 +24,7 @@ final class InsertRoleData extends AbstractMigration
                 'type' => 1,
                 'name' => '运营',
                 'summary' => '运营人员',
-                'routes' => '',
+                'routes' => '[]',
                 'user_count' => 0,
                 'create_time' => $now,
             ],
@@ -33,7 +33,7 @@ final class InsertRoleData extends AbstractMigration
                 'type' => 1,
                 'name' => '编辑',
                 'summary' => '编辑人员',
-                'routes' => '',
+                'routes' => '[]',
                 'user_count' => 0,
                 'create_time' => $now,
             ],
@@ -42,7 +42,7 @@ final class InsertRoleData extends AbstractMigration
                 'type' => 1,
                 'name' => '财务',
                 'summary' => '财务人员',
-                'routes' => '',
+                'routes' => '[]',
                 'user_count' => 0,
                 'create_time' => $now,
             ],
diff --git a/db/migrations/20210430023157.php b/db/migrations/20210430023157.php
new file mode 100644
index 00000000..e6c6ec3c
--- /dev/null
+++ b/db/migrations/20210430023157.php
@@ -0,0 +1,984 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+final class V20210430023157 extends AbstractMigration
+{
+
+    public function up()
+    {
+        $this->createQuestionTable();
+        $this->createQuestionTagTable();
+        $this->createQuestionFavoriteTable();
+        $this->createQuestionLikeTable();
+        $this->createAnswerTable();
+        $this->createAnswerLikeTable();
+        $this->createReportTable();
+        $this->modifyUserTable();
+        $this->modifyArticleTable();
+        $this->modifyConsultTable();
+        $this->modifyReviewTable();
+        $this->modifyCommentTable();
+        $this->handleRoleRoutes();
+        $this->handleQuestionNav();
+        $this->handleArticleCover();
+        $this->handleArticleClosed();
+    }
+
+    public function down()
+    {
+        $this->table('kg_question')->drop()->save();
+        $this->table('kg_question_favorite')->drop()->save();
+        $this->table('kg_question_tag')->drop()->save();
+        $this->table('kg_question_like')->drop()->save();
+        $this->table('kg_answer')->drop()->save();
+        $this->table('kg_answer_like')->drop()->save();
+        $this->table('kg_report')->drop()->save();
+
+        $this->table('kg_user')
+            ->removeColumn('question_count')
+            ->removeColumn('answer_count')
+            ->removeColumn('report_count')
+            ->save();
+
+        $this->table('kg_article')
+            ->removeColumn('report_count')
+            ->save();
+
+        $this->table('kg_consult')
+            ->removeColumn('report_count')
+            ->save();
+
+        $this->table('kg_review')
+            ->removeColumn('report_count')
+            ->save();
+
+        $this->table('kg_comment')
+            ->removeColumn('report_count')
+            ->save();
+    }
+
+    protected function createQuestionTable()
+    {
+        $this->table('kg_question', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'COMPACT',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('category_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '分类编号',
+                'after' => 'id',
+            ])
+            ->addColumn('owner_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '用户编号',
+                'after' => 'category_id',
+            ])
+            ->addColumn('last_replier_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '最后回应用户',
+                'after' => 'owner_id',
+            ])
+            ->addColumn('last_answer_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '最后答案编号',
+                'after' => 'last_replier_id',
+            ])
+            ->addColumn('accept_answer_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '采纳答案编号',
+                'after' => 'last_answer_id',
+            ])
+            ->addColumn('title', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 100,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '标题',
+                'after' => 'accept_answer_id',
+            ])
+            ->addColumn('cover', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 100,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '封面',
+                'after' => 'title',
+            ])
+            ->addColumn('tags', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 255,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '标签',
+                'after' => 'cover',
+            ])
+            ->addColumn('summary', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 255,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '概要',
+                'after' => 'tags',
+            ])
+            ->addColumn('content', 'text', [
+                'null' => false,
+                'limit' => 65535,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '内容',
+                'after' => 'summary',
+            ])
+            ->addColumn('score', 'float', [
+                'null' => false,
+                'default' => '0.00',
+                'comment' => '综合得分',
+                'after' => 'content',
+            ])
+            ->addColumn('bounty', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '悬赏积分',
+                'after' => 'score',
+            ])
+            ->addColumn('anonymous', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '匿名标识',
+                'after' => 'bounty',
+            ])
+            ->addColumn('solved', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '解决标识',
+                'after' => 'anonymous',
+            ])
+            ->addColumn('closed', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '关闭标识',
+                'after' => 'solved',
+            ])
+            ->addColumn('published', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '发布标识',
+                'after' => 'closed',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'published',
+            ])
+            ->addColumn('client_type', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '终端类型',
+                'after' => 'deleted',
+            ])
+            ->addColumn('client_ip', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 64,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '终端IP',
+                'after' => 'client_type',
+            ])
+            ->addColumn('view_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '浏览数',
+                'after' => 'client_ip',
+            ])
+            ->addColumn('answer_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '答案数',
+                'after' => 'view_count',
+            ])
+            ->addColumn('comment_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '评论数',
+                'after' => 'answer_count',
+            ])
+            ->addColumn('favorite_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '收藏数',
+                'after' => 'comment_count',
+            ])
+            ->addColumn('like_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '点赞数',
+                'after' => 'favorite_count',
+            ])
+            ->addColumn('report_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '举报数',
+                'after' => 'like_count',
+            ])
+            ->addColumn('last_reply_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '回应时间',
+                'after' => 'report_count',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'reply_time',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->addIndex(['owner_id'], [
+                'name' => 'owner_id',
+                'unique' => false,
+            ])
+            ->addIndex(['last_reply_time'], [
+                'name' => 'last_reply_time',
+                'unique' => false,
+            ])
+            ->addIndex(['category_id'], [
+                'name' => 'category_id',
+                'unique' => false,
+            ])
+            ->create();
+    }
+
+    protected function createQuestionTagTable()
+    {
+        $this->table('kg_question_tag', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'COMPACT',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('question_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '问题编号',
+                'after' => 'id',
+            ])
+            ->addColumn('tag_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '标签编号',
+                'after' => 'question_id',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'tag_id',
+            ])
+            ->addIndex(['tag_id'], [
+                'name' => 'tag_id',
+                'unique' => false,
+            ])
+            ->addIndex(['question_id'], [
+                'name' => 'question_id',
+                'unique' => false,
+            ])
+            ->create();
+    }
+
+    protected function createQuestionFavoriteTable()
+    {
+        $this->table('kg_question_favorite', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'COMPACT',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('question_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '问题编号',
+                'after' => 'id',
+            ])
+            ->addColumn('user_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '用户编号',
+                'after' => 'question_id',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'user_id',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'deleted',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->addIndex(['user_id'], [
+                'name' => 'user_id',
+                'unique' => false,
+            ])
+            ->addIndex(['question_id'], [
+                'name' => 'question_id',
+                'unique' => false,
+            ])
+            ->create();
+    }
+
+    protected function createQuestionLikeTable()
+    {
+        $this->table('kg_question_like', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'COMPACT',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('question_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '问题编号',
+                'after' => 'id',
+            ])
+            ->addColumn('user_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '标签编号',
+                'after' => 'question_id',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'user_id',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'deleted',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->addIndex(['question_id', 'user_id'], [
+                'name' => 'question_user',
+                'unique' => false,
+            ])
+            ->create();
+    }
+
+    protected function createAnswerTable()
+    {
+        $this->table('kg_answer', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'DYNAMIC',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('owner_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '用户编号',
+                'after' => 'id',
+            ])
+            ->addColumn('question_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '问题编号',
+                'after' => 'owner_id',
+            ])
+            ->addColumn('cover', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 100,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '封面',
+                'after' => 'question_id',
+            ])
+            ->addColumn('summary', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 255,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '概要',
+                'after' => 'cover',
+            ])
+            ->addColumn('content', 'text', [
+                'null' => false,
+                'limit' => 65535,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '内容',
+                'after' => 'summary',
+            ])
+            ->addColumn('anonymous', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '匿名标识',
+                'after' => 'content',
+            ])
+            ->addColumn('accepted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '采纳标识',
+                'after' => 'anonymous',
+            ])
+            ->addColumn('published', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '发布标识',
+                'after' => 'accepted',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'published',
+            ])
+            ->addColumn('client_type', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '终端类型',
+                'after' => 'deleted',
+            ])
+            ->addColumn('client_ip', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 64,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '终端IP',
+                'after' => 'client_type',
+            ])
+            ->addColumn('comment_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '评论数',
+                'after' => 'client_ip',
+            ])
+            ->addColumn('like_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '点赞数',
+                'after' => 'comment_count',
+            ])
+            ->addColumn('report_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '举报数',
+                'after' => 'like_count',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'report_count',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->addIndex(['owner_id'], [
+                'name' => 'owner_id',
+                'unique' => false,
+            ])
+            ->addIndex(['question_id'], [
+                'name' => 'question_id',
+                'unique' => false,
+            ])
+            ->create();
+    }
+
+    protected function createAnswerLikeTable()
+    {
+        $this->table('kg_answer_like', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'COMPACT',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('answer_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '答案编号',
+                'after' => 'id',
+            ])
+            ->addColumn('user_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '标签编号',
+                'after' => 'answer_id',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'user_id',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'deleted',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->addIndex(['answer_id', 'user_id'], [
+                'name' => 'answer_user',
+                'unique' => false,
+            ])
+            ->create();
+    }
+
+    protected function createReportTable()
+    {
+        $this->table('kg_report', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'DYNAMIC',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('reason', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 1000,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '理由',
+                'after' => 'id',
+            ])
+            ->addColumn('owner_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '用户编号',
+                'after' => 'reason',
+            ])
+            ->addColumn('item_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '条目编号',
+                'after' => 'owner_id',
+            ])
+            ->addColumn('item_type', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '条目类型',
+                'after' => 'item_id',
+            ])
+            ->addColumn('client_type', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '终端类型',
+                'after' => 'item_type',
+            ])
+            ->addColumn('client_ip', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 64,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '终端IP',
+                'after' => 'client_type',
+            ])
+            ->addColumn('reviewed', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '处理标识',
+                'after' => 'client_ip',
+            ])
+            ->addColumn('accepted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '采纳标识',
+                'after' => 'reviewed',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'accepted',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->addIndex(['owner_id'], [
+                'name' => 'owner_id',
+                'unique' => false,
+            ])
+            ->addIndex(['item_id', 'item_type'], [
+                'name' => 'item',
+                'unique' => false,
+            ])
+            ->create();
+    }
+
+    protected function modifyUserTable()
+    {
+        $this->table('kg_user')
+            ->addColumn('question_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '提问数',
+                'after' => 'article_count',
+            ])
+            ->addColumn('answer_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '回答数',
+                'after' => 'question_count',
+            ])->addColumn('report_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '举报数',
+                'after' => 'favorite_count',
+            ])->save();
+    }
+
+    protected function modifyArticleTable()
+    {
+        $this->table('kg_article')
+            ->renameColumn('allow_comment', 'closed')
+            ->addColumn('report_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '举报数',
+                'after' => 'like_count',
+            ])->save();
+    }
+
+    protected function modifyConsultTable()
+    {
+        $this->table('kg_consult')
+            ->addColumn('report_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '举报数',
+                'after' => 'like_count',
+            ])->save();
+    }
+
+    protected function modifyReviewTable()
+    {
+        $this->table('kg_review')
+            ->addColumn('report_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '举报数',
+                'after' => 'like_count',
+            ])->save();
+    }
+
+    protected function modifyCommentTable()
+    {
+        $this->table('kg_comment')
+            ->addColumn('report_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '举报数',
+                'after' => 'like_count',
+            ])->save();
+    }
+
+    protected function handleRoleRoutes()
+    {
+        $this->getQueryBuilder()
+            ->update('kg_role')
+            ->set('routes', '[]')
+            ->where(['routes' => ''])
+            ->execute();
+    }
+
+    protected function handleArticleCover()
+    {
+        $this->getQueryBuilder()
+            ->update('kg_article')
+            ->set('cover', '')
+            ->where(['cover' => '/img/default/article_cover.png'])
+            ->execute();
+    }
+
+    protected function handleArticleClosed()
+    {
+        $this->getQueryBuilder()
+            ->update('kg_article')
+            ->set('closed', 0)
+            ->where(['closed' => 1])
+            ->execute();
+    }
+
+    protected function handleQuestionNav()
+    {
+        $data = [
+            'parent_id' => 0,
+            'level' => 1,
+            'name' => '问答',
+            'target' => '_self',
+            'url' => '/question/list',
+            'position' => 1,
+            'priority' => 99,
+            'published' => 1,
+            'create_time' => time(),
+        ];
+
+        $this->table('kg_nav')
+            ->insert($data)
+            ->save();
+
+        $nav = $this->getQueryBuilder()
+            ->select('*')
+            ->from('kg_nav')
+            ->orderDesc('id')
+            ->execute()->fetch('assoc');
+
+        $this->getQueryBuilder()
+            ->update('kg_nav')
+            ->set('path', ",{$nav['id']},")
+            ->where(['id' => $nav['id']])
+            ->execute();
+    }
+
+}
diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css
index db94aec8..ed9a65d5 100644
--- a/public/static/admin/css/common.css
+++ b/public/static/admin/css/common.css
@@ -232,14 +232,18 @@ input.kg-priority {
 img.kg-cover {
     width: 185px;
     height: 100px;
-    cursor: pointer;
 }
 
 img.kg-avatar {
     width: 96px;
     height: 96px;
     border-radius: 96px;
-    cursor: pointer;
+}
+
+img.kg-icon {
+    width: 64px;
+    height: 64px;
+    border-radius: 64px;
 }
 
 .kg-form .layui-form-label {
@@ -329,3 +333,33 @@ img.kg-qrcode {
     width: 100%;
     height: 480px;
 }
+
+.kg-mod-preview {
+    width: 800px;
+}
+
+.kg-mod-preview .title {
+    margin-bottom: 15px;
+    font-size: 24px;
+}
+
+.kg-mod-preview .meta {
+    margin-bottom: 20px;
+    color: #666;
+}
+
+.kg-mod-preview .meta span {
+    margin-right: 10px;
+}
+
+.kg-mod-preview .content {
+    margin-bottom: 20px;
+}
+
+.kg-mod-preview .tags {
+    margin-bottom: 20px;
+}
+
+.kg-review-form {
+    width: 50%;
+}
diff --git a/public/static/admin/js/avatar.upload.js b/public/static/admin/js/avatar.upload.js
index 5e470dc5..9fdb24a0 100644
--- a/public/static/admin/js/avatar.upload.js
+++ b/public/static/admin/js/avatar.upload.js
@@ -17,7 +17,6 @@ layui.use(['jquery', 'layer', 'upload'], function () {
         choose: function (obj) {
             var flag = true;
             obj.preview(function (index, file, result) {
-                console.log(file);
                 var img = new Image();
                 img.src = result;
                 img.onload = function () {
diff --git a/public/static/admin/js/icon.upload.js b/public/static/admin/js/icon.upload.js
new file mode 100644
index 00000000..85cc6d20
--- /dev/null
+++ b/public/static/admin/js/icon.upload.js
@@ -0,0 +1,25 @@
+layui.use(['jquery', 'layer', 'upload'], function () {
+
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var upload = layui.upload;
+
+    upload.render({
+        elem: '#change-icon',
+        url: '/admin/upload/icon/img',
+        accept: 'images',
+        acceptMime: 'image/*',
+        before: function () {
+            layer.load();
+        },
+        done: function (res, index, upload) {
+            $('#img-icon').attr('src', res.data.src);
+            $('input[name=icon]').val(res.data.src);
+            layer.closeAll('loading');
+        },
+        error: function (index, upload) {
+            layer.msg('上传文件失败', {icon: 2});
+        }
+    });
+
+});
\ No newline at end of file
diff --git a/public/static/admin/js/vditor.js b/public/static/admin/js/vditor.js
index 6d0762ca..6dfe5384 100644
--- a/public/static/admin/js/vditor.js
+++ b/public/static/admin/js/vditor.js
@@ -59,7 +59,8 @@ layui.use(['jquery'], function () {
             markdown: {
                 chinesePunct: true,
                 autoSpace: true
-            }
+            },
+            actions: []
         },
         fullscreen: {
             index: 9999
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index 31af3f88..48a069ed 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -340,41 +340,46 @@
     padding: 0 5px;
 }
 
-.search-course-card, .search-group-card {
+.search-course-card,
+.search-article-card,
+.search-group-card {
+    display: flex;
     padding-bottom: 15px;
     margin-bottom: 15px;
     border-bottom: 1px solid #f6f6f6;
 }
 
-.search-course-card:last-child, .search-group-card:last-child {
+.search-course-card:last-child,
+.search-group-card:last-child {
     padding-bottom: 0;
     margin-bottom: 0;
     border: none;
 }
 
 .search-course-card .cover {
-    float: left;
     width: 210px;
     height: 118px;
     margin-right: 15px;
 }
 
-.search-course-card .cover img, .search-group-card .avatar img {
+.search-course-card .cover img,
+.search-group-card .avatar img {
     width: 100%;
     height: 100%;
 }
 
 .search-course-card .info {
-    float: left;
     width: 500px;
 }
 
-.search-course-card .title, .search-group-card .name {
+.search-course-card .title,
+.search-group-card .name {
     margin-bottom: 10px;
     white-space: nowrap;
 }
 
-.search-course-card .summary {
+.search-course-card .summary,
+.search-group-card .about {
     margin-bottom: 10px;
     line-height: 1.5em;
     max-height: 4.5em;
@@ -384,21 +389,29 @@
     overflow-wrap: break-word;
 }
 
-.search-course-card .meta, .search-group-card .meta {
+.search-course-card .meta,
+.search-group-card .meta,
+.search-article-card .meta,
+.search-question-card .meta {
     color: #999;
 }
 
-.search-course-card .meta span, .search-group-card .meta span {
+.search-course-card .meta span,
+.search-group-card .meta span,
+.search-article-card .meta span,
+.search-question-card .meta span {
     margin-right: 10px;
 }
 
-.search-course-card em, .search-group-card em {
+.search-course-card em,
+.search-group-card em,
+.search-article-card em,
+.search-question-card em {
     color: red;
     font-style: normal;
 }
 
 .search-group-card .avatar {
-    float: left;
     width: 90px;
     height: 90px;
     margin-right: 15px;
@@ -409,29 +422,39 @@
 }
 
 .search-group-card .info {
-    float: left;
     width: 600px;
 }
 
-.search-group-card .about {
-    margin-bottom: 10px;
-    line-height: 1.5em;
-    color: #666;
-}
-
 .query-badge {
     padding: 2px 5px;
     margin-right: 5px;
     margin-bottom: 5px;
 }
 
-.article-sort {
+.widget-card {
+    position: relative;
+}
+
+.widget-card .more {
+    position: absolute;
+    top: 10px;
+    right: 15px;
+    z-index: 2;
+}
+
+.widget-card .more a {
+    color: #666;
+}
+
+.article-sort,
+.question-sort {
     padding-bottom: 15px;
     margin-bottom: 20px;
     border-bottom: 1px solid #e6e6e6;
 }
 
-.article-sort a {
+.article-sort a,
+.question-sort a {
     margin-right: 20px;
 }
 
@@ -458,6 +481,8 @@
 }
 
 .article-card {
+    display: flex;
+    justify-content: space-between;
     padding-bottom: 15px;
     margin-bottom: 15px;
     border-bottom: 1px solid #f6f6f6;
@@ -467,21 +492,19 @@
     margin-bottom: 0;
 }
 
+.article-card .info {
+    width: 550px;
+}
+
 .article-card .cover {
-    float: left;
-    width: 210px;
-    height: 118px;
-    margin-right: 15px;
+    width: 150px;
+    height: 84px;
 }
 
 .article-card .cover img {
     width: 100%;
     height: 100%;
-}
-
-.article-card .info {
-    float: left;
-    width: 500px;
+    border-radius: 3px;
 }
 
 .article-card:last-child {
@@ -510,6 +533,15 @@
     margin-right: 10px;
 }
 
+.sidebar-rank-card {
+    display: flex;
+    margin-bottom: 15px;
+}
+
+.sidebar .rank {
+    margin-right: 10px;
+}
+
 .sidebar-article-list .title {
     margin-bottom: 5px;
 }
@@ -539,16 +571,27 @@
 }
 
 .article-info .meta {
+    display: flex;
+    justify-content: space-between;
     margin-bottom: 20px;
     color: #666;
 }
 
-.article-info .meta span {
+.article-info .meta a {
+    color: #666;
+}
+
+.article-info .meta .left span {
     margin-right: 10px;
 }
 
+.article-info .meta .right span {
+    margin-left: 10px;
+    cursor: pointer;
+}
+
 .article-info .content {
-    margin-bottom: 15px;
+    margin-bottom: 20px;
 }
 
 .article-info .tags {
@@ -563,6 +606,54 @@
     color: #666;
 }
 
+.answer-tips {
+    margin-bottom: 20px;
+}
+
+.answer-tips h3 {
+    margin-bottom: 5px;
+    font-weight: normal;
+    font-size: inherit;
+}
+
+.answer-tips ul {
+    color: #666;
+}
+
+.answer-tips .suggest-text,
+.answer-tips .layui-icon-ok-circle {
+    color: green;
+}
+
+.answer-tips .not-suggest-text,
+.answer-tips .layui-icon-close-fill {
+    color: red;
+}
+
+.answer-tips .suggest-list {
+    margin-bottom: 15px;
+}
+
+.question-card .stats {
+    display: flex;
+    width: 120px;
+    margin-right: 15px;
+}
+
+.question-card .stats .column {
+    width: 60px;
+    text-align: center;
+    color: #666;
+}
+
+.question-card .stats .column .count {
+    line-height: 20px;
+}
+
+.question-card .stats .solved {
+    color: green;
+}
+
 #comment-form {
     margin-bottom: 30px;
 }
@@ -584,7 +675,7 @@
 }
 
 .comment-card {
-    position: relative;
+    display: flex;
     padding-bottom: 10px;
     margin-bottom: 10px;
     border-bottom: 1px solid #f6f6f6;
@@ -595,7 +686,6 @@
 }
 
 .comment-card .avatar {
-    float: left;
     width: 48px;
     height: 48px;
     margin-right: 15px;
@@ -608,13 +698,7 @@
 }
 
 .comment-card .info {
-    float: left;
-    width: 690px;
-}
-
-.comment-card .title {
-    margin-bottom: 10px;
-    color: #333;
+    width: 100%;
 }
 
 .comment-card .user {
@@ -626,13 +710,10 @@
     margin: 0 10px;
 }
 
-.comment-card .content {
-    margin-bottom: 10px;
-    line-height: 1.5em;
-    max-height: 6em;
+.comment-card .content,
+.consult-card .answer {
+    margin-bottom: 15px;
     overflow-wrap: break-word;
-    white-space: pre-wrap;
-    overflow: hidden;
     color: #666;
 }
 
@@ -648,12 +729,12 @@
     display: flex;
 }
 
-.comment-card .footer .column {
+.comment-card .footer .left .column {
     margin-right: 10px;
 }
 
-.comment-card .footer .column:last-child {
-    margin-right: 0;
+.comment-card .footer .right .column {
+    margin-left: 10px;
 }
 
 .comment-card .footer .action:hover {
@@ -662,15 +743,11 @@
     color: white;
 }
 
-.comment-card .action-reply,
-.comment-card .action-report,
-.comment-card .action-delete {
+.comment-card .footer .right .action {
     display: none;
 }
 
-.comment-card .info:hover .action-reply,
-.comment-card .info:hover .action-report,
-.comment-card .info:hover .action-delete {
+.comment-card .info:hover .right .action {
     display: inline;
 }
 
@@ -1052,17 +1129,33 @@
     white-space: normal;
 }
 
-.review-card {
+.review-card,
+.consult-card,
+.answer-card {
     position: relative;
 }
 
-.review-card .rating, .review-card .more {
+.review-card .rating,
+.consult-card .more,
+.answer-card .accepted {
     position: absolute;
     top: 0;
     right: 0;
     margin-bottom: 10px;
 }
 
+.consult-card .question {
+    margin-bottom: 10px;
+    color: #333;
+}
+
+.consult-card .question,
+.consult-card .answer {
+    line-height: 1.5em;
+    max-height: 6em;
+    overflow: hidden;
+}
+
 .review-card .rating .layui-icon {
     color: orange;
     font-size: 12px;
@@ -1116,7 +1209,8 @@
     margin-right: 5px;
 }
 
-.topic-badge {
+.topic-badge,
+.tag-badge {
     padding: 2px 5px;
     margin-right: 5px;
     margin-bottom: 5px;
@@ -1733,6 +1827,36 @@
     color: #666;
 }
 
+.tag-card {
+    float: left;
+    width: 100%;
+    height: 160px;
+    padding: 25px 0;
+    text-align: center;
+    background-color: #fff;
+    border-radius: 2px;
+    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+}
+
+.tag-card .icon {
+    margin-bottom: 20px;
+}
+
+.tag-card .icon img {
+    width: 64px;
+    height: 64px;
+    border-radius: 64px;
+    transition: 0.5s;
+}
+
+.tag-card .name {
+    margin-bottom: 20px;
+}
+
+.tag-card .stats {
+    color: #666;
+}
+
 .my-sidebar {
     float: left;
     width: 220px;
diff --git a/public/static/home/js/answer.js b/public/static/home/js/answer.js
new file mode 100644
index 00000000..f0b0dd36
--- /dev/null
+++ b/public/static/home/js/answer.js
@@ -0,0 +1,45 @@
+layui.use(['jquery', 'helper'], function () {
+
+    var $ = layui.jquery;
+    var helper = layui.helper;
+
+    $('body').on('click', '.answer-report', function () {
+        var url = $(this).data('url');
+        helper.checkLogin(function () {
+            $.ajax({
+                type: 'POST',
+                url: url,
+                success: function () {
+
+                }
+            });
+        });
+    });
+
+    $('body').on('click', '.answer-like', function () {
+        var $this = $(this);
+        var $likeCount = $this.prev();
+        var likeCount = $likeCount.data('count');
+        helper.checkLogin(function () {
+            $.ajax({
+                type: 'POST',
+                url: $this.data('url'),
+                success: function () {
+                    if ($this.hasClass('liked')) {
+                        $this.attr('title', '点赞支持').text('点赞').removeClass('liked');
+                        likeCount--;
+                    } else {
+                        $this.attr('title', '取消点赞').text('已赞').addClass('liked');
+                        likeCount++;
+                    }
+                    $likeCount.data('count', likeCount).text(likeCount);
+                }
+            });
+        });
+    });
+
+    $('body').on('click', '.answer-edit', function () {
+        window.location.href = $(this).data('url');
+    });
+
+});
\ No newline at end of file
diff --git a/public/static/home/js/article.edit.js b/public/static/home/js/article.edit.js
index 0d198c42..59452cd2 100644
--- a/public/static/home/js/article.edit.js
+++ b/public/static/home/js/article.edit.js
@@ -1,9 +1,7 @@
-layui.use(['jquery', 'form', 'layer', 'upload'], function () {
+layui.use(['jquery', 'form', 'layer'], function () {
 
     var $ = layui.jquery;
     var form = layui.form;
-    var layer = layui.layer;
-    var upload = layui.upload;
 
     form.on('select(source_type)', function (data) {
         var block = $('#source-url-block');
@@ -21,28 +19,13 @@ layui.use(['jquery', 'form', 'layer', 'upload'], function () {
         name: 'xm_tag_ids',
         max: 3,
         data: xmTags,
+        layVerify: 'required',
+        layVerType: 'msg',
+        autoRow: true,
         filterable: true,
         filterMethod: function (val, item, index, prop) {
             return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
         }
     });
 
-    upload.render({
-        elem: '#change-cover',
-        url: '/upload/cover/img',
-        accept: 'images',
-        acceptMime: 'image/*',
-        before: function () {
-            layer.load();
-        },
-        done: function (res, index, upload) {
-            $('#img-cover').attr('src', res.data.src);
-            $('input[name=cover]').val(res.data.src);
-            layer.closeAll('loading');
-        },
-        error: function (index, upload) {
-            layer.msg('上传文件失败', {icon: 2});
-        }
-    });
-
 });
\ No newline at end of file
diff --git a/public/static/home/js/article.list.js b/public/static/home/js/article.list.js
index 479a0510..502d6912 100644
--- a/public/static/home/js/article.list.js
+++ b/public/static/home/js/article.list.js
@@ -4,9 +4,19 @@ layui.use(['jquery', 'helper'], function () {
     var helper = layui.helper;
 
     var $articleList = $('#article-list');
-    var $hotAuthorList = $('#hot-author-list');
+    var $sidebarHotAuthors = $('#sidebar-hot-authors');
+    var $sidebarMyTags = $('#sidebar-my-tags');
 
-    helper.ajaxLoadHtml($articleList.data('url'), $articleList.attr('id'));
-    helper.ajaxLoadHtml($hotAuthorList.data('url'), $hotAuthorList.attr('id'));
+    if ($articleList.length > 0) {
+        helper.ajaxLoadHtml($articleList.data('url'), $articleList.attr('id'));
+    }
 
+    if ($sidebarMyTags.length > 0) {
+        helper.ajaxLoadHtml($sidebarMyTags.data('url'), $sidebarMyTags.attr('id'));
+    }
+    
+    if ($sidebarHotAuthors.length > 0) {
+        helper.ajaxLoadHtml($sidebarHotAuthors.data('url'), $sidebarHotAuthors.attr('id'));
+    }
+    
 });
\ No newline at end of file
diff --git a/public/static/home/js/article.show.js b/public/static/home/js/article.show.js
index 77577a4f..fa4175ec 100644
--- a/public/static/home/js/article.show.js
+++ b/public/static/home/js/article.show.js
@@ -3,17 +3,30 @@ layui.use(['jquery', 'helper'], function () {
     var $ = layui.jquery;
     var helper = layui.helper;
 
-    var $relatedList = $('#related-article-list');
+    var $sidebarRelated = $('#sidebar-related');
     var $commentList = $('#comment-list');
 
-    if ($relatedList.length > 0) {
-        helper.ajaxLoadHtml($relatedList.data('url'), $relatedList.attr('id'));
+    if ($sidebarRelated.length > 0) {
+        helper.ajaxLoadHtml($sidebarRelated.data('url'), $sidebarRelated.attr('id'));
     }
 
     if ($commentList.length > 0) {
         helper.ajaxLoadHtml($commentList.data('url'), $commentList.attr('id'));
     }
 
+    $('.article-report').on('click', function () {
+        /**
+         * @todo
+         */
+    });
+
+    $('.article-edit').on('click', function () {
+        var url = $(this).data('url');
+        helper.checkLogin(function () {
+            window.location.href = url;
+        });
+    });
+
     $('.icon-star').on('click', function () {
         var $this = $(this);
         var $parent = $this.parent();
@@ -67,4 +80,10 @@ layui.use(['jquery', 'helper'], function () {
         });
     });
 
+    $('.icon-reply').on('click', function () {
+        $('html').animate({
+            scrollTop: $('#comment-anchor').offset().top
+        }, 500);
+    });
+
 });
\ No newline at end of file
diff --git a/public/static/home/js/chapter.show.js b/public/static/home/js/chapter.show.js
index 8c778e47..39d33773 100644
--- a/public/static/home/js/chapter.show.js
+++ b/public/static/home/js/chapter.show.js
@@ -58,4 +58,10 @@ layui.use(['jquery', 'helper'], function () {
         });
     });
 
+    $('.icon-reply').on('click', function () {
+        $('html').animate({
+            scrollTop: $('#comment-anchor').offset().top
+        }, 500);
+    });
+
 });
\ No newline at end of file
diff --git a/public/static/home/js/comment.js b/public/static/home/js/comment.js
index 72b89a19..f40ba9f9 100644
--- a/public/static/home/js/comment.js
+++ b/public/static/home/js/comment.js
@@ -5,7 +5,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
     var layer = layui.layer;
     var helper = layui.helper;
 
-    form.on('submit(addComment)', function (data) {
+    form.on('submit(add_comment)', function (data) {
         var submit = $(this);
         var $commentList = $('#comment-list');
         var $textarea = $(data.form).find('.layui-textarea');
@@ -39,7 +39,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
         return false;
     });
 
-    form.on('submit(replyComment)', function (data) {
+    form.on('submit(reply_comment)', function (data) {
         var submit = $(this);
         var commentId = submit.data('comment-id');
         var parentId = submit.data('parent-id');
@@ -83,12 +83,6 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
         return false;
     });
 
-    $('.icon-comment').on('click', function () {
-        $('html').animate({
-            scrollTop: $('#comment-anchor').offset().top
-        }, 500);
-    });
-
     $('#btn-cancel-comment').on('click', function () {
         $('#comment-footer').hide();
     });
@@ -102,7 +96,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
         $('#comment-form-' + id).hide();
     });
 
-    $('body').on('click', '.action-toggle', function () {
+    $('body').on('click', '.comment-toggle', function () {
         var $this = $(this);
         var id = $this.data('id');
         var url = $this.data('url');
@@ -127,7 +121,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
         }
     });
 
-    $('body').on('click', '.action-reply', function () {
+    $('body').on('click', '.comment-reply', function () {
         var id = $(this).data('id');
         var $block = $('#comment-form-' + id);
         var $textarea = $block.find('textarea');
@@ -135,7 +129,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
         $textarea.focus();
     });
 
-    $('body').on('click', '.action-like', function () {
+    $('body').on('click', '.comment-like', function () {
         var $this = $(this);
         var $likeCount = $this.prev();
         var likeCount = $likeCount.data('count');
@@ -157,7 +151,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
         });
     });
 
-    $('body').on('click', '.action-delete', function () {
+    $('body').on('click', '.comment-delete', function () {
         var $this = $(this);
         var id = $this.data('id');
         var parentId = $this.data('parent-id');
diff --git a/public/static/home/js/question.edit.js b/public/static/home/js/question.edit.js
new file mode 100644
index 00000000..871d11e0
--- /dev/null
+++ b/public/static/home/js/question.edit.js
@@ -0,0 +1,20 @@
+layui.use(['jquery', 'form', 'layer'], function () {
+
+    var $ = layui.jquery;
+    var xmTags = JSON.parse($('input[name=xm_tags]').val());
+
+    xmSelect.render({
+        el: '#xm-tag-ids',
+        name: 'xm_tag_ids',
+        max: 3,
+        data: xmTags,
+        layVerify: 'required',
+        layVerType: 'msg',
+        autoRow: true,
+        filterable: true,
+        filterMethod: function (val, item, index, prop) {
+            return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
+        }
+    });
+
+});
\ No newline at end of file
diff --git a/public/static/home/js/question.list.js b/public/static/home/js/question.list.js
new file mode 100644
index 00000000..882df49a
--- /dev/null
+++ b/public/static/home/js/question.list.js
@@ -0,0 +1,27 @@
+layui.use(['jquery', 'helper'], function () {
+
+    var $ = layui.jquery;
+    var helper = layui.helper;
+
+    var $questionList = $('#question-list');
+    var $sidebarMyTags = $('#sidebar-my-tags');
+    var $sidebarHotQuestions = $('#sidebar-hot-questions');
+    var $sidebarTopAnswerers = $('#sidebar-top-answerer');
+
+    if ($questionList.length > 0) {
+        helper.ajaxLoadHtml($questionList.data('url'), $questionList.attr('id'));
+    }
+
+    if ($sidebarMyTags.length > 0) {
+        helper.ajaxLoadHtml($sidebarMyTags.data('url'), $sidebarMyTags.attr('id'));
+    }
+
+    if ($sidebarHotQuestions.length > 0) {
+        helper.ajaxLoadHtml($sidebarHotQuestions.data('url'), $sidebarHotQuestions.attr('id'));
+    }
+
+    if ($sidebarTopAnswerers.length > 0) {
+        helper.ajaxLoadHtml($sidebarTopAnswerers.data('url'), $sidebarTopAnswerers.attr('id'));
+    }
+
+});
\ No newline at end of file
diff --git a/public/static/home/js/question.share.js b/public/static/home/js/question.share.js
new file mode 100644
index 00000000..5096f92e
--- /dev/null
+++ b/public/static/home/js/question.share.js
@@ -0,0 +1,27 @@
+layui.use(['jquery', 'helper'], function () {
+
+    var $ = layui.jquery;
+    var helper = layui.helper;
+
+    var myShare = {
+        title: $('input[name="share.title"]').val(),
+        pic: $('input[name="share.pic"]').val(),
+        url: $('input[name="share.url"]').val(),
+        qrcode: $('input[name="share.qrcode"]').val()
+    };
+
+    $('.icon-wechat').on('click', function () {
+        helper.wechatShare(myShare.qrcode);
+    });
+
+    $('.icon-qq').on('click', function () {
+        var title = '分享一个好问题：' + myShare.title + '，快来和我一起学习吧！';
+        helper.qqShare(title, myShare.url, myShare.pic);
+    });
+
+    $('.icon-weibo').on('click', function () {
+        var title = '分享一个好问题：' + myShare.title + '，快来和我一起学习吧！';
+        helper.weiboShare(title, myShare.url, myShare.pic);
+    });
+
+});
\ No newline at end of file
diff --git a/public/static/home/js/question.show.js b/public/static/home/js/question.show.js
new file mode 100644
index 00000000..e4d39804
--- /dev/null
+++ b/public/static/home/js/question.show.js
@@ -0,0 +1,100 @@
+layui.use(['jquery', 'helper'], function () {
+
+    var $ = layui.jquery;
+    var helper = layui.helper;
+
+    var $answerList = $('#answer-list');
+    var $sidebarRelated = $('#sidebar-related');
+
+    if ($answerList.length > 0) {
+        helper.ajaxLoadHtml($answerList.data('url'), $answerList.attr('id'));
+    }
+
+    if ($sidebarRelated.length > 0) {
+        helper.ajaxLoadHtml($sidebarRelated.data('url'), $sidebarRelated.attr('id'));
+    }
+
+    $('.layui-tab-title > li').on('click', function () {
+        helper.ajaxLoadHtml($(this).data('url'), $answerList.attr('id'));
+    });
+
+    $('.question-report').on('click', function () {
+        /**
+         * @todo
+         */
+    });
+
+    $('.question-edit').on('click', function () {
+        var url = $(this).data('url');
+        helper.checkLogin(function () {
+            window.location.href = url;
+        });
+    });
+
+    $('.btn-answer').on('click', function () {
+        var url = $(this).data('url');
+        helper.checkLogin(function () {
+            window.location.href = url;
+        });
+    });
+
+    $('.icon-star').on('click', function () {
+        var $this = $(this);
+        var $parent = $this.parent();
+        var $favoriteCount = $parent.next();
+        var favoriteCount = $favoriteCount.data('count');
+        helper.checkLogin(function () {
+            $.ajax({
+                type: 'POST',
+                url: $parent.data('url'),
+                success: function () {
+                    if ($this.hasClass('layui-icon-star-fill')) {
+                        $this.removeClass('layui-icon-star-fill');
+                        $this.addClass('layui-icon-star');
+                        $parent.attr('title', '收藏问题');
+                        favoriteCount--;
+                    } else {
+                        $this.removeClass('layui-icon-star');
+                        $this.addClass('layui-icon-star-fill');
+                        $parent.attr('title', '取消收藏');
+                        favoriteCount++;
+                    }
+                    $favoriteCount.data('count', favoriteCount).text(favoriteCount);
+                }
+            });
+        });
+    });
+
+    $('.icon-praise').on('click', function () {
+        var $this = $(this);
+        var $parent = $this.parent();
+        var $likeCount = $parent.next();
+        var likeCount = parseInt($likeCount.text());
+        helper.checkLogin(function () {
+            $.ajax({
+                type: 'POST',
+                url: $parent.data('url'),
+                success: function () {
+                    if ($this.hasClass('active')) {
+                        $this.removeClass('active');
+                        $parent.attr('title', '点赞');
+                        $likeCount.text(likeCount - 1);
+                        likeCount -= 1;
+                    } else {
+                        $this.addClass('active');
+                        $parent.attr('title', '取消点赞');
+                        $likeCount.text(likeCount + 1);
+                        likeCount += 1;
+                    }
+                }
+            });
+        });
+    });
+
+    $('.icon-reply').on('click', function () {
+        $('html').animate({
+            scrollTop: $('#answer-anchor').offset().top
+        }, 500);
+    });
+
+});
\ No newline at end of file
diff --git a/public/static/home/js/tag.list.js b/public/static/home/js/tag.list.js
new file mode 100644
index 00000000..0b63787e
--- /dev/null
+++ b/public/static/home/js/tag.list.js
@@ -0,0 +1,49 @@
+layui.use(['jquery', 'element', 'helper'], function () {
+
+    var $ = layui.jquery;
+    var element = layui.element;
+    var helper = layui.helper;
+
+    loadAllTagList();
+    loadMyTagList();
+
+    $('body').on('click', '.btn-follow', function () {
+        var $this = $(this);
+        helper.checkLogin(function () {
+            $.ajax({
+                type: 'POST',
+                url: $this.data('url'),
+                success: function () {
+                    if ($this.hasClass('followed')) {
+                        $this.text('关注').removeClass('followed').addClass('layui-btn-primary');
+                    } else {
+                        $this.text('已关注').removeClass('layui-btn-primary').addClass('followed');
+                    }
+                }
+            });
+        });
+    });
+
+    element.on('tab(tag)', function (data) {
+        if (data.index === 0) {
+            loadAllTagList();
+        } else if (data.index === 1) {
+            loadMyTagList();
+        }
+    });
+
+    function loadAllTagList() {
+        var $allTagList = $('#all-tag-list');
+        if ($allTagList.length > 0) {
+            helper.ajaxLoadHtml($allTagList.data('url'), $allTagList.attr('id'));
+        }
+    }
+
+    function loadMyTagList() {
+        var $myTagList = $('#my-tag-list');
+        if ($myTagList.length > 0) {
+            helper.ajaxLoadHtml($myTagList.data('url'), $myTagList.attr('id'));
+        }
+    }
+
+});
\ No newline at end of file
diff --git a/public/static/home/js/vditor.js b/public/static/home/js/vditor.js
index f3158b6a..de7b4ca5 100644
--- a/public/static/home/js/vditor.js
+++ b/public/static/home/js/vditor.js
@@ -59,7 +59,8 @@ layui.use(['jquery'], function () {
             markdown: {
                 chinesePunct: true,
                 autoSpace: true
-            }
+            },
+            actions: []
         },
         fullscreen: {
             index: 9999
diff --git a/scheduler.php b/scheduler.php
index 83b58f5a..112f9bf0 100644
--- a/scheduler.php
+++ b/scheduler.php
@@ -52,9 +52,21 @@ $scheduler->php($script, $bin, ['--task' => 'sync_group_index', '--action' => 'm
 $scheduler->php($script, $bin, ['--task' => 'sync_user_index', '--action' => 'main'])
     ->hourly(23);
 
-$scheduler->php($script, $bin, ['--task' => 'sync_course_score', '--action' => 'main'])
+$scheduler->php($script, $bin, ['--task' => 'sync_article_index', '--action' => 'main'])
+    ->hourly(27);
+
+$scheduler->php($script, $bin, ['--task' => 'sync_question_index', '--action' => 'main'])
     ->hourly(29);
 
+$scheduler->php($script, $bin, ['--task' => 'sync_course_score', '--action' => 'main'])
+    ->hourly(31);
+
+$scheduler->php($script, $bin, ['--task' => 'sync_article_score', '--action' => 'main'])
+    ->hourly(33);
+
+$scheduler->php($script, $bin, ['--task' => 'sync_question_score', '--action' => 'main'])
+    ->hourly(37);
+
 $scheduler->php($script, $bin, ['--task' => 'reset_demo_account', '--action' => 'main'])
     ->hourly(59);