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/QuestionList.php b/app/Builders/QuestionList.php
new file mode 100644
index 00000000..95299dfb
--- /dev/null
+++ b/app/Builders/QuestionList.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Builders;
+
+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 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 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/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/UploadController.php b/app/Http/Admin/Controllers/UploadController.php
index 25edb530..22f2e82f 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")
      */
diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php
index 1c7871e3..04e00268 100644
--- a/app/Http/Admin/Services/AuthNode.php
+++ b/app/Http/Admin/Services/AuthNode.php
@@ -542,6 +542,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 +566,6 @@ class AuthNode extends Service
                             'type' => 'button',
                             'route' => 'admin.slide.delete',
                         ],
-                        [
-                            'id' => '2-5-5',
-                            'title' => '搜索轮播',
-                            'type' => 'menu',
-                            'route' => 'admin.slide.search',
-                        ],
                     ],
                 ],
                 [
diff --git a/app/Http/Admin/Services/Tag.php b/app/Http/Admin/Services/Tag.php
index 61a86c5e..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();
 
@@ -43,7 +43,6 @@ class Tag extends Service
 
         $tag->name = $validator->checkName($post['name']);
         $tag->priority = $validator->checkPriority($post['priority']);
-        $tag->published = $validator->checkPublishStatus($post['published']);
 
         $tag->create();
 
@@ -69,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/Views/tag/add.volt b/app/Http/Admin/Views/tag/add.volt
index 8dc363f1..b2d30288 100644
--- a/app/Http/Admin/Views/tag/add.volt
+++ b/app/Http/Admin/Views/tag/add.volt
@@ -12,19 +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">
-                <input type="radio" name="published" value="1" title="是" checked="checked" >
-                <input type="radio" name="published" 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/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/Home/Controllers/AnswerController.php b/app/Http/Home/Controllers/AnswerController.php
new file mode 100644
index 00000000..628a867a
--- /dev/null
+++ b/app/Http/Home/Controllers/AnswerController.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace App\Http\Home\Controllers;
+
+use App\Http\Home\Services\Answer as AnswerService;
+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;
+
+/**
+ * @RoutePrefix("/answer")
+ */
+class AnswerController extends Controller
+{
+
+    /**
+     * @Get("/add", name="home.answer.add")
+     */
+    public function addAction()
+    {
+
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/edit", name="home.answer.edit")
+     */
+    public function editAction($id)
+    {
+        $service = new AnswerService();
+
+        $answer = $service->getAnswer($id);
+
+        $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();
+
+        $service->handle();
+
+        $content = ['msg' => '创建答案成功'];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="home.answer.update")
+     */
+    public function updateAction($id)
+    {
+        $service = new AnswerUpdateService();
+
+        $service->handle($id);
+
+        $content = ['msg' => '更新答案成功'];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="home.answer.delete")
+     */
+    public function deleteAction($id)
+    {
+        $service = new AnswerDeleteService();
+
+        $service->handle($id);
+
+        $location = $this->url->get(['for' => 'home.uc.answers']);
+
+        $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]);
+    }
+
+}
diff --git a/app/Http/Home/Controllers/ArticleController.php b/app/Http/Home/Controllers/ArticleController.php
index ba081e4b..21021b08 100644
--- a/app/Http/Home/Controllers/ArticleController.php
+++ b/app/Http/Home/Controllers/ArticleController.php
@@ -8,9 +8,8 @@ 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\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 +77,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);
@@ -132,7 +131,7 @@ class ArticleController extends Controller
      */
     public function relatedAction($id)
     {
-        $service = new ArticleRelatedListService();
+        $service = new RelatedArticleListService();
 
         $articles = $service->handle($id);
 
@@ -140,19 +139,6 @@ 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")
      */
@@ -200,8 +186,10 @@ class ArticleController extends Controller
 
         $service->deleteArticle($id);
 
+        $location = $this->url->get(['for' => 'home.uc.articles']);
+
         $content = [
-            'location' => $this->request->getHTTPReferer(),
+            'location' => $location,
             'msg' => '删除文章成功',
         ];
 
@@ -236,5 +224,4 @@ class ArticleController extends Controller
         return $this->jsonSuccess(['data' => $data, 'msg' => $msg]);
     }
 
-
 }
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..934c10f4 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();
 
diff --git a/app/Http/Home/Controllers/QuestionController.php b/app/Http/Home/Controllers/QuestionController.php
new file mode 100644
index 00000000..57c8d207
--- /dev/null
+++ b/app/Http/Home/Controllers/QuestionController.php
@@ -0,0 +1,252 @@
+<?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->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]);
+    }
+
+}
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/Question.php b/app/Http/Home/Services/Question.php
new file mode 100644
index 00000000..800432d6
--- /dev/null
+++ b/app/Http/Home/Services/Question.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\Home\Services;
+
+use App\Models\Question as QuestionModel;
+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 getQuestion($id)
+    {
+        return $this->checkQuestion($id);
+    }
+
+    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;
+    }
+
+
+}
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..6fd31eab
--- /dev/null
+++ b/app/Http/Home/Views/answer/add.volt
@@ -0,0 +1,34 @@
+{% extends 'templates/layer.volt' %}
+
+{% block content %}
+
+    <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;">
+                <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="add_answer">提交回答</button>
+                <input type="hidden" name="question_id" value="{{ request.get('question_id') }}">
+            </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('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/edit.volt b/app/Http/Home/Views/answer/edit.volt
new file mode 100644
index 00000000..f447c9de
--- /dev/null
+++ b/app/Http/Home/Views/answer/edit.volt
@@ -0,0 +1,33 @@
+{% extends 'templates/layer.volt' %}
+
+{% block content %}
+
+    <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;">
+                <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="edit_answer">提交回答</button>
+            </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('home/js/answer.js') }}
+    {{ js_include('home/js/vditor.js') }}
+
+{% 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..e19cc01b 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">
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..25f555fd 100644
--- a/app/Http/Home/Views/article/show.volt
+++ b/app/Http/Home/Views/article/show.volt
@@ -5,14 +5,14 @@
     {{ 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 related_url = url({'for':'home.article.related','id':article.id}) %}
     {% set owner_url = url({'for':'home.user.show','id':article.owner.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>
@@ -82,7 +82,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="{{ related_url }}"></div>
         </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..ab6dee7c 100644
--- a/app/Http/Home/Views/comment/list.volt
+++ b/app/Http/Home/Views/comment/list.volt
@@ -3,10 +3,10 @@
         {% 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}) %}
         {% 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 }}">
@@ -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/replies.volt b/app/Http/Home/Views/comment/replies.volt
index 4b05ab1b..fb97af36 100644
--- a/app/Http/Home/Views/comment/replies.volt
+++ b/app/Http/Home/Views/comment/replies.volt
@@ -5,7 +5,7 @@
         {% set delete_url = url({'for':'home.comment.delete','id':item.id}) %}
         {% set reply_create_url = url({'for':'home.comment.create_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 }}">
@@ -57,7 +57,7 @@
                     <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/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/answers.volt b/app/Http/Home/Views/question/answers.volt
new file mode 100644
index 00000000..a46a1a3b
--- /dev/null
+++ b/app/Http/Home/Views/question/answers.volt
@@ -0,0 +1,62 @@
+{% if pager.total_pages > 0 %}
+    {% for item in pager.items %}
+        {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
+        {% set accept_url = url({'for':'home.answer.accept','id':item.id}) %}
+        {% set like_url = url({'for':'home.answer.like','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}) %}
+        {% set report_url = '' %}
+        <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">
+                {% if item.accepted == 1 %}
+                    <div class="accepted">
+                        <span class="layui-badge layui-bg-green">已采纳</span>
+                    </div>
+                {% endif %}
+                <div class="user">
+                    <a href="{{ owner_url }}" target="_blank">{{ item.owner.name }}</a>
+                </div>
+                <div class="content">{{ 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 action-like liked" title="取消点赞" data-url="{{ like_url }}">已赞</span>
+                            {% else %}
+                                <span class="action action-like" title="点赞支持" data-url="{{ like_url }}">点赞</span>
+                            {% endif %}
+                        </div>
+                    </div>
+                    <div class="right">
+                        {% if question.solved == 0 and auth_user.id == question.owner_id  %}
+                            <div class="column">
+                                <span class="action action-accept" data-url="{{ accept_url }}">采纳</span>
+                            </div>
+                        {% endif %}
+                        <div class="column">
+                            <span class="action action-report" data-url="{{ report_url }}">举报</span>
+                        </div>
+                        {% if auth_user.id == item.owner.id %}
+                            <div class="column">
+                                <span class="action action-edit" data-url="{{ edit_url }}">编辑</span>
+                            </div>
+                            <div class="column">
+                                <span class="action action-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..edf227ef
--- /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..99797b16
--- /dev/null
+++ b/app/Http/Home/Views/question/show.volt
@@ -0,0 +1,108 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/question') }}
+
+    {% set question_list_url = url({'for':'home.question.list'}) %}
+    {% set add_answer_url = url({'for':'home.answer.add'},{'question_id':question.id}) %}
+    {% set answer_list_url = url({'for':'home.question.answers','id':question.id}) %}
+    {% set related_url = url({'for':'home.question.related','id':question.id}) %}
+    {% set owner_url = url({'for':'home.user.show','id':question.owner.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">
+                    <span class="owner">
+                        <a href="{{ owner_url }}">{{ question.owner.name }}</a>
+                    </span>
+                    <span class="view">{{ question.view_count }} 阅读</span>
+                    <span class="answer">{{ question.answer_count }} 回答</span>
+                    <span class="time" title="{{ date('Y-m-d H:i:s',question.create_time) }}">{{ question.create_time|time_ago }}</span>
+                </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">
+                <div id="answer-list" data-url="{{ answer_list_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">
+                        <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="{{ 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>
+            {% if question.me.answered == 0 %}
+                <div class="sidebar wrap">
+                    <button class="layui-btn layui-btn-fluid btn-answer" data-url="{{ add_answer_url }}">回答问题</button>
+                </div>
+            {% endif %}
+            <div class="sidebar" id="sidebar-related" data-url="{{ 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..a49e8a24
--- /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 layui-icon-star 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/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..b5b7cfa6
--- /dev/null
+++ b/app/Http/Home/Views/search/question.volt
@@ -0,0 +1,25 @@
+{% 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>
+            </div>
+        {% endfor %}
+    </div>
+{% else %}
+    {{ partial('search/empty') }}
+{% endif %}
diff --git a/app/Http/Home/Views/tag/list.volt b/app/Http/Home/Views/tag/list.volt
new file mode 100644
index 00000000..b1a478b2
--- /dev/null
+++ b/app/Http/Home/Views/tag/list.volt
@@ -0,0 +1,38 @@
+{% 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="layui-breadcrumb breadcrumb">
+        <a href="/">首页</a>
+        <a><cite>标签</cite></a>
+    </div>
+
+    <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..3b1672ff
--- /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.review.edit','id':item.id}) %}
+                            {% set delete_url = url({'for':'home.review.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>
+                                    <button class="layui-btn layui-btn-xs btn-edit-review" data-url="{{ edit_url }}">修改</button>
+                                    <button class="layui-btn layui-btn-xs layui-bg-red kg-delete" data-url="{{ delete_url }}">删除</button>
+                                </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/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/Helper.php b/app/Library/Helper.php
index 0626c662..9c614242 100644
--- a/app/Library/Helper.php
+++ b/app/Library/Helper.php
@@ -263,6 +263,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
  *
@@ -405,6 +415,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 +476,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..47e54824
--- /dev/null
+++ b/app/Models/Answer.php
@@ -0,0 +1,181 @@
+<?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 $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);
+        }
+
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        if (empty($this->cover)) {
+            $this->cover = kg_parse_first_content_image($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 => '未通过',
+        ];
+    }
+
+}
\ 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..7f03e9b4 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;
+
     /**
      * 私有标识
      *
@@ -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..37d9c1b6 100644
--- a/app/Models/PointHistory.php
+++ b/app/Models/PointHistory.php
@@ -20,6 +20,7 @@ class PointHistory extends Model
     const EVENT_ARTICLE_POST = 10; // 发布文章
     const EVENT_QUESTION_POST = 11; // 发布问题
     const EVENT_ANSWER_POST = 12; // 发布答案
+    const EVENT_ANSWER_ACCEPT = 13; // 采纳答案
 
     /**
      * 主键编号
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/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..33811428
--- /dev/null
+++ b/app/Repos/Answer.php
@@ -0,0 +1,104 @@
+<?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 'like':
+                $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' => 'deleted = 0']);
+    }
+
+    public function countLikes($answerId)
+    {
+        return (int)AnswerLikeModel::count([
+            'conditions' => 'answer_id = :answer_id:',
+            '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/Question.php b/app/Repos/Question.php
new file mode 100644
index 00000000..4434775a
--- /dev/null
+++ b/app/Repos/Question.php
@@ -0,0 +1,202 @@
+<?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' => 'deleted = 0']);
+    }
+
+    public function countAnswers($questionId)
+    {
+        return (int)AnswerModel::count([
+            'conditions' => 'question_id = :question_id: AND deleted = 0',
+            'bind' => ['question_id' => $questionId],
+        ]);
+    }
+
+    public function countComments($questionId)
+    {
+        return (int)CommentModel::count([
+            'conditions' => 'item_id = ?1 AND item_type = ?2 AND deleted = 0',
+            'bind' => [1 => $questionId, 2 => CommentModel::ITEM_QUESTION],
+        ]);
+    }
+
+    public function countFavorites($questionId)
+    {
+        return (int)QuestionFavoriteModel::count([
+            'conditions' => 'question_id = :question_id:',
+            'bind' => ['question_id' => $questionId],
+        ]);
+    }
+
+    public function countLikes($questionId)
+    {
+        return (int)QuestionLikeModel::count([
+            'conditions' => 'question_id = :question_id:',
+            '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..d1199ce0 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;
@@ -181,6 +183,22 @@ class User extends Repository
         ]);
     }
 
+    public function countQuestions($userId)
+    {
+        return (int)QuestionModel::count([
+            'conditions' => 'owner_id = :owner_id: AND published = 1',
+            'bind' => ['owner_id' => $userId],
+        ]);
+    }
+
+    public function countAnswers($userId)
+    {
+        return (int)AnswerModel::count([
+            'conditions' => 'owner_id = :owner_id: AND published = 1',
+            'bind' => ['owner_id' => $userId],
+        ]);
+    }
+
     public function countCourseFavorites($userId)
     {
         return (int)CourseFavoriteModel::count([
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..2c319c47
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerAccept.php
@@ -0,0 +1,62 @@
+<?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\AnswerAccept 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->answer_id = $answer->id;
+        $question->solved = 1;
+
+        $question->update();
+
+        $this->handleAcceptNotice($answer, $user);
+
+        $this->eventsManager->fire('Answer:afterAccept', $this, $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..31d3200f
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerCreate.php
@@ -0,0 +1,97 @@
+<?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\Services\Logic\AnswerTrait;
+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();
+
+        $answer = new AnswerModel();
+
+        $validator = new AnswerValidator();
+
+        $validator->checkIfAllowAnswer($question, $user);
+
+        /**
+         * @todo 引入自动审核机制
+         */
+        $answer->published = AnswerModel::PUBLISH_APPROVED;
+
+        $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();
+
+        $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->incrUserAnswerCount($user);
+
+        $this->incrQuestionAnswerCount($question);
+
+        $this->handleAnswerPoint($answer);
+
+        $this->eventsManager->fire('Answer:afterCreate', $this, $answer);
+
+        return $answer;
+    }
+
+    protected function incrQuestionAnswerCount(QuestionModel $question)
+    {
+        $question->answer_count += 1;
+
+        $question->update();
+    }
+
+    protected function incrUserAnswerCount(UserModel $user)
+    {
+        $user->answer_count += 1;
+
+        $user->update();
+    }
+
+    protected function syncQuestionScore(QuestionModel $question)
+    {
+        $sync = new QuestionScoreSync();
+
+        $sync->addItem($question->id);
+    }
+
+    protected function handleAnswerPoint(AnswerModel $answer)
+    {
+        $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..2dd76549
--- /dev/null
+++ b/app/Services/Logic/Answer/AnswerDelete.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Services\Logic\Answer;
+
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+use App\Services\Logic\AnswerTrait;
+use App\Services\Logic\Question\QuestionScore as QuestionScoreService;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+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);
+
+        $answer->deleted = 1;
+
+        $answer->update();
+
+        $this->decrQuestionAnswerCount($question);
+
+        $this->updateQuestionScore($question);
+
+        $this->eventsManager->fire('Answer:afterDelete', $this, $answer);
+    }
+
+    protected function decrUserAnswerCount(UserModel $user)
+    {
+        if ($user->answer_count > 0) {
+            $user->answer_count -= 1;
+            $user->update();
+        }
+    }
+
+    protected function decrQuestionAnswerCount(QuestionModel $question)
+    {
+        if ($question->answer_count > 0) {
+            $question->answer_count -= 1;
+            $question->update();
+        }
+    }
+
+    protected function updateQuestionScore(QuestionModel $question)
+    {
+        $service = new QuestionScoreService();
+
+        $service->handle($question);
+    }
+
+}
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..2b26e2e7
--- /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);
+
+        $question = $this->checkQuestion($answer->question_id);
+
+        $user = $this->getLoginUser();
+
+        $validator = new AnswerValidator();
+
+        $validator->checkIfAllowEdit($answer, $user);
+
+        $answer->content = $validator->checkContent($post['content']);
+        $answer->client_type = $this->getClientType();
+        $answer->client_ip = $this->getClientIp();
+
+        $answer->update();
+
+        $this->syncQuestionScore($question);
+
+        $this->eventsManager->fire('Answer:afterUpdate', $this, $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/ArticleList.php b/app/Services/Logic/Article/ArticleList.php
index 07ffcd70..100b685c 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();
 
@@ -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/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/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..113b9893
--- /dev/null
+++ b/app/Services/Logic/Notice/System/AnswerAccepted.php
@@ -0,0 +1,33 @@
+<?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)
+    {
+        $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],
+        ];
+
+        $notification->create();
+    }
+
+}
diff --git a/app/Services/Logic/Notice/System/AnswerLiked.php b/app/Services/Logic/Notice/System/AnswerLiked.php
new file mode 100644
index 00000000..a49bd8c7
--- /dev/null
+++ b/app/Services/Logic/Notice/System/AnswerLiked.php
@@ -0,0 +1,33 @@
+<?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)
+    {
+        $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],
+        ];
+
+        $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/Point/History/AnswerAccept.php b/app/Services/Logic/Point/History/AnswerAccept.php
new file mode 100644
index 00000000..ba032512
--- /dev/null
+++ b/app/Services/Logic/Point/History/AnswerAccept.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 AnswerAccept 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_accept']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['answer_accept']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $eventId = $answer->id;
+        $eventType = PointHistoryModel::EVENT_ANSWER_ACCEPT;
+
+        $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/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..bf0f0cd1
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionCreate.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+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->incrUserQuestionCount($user);
+
+        $this->eventsManager->fire('Question:afterCreate', $this, $question);
+
+        return $question;
+    }
+
+    protected function incrUserQuestionCount(UserModel $user)
+    {
+        $user->question_count += 1;
+
+        $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..379718cd
--- /dev/null
+++ b/app/Services/Logic/Question/QuestionDelete.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Services\Logic\Question;
+
+use App\Models\User as UserModel;
+use App\Services\Logic\QuestionTrait;
+use App\Services\Logic\Service as LogicService;
+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);
+
+        $this->decrUserQuestionCount($user);
+    }
+
+    protected function decrUserQuestionCount(UserModel $user)
+    {
+        if ($user->question_count > 0) {
+            $user->question_count -= 1;
+            $user->update();
+        }
+    }
+
+}
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..b34e8fee
--- /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);
+
+        $category = $this->handleCategoryInfo($question);
+        $owner = $this->handleUserInfo($question->owner_id);
+        $replier = $this->handleUserInfo($question->replier_id);
+        $me = $this->handleMeInfo($question, $user);
+
+        return [
+            'id' => $question->id,
+            'title' => $question->title,
+            'summary' => $question->summary,
+            'content' => $content,
+            'tags' => $question->tags,
+            'category' => $category,
+            'owner' => $owner,
+            'replier' => $replier,
+            'me' => $me,
+            '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,
+            'reply_time' => $question->reply_time,
+            'create_time' => $question->create_time,
+            'update_time' => $question->update_time,
+        ];
+    }
+
+    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/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..2b4ac92d
--- /dev/null
+++ b/app/Services/Logic/Search/Question.php
@@ -0,0 +1,93 @@
+<?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'];
+            }
+
+            $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'],
+                'reply_time' => (int)$item['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'],
+                'tags' => json_decode($item['tags'], true),
+                'owner' => json_decode($item['owner'], true),
+                'replier' => json_decode($item['replier'], true),
+                'category' => json_decode($item['category'], true),
+            ];
+        }
+
+        $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/ArticleList.php b/app/Services/Logic/User/Console/ArticleList.php
index 77522b4b..4cf7792e 100644
--- a/app/Services/Logic/User/Console/ArticleList.php
+++ b/app/Services/Logic/User/Console/ArticleList.php
@@ -4,7 +4,7 @@ namespace App\Services\Logic\User\Console;
 
 use App\Library\Paginator\Query as PagerQuery;
 use App\Repos\Article as ArticleRepo;
-use App\Services\Logic\Article\ArticleList as ArticleListService;
+use App\Services\Logic\Article\TagList as ArticleListService;
 use App\Services\Logic\Service as LogicService;
 
 class ArticleList extends LogicService
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..28a9627e 100644
--- a/app/Services/MyStorage.php
+++ b/app/Services/MyStorage.php
@@ -165,7 +165,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 +177,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 +209,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 +219,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..155b43cd 100644
--- a/app/Services/Search/ArticleDocument.php
+++ b/app/Services/Search/ArticleDocument.php
@@ -39,7 +39,7 @@ class ArticleDocument extends Component
             $article->tags = kg_json_encode($article->tags);
         }
 
-        $owner = '';
+        $owner = '{}';
 
         if ($article->owner_id > 0) {
             $record = UserModel::findFirst($article->owner_id);
@@ -49,7 +49,7 @@ class ArticleDocument extends Component
             ]);
         }
 
-        $category = '';
+        $category = '{}';
 
         if ($article->category_id > 0) {
             $record = CategoryModel::findFirst($article->category_id);
@@ -59,8 +59,6 @@ class ArticleDocument extends Component
             ]);
         }
 
-        $article->cover = ArticleModel::getCoverPath($article->cover);
-
         if (empty($article->summary)) {
             $article->summary = kg_parse_summary($article->content);
         }
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..30ba95bf
--- /dev/null
+++ b/app/Services/Search/QuestionDocument.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Services\Search;
+
+use App\Models\Answer as AnswerModel;
+use App\Models\Category as CategoryModel;
+use App\Models\Question as QuestionModel;
+use App\Models\User as UserModel;
+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) {
+            $record = CategoryModel::findFirst($question->category_id);
+            $category = kg_json_encode([
+                'id' => $record->id,
+                'name' => $record->name,
+            ]);
+        }
+
+        $owner = '{}';
+
+        if ($question->owner_id > 0) {
+            $record = UserModel::findFirst($question->owner_id);
+            $owner = kg_json_encode([
+                'id' => $record->id,
+                'name' => $record->name,
+            ]);
+        }
+
+        $lastReplier = '{}';
+
+        if ($question->last_replier_id > 0) {
+            $record = UserModel::findFirst($question->last_replier_id);
+            $lastReplier = kg_json_encode([
+                'id' => $record->id,
+                'name' => $record->name,
+            ]);
+        }
+
+        $lastAnswer = '{}';
+
+        if ($question->last_answer_id > 0) {
+            $record = AnswerModel::findFirst($question->last_answer_id);
+            $lastAnswer = kg_json_encode([
+                'id' => $record->id,
+                'summary' => kg_parse_summary($record->content),
+            ]);
+        }
+
+        $acceptAnswer = '{}';
+
+        if ($question->accept_answer_id > 0) {
+            $record = AnswerModel::findFirst($question->accept_answer_id);
+            $lastAnswer = kg_json_encode([
+                'id' => $record->id,
+                'summary' => kg_parse_summary($record->content),
+            ]);
+        }
+
+        return [
+            'id' => $question->id,
+            'title' => $question->title,
+            'cover' => $question->cover,
+            'summary' => $question->summary,
+            'category_id' => $question->category_id,
+            'owner_id' => $question->owner_id,
+            'create_time' => $question->create_time,
+            'last_reply_time' => $question->last_reply_time,
+            'tags' => $question->tags,
+            'category' => $category,
+            'owner' => $owner,
+            'last_replier' => $lastReplier,
+            'last_answer' => $lastAnswer,
+            'accept_answer' => $acceptAnswer,
+            '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,
+        ];
+    }
+
+}
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..a0d3aa0b
--- /dev/null
+++ b/app/Validators/Answer.php
@@ -0,0 +1,100 @@
+<?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\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 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 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, UserModel $user)
+    {
+        $this->checkOwner($user->id, $answer->owner_id);
+
+        if (time() - $answer->create_time > 3600) {
+            throw new BadRequestException('answer.edit_not_allowed');
+        }
+    }
+
+}
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..05482b81
--- /dev/null
+++ b/app/Validators/Question.php
@@ -0,0 +1,130 @@
+<?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\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 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 checkIfAllowEdit(QuestionModel $question)
+    {
+        $approved = $question->published == QuestionModel::PUBLISH_APPROVED;
+
+        $answered = $question->answer_count > 0;
+
+        if ($approved || $answered) {
+            throw new BadRequestException('question.edit_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..905e17f0 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,7 +113,7 @@ $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.summary_too_long'] = '概要太长（多于255个字符）';
 $error['article.content_too_short'] = '内容太短（少于10个字符）';
 $error['article.content_too_long'] = '内容太长（多于30000个字符）';
 $error['course.invalid_cover'] = '无效的封面';
@@ -123,6 +124,25 @@ $error['course.invalid_publish_status'] = '无效的发布状态';
 $error['course.invalid_private_status'] = '无效的私有状态';
 $error['course.invalid_allow_comment_status'] = '无效的允许评论状态';
 
+/**
+ * 问答相关
+ */
+$error['question.not_found'] = '问题不存在';
+$error['question.title_too_short'] = '标题太短（少于5个字符）';
+$error['question.title_too_long'] = '标题太长（多于50个字符）';
+$error['question.summary_too_long'] = '概要太长（多于255个字符）';
+$error['question.content_too_short'] = '内容太短（少于10个字符）';
+$error['question.content_too_long'] = '内容太长（多于30000个字符）';
+$error['question.invalid_publish_status'] = '无效的发布状态';
+$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..596a5a26
--- /dev/null
+++ b/db/migrations/20210430023157.php
@@ -0,0 +1,916 @@
+<?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();
+    }
+
+    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('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'user_id',
+            ])
+            ->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('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'user_id',
+            ])
+            ->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('content', 'text', [
+                'null' => false,
+                'limit' => 65535,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '内容',
+                'after' => 'cover',
+            ])
+            ->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('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'user_id',
+            ])
+            ->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')
+            ->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 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..2c8b6cf4 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 {
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/home/css/common.css b/public/static/home/css/common.css
index 31af3f88..0febc49a 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -340,13 +340,15 @@
     padding: 0 5px;
 }
 
-.search-course-card, .search-group-card {
+.search-course-card,
+.search-group-card {
     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;
@@ -359,7 +361,8 @@
     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%;
 }
@@ -369,7 +372,8 @@
     width: 500px;
 }
 
-.search-course-card .title, .search-group-card .name {
+.search-course-card .title,
+.search-group-card .name {
     margin-bottom: 10px;
     white-space: nowrap;
 }
@@ -384,15 +388,20 @@
     overflow-wrap: break-word;
 }
 
-.search-course-card .meta, .search-group-card .meta {
+.search-course-card .meta,
+.search-group-card .meta {
     color: #999;
 }
 
-.search-course-card .meta span, .search-group-card .meta span {
+.search-course-card .meta span,
+.search-group-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;
 }
@@ -425,13 +434,30 @@
     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 +484,8 @@
 }
 
 .article-card {
+    display: flex;
+    justify-content: space-between;
     padding-bottom: 15px;
     margin-bottom: 15px;
     border-bottom: 1px solid #f6f6f6;
@@ -467,21 +495,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 +536,15 @@
     margin-right: 10px;
 }
 
+.sidebar-rank-card {
+    display: flex;
+    margin-bottom: 15px;
+}
+
+.sidebar .rank {
+    margin-right: 10px;
+}
+
 .sidebar-article-list .title {
     margin-bottom: 5px;
 }
@@ -563,6 +598,30 @@
     color: #666;
 }
 
+.answer-form {
+    margin-bottom: 20px;
+}
+
+.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 +643,7 @@
 }
 
 .comment-card {
-    position: relative;
+    display: flex;
     padding-bottom: 10px;
     margin-bottom: 10px;
     border-bottom: 1px solid #f6f6f6;
@@ -595,7 +654,6 @@
 }
 
 .comment-card .avatar {
-    float: left;
     width: 48px;
     height: 48px;
     margin-right: 15px;
@@ -608,13 +666,7 @@
 }
 
 .comment-card .info {
-    float: left;
-    width: 690px;
-}
-
-.comment-card .title {
-    margin-bottom: 10px;
-    color: #333;
+    width: 680px;
 }
 
 .comment-card .user {
@@ -626,13 +678,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;
 }
 
@@ -662,15 +711,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 +1097,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 +1177,8 @@
     margin-right: 5px;
 }
 
-.topic-badge {
+.topic-badge,
+.tag-badge {
     padding: 2px 5px;
     margin-right: 5px;
     margin-bottom: 5px;
@@ -1733,6 +1795,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..5a9d3385
--- /dev/null
+++ b/public/static/home/js/answer.js
@@ -0,0 +1,106 @@
+layui.use(['jquery', 'form', 'layer', 'helper'], function () {
+
+    var $ = layui.jquery;
+    var form = layui.form;
+    var layer = layui.layer;
+    var helper = layui.helper;
+
+    form.on('submit(add_answer)', function (data) {
+        var index = parent.layer.getFrameIndex(window.name);
+        $.ajax({
+            type: 'POST',
+            url: data.form.action,
+            data: data.field,
+            success: function (res) {
+                parent.layer.close(index);
+                parent.location.reload();
+            },
+            error: function (xhr) {
+                var res = JSON.parse(xhr.responseText);
+                layer.msg(res.msg);
+            }
+        });
+        return false;
+    });
+
+    form.on('submit(edit_answer)', function (data) {
+        var index = parent.layer.getFrameIndex(window.name);
+        $.ajax({
+            type: 'POST',
+            url: data.form.action,
+            data: data.field,
+            success: function (res) {
+                parent.layer.close(index);
+                parent.location.reload();
+            },
+            error: function (xhr) {
+                var res = JSON.parse(xhr.responseText);
+                layer.msg(res.msg);
+            }
+        });
+        return false;
+    });
+
+    $('body').on('click', '.action-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', '.action-accept', function () {
+
+    });
+
+    $('body').on('click', '.action-edit', function () {
+        layer.open({
+            type: 2,
+            title: '编辑答案',
+            content: $(this).data('url'),
+            area: ['800px', '600px']
+        });
+    });
+
+    $('body').on('click', '.action-delete', function () {
+        var $this = $(this);
+        var id = $this.data('id');
+        var parentId = $this.data('parent-id');
+        var $answer = $('#answer-' + id);
+        var $tbAnswerCount = $('#toolbar-answer > .text');
+        var tbAnswerCount = $tbAnswerCount.data('count');
+        layer.confirm('确定要删除吗？', function () {
+            $.ajax({
+                type: 'POST',
+                url: $this.data('url'),
+                success: function () {
+                    if (parentId > 0) {
+                        var $replyCount = $('#answer-' + parentId).find('.reply-count');
+                        var replyCount = $replyCount.data('count');
+                        replyCount--;
+                        $replyCount.data('count', replyCount).text(replyCount);
+                    }
+                    tbAnswerCount--;
+                    $tbAnswerCount.data('count', tbAnswerCount).text(tbAnswerCount);
+                    $answer.remove();
+                    layer.msg('删除评论成功');
+                }
+            });
+        });
+    });
+
+});
\ 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..0693230b 100644
--- a/public/static/home/js/article.show.js
+++ b/public/static/home/js/article.show.js
@@ -3,11 +3,11 @@ 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) {
diff --git a/public/static/home/js/comment.js b/public/static/home/js/comment.js
index 72b89a19..154c6e87 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');
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..3bf15cac
--- /dev/null
+++ b/public/static/home/js/question.show.js
@@ -0,0 +1,83 @@
+layui.use(['jquery', 'layer', 'helper'], function () {
+
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    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'));
+    }
+
+    $('.btn-answer').on('click', function () {
+        var url = $(this).data('url');
+        helper.checkLogin(function () {
+            layer.open({
+                type: 2,
+                title: '回答问题',
+                content: url,
+                area: ['800px', '600px']
+            });
+        });
+    });
+
+    $('.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;
+                    }
+                }
+            });
+        });
+    });
+
+});
\ 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 0afb16c4..a7434ee3 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' => 'clean_log', '--action' => 'main'])
     ->daily(3, 3);