From cdc174acdcbeb965834944575e91bb932030ffb5 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Wed, 14 Oct 2020 09:57:45 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0index=5Ftpl=5Ftype=3Dsi?=
 =?UTF-8?q?mple=E6=97=B6=E9=87=8D=E5=BB=BA=E7=BC=93=E5=AD=98=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Tasks/MaintainTask.php | 36 +++++++++++++++++++++++++-----
 app/Console/Tasks/Task.php         |  2 +-
 app/Console/Tasks/UpgradeTask.php  |  6 -----
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/Console/Tasks/MaintainTask.php b/app/Console/Tasks/MaintainTask.php
index f360db8f..9ac60365 100644
--- a/app/Console/Tasks/MaintainTask.php
+++ b/app/Console/Tasks/MaintainTask.php
@@ -4,6 +4,9 @@ namespace App\Console\Tasks;
 
 use App\Caches\IndexFreeCourseList as IndexFreeCourseListCache;
 use App\Caches\IndexNewCourseList as IndexNewCourseListCache;
+use App\Caches\IndexSimpleFreeCourseList as IndexSimpleFreeCourseListCache;
+use App\Caches\IndexSimpleNewCourseList as IndexSimpleNewCourseListCache;
+use App\Caches\IndexSimpleVipCourseList as IndexSimpleVipCourseListCache;
 use App\Caches\IndexVipCourseList as IndexVipCourseListCache;
 use App\Http\Admin\Services\Setting as SettingService;
 use App\Library\Utils\Password as PasswordUtil;
@@ -22,20 +25,41 @@ class MaintainTask extends Task
     {
         $section = $params[0] ?? null;
 
+        $site = $this->getSettings('site');
+
+        $type = $site['index_tpl_type'] ?: 'full';
+
         if (!$section || $section == 'new_course') {
-            $cache = new IndexNewCourseListCache();
-            $cache->rebuild();
+            if ($type == 'full') {
+                $cache = new IndexNewCourseListCache();
+                $cache->rebuild();
+            } else {
+                $cache = new IndexSimpleNewCourseListCache();
+                $cache->rebuild();
+            }
         }
 
         if (!$section || $section == 'free_course') {
-            $cache = new IndexFreeCourseListCache();
-            $cache->rebuild();
+            if ($type == 'full') {
+                $cache = new IndexFreeCourseListCache();
+                $cache->rebuild();
+            } else {
+                $cache = new IndexSimpleFreeCourseListCache();
+                $cache->rebuild();
+            }
         }
 
         if (!$section || $section == 'vip_course') {
-            $cache = new IndexVipCourseListCache();
-            $cache->rebuild();
+            if ($type == 'full') {
+                $cache = new IndexVipCourseListCache();
+                $cache->rebuild();
+            } else {
+                $cache = new IndexSimpleVipCourseListCache();
+                $cache->rebuild();
+            }
         }
+
+        echo 'rebuild index course cache success' . PHP_EOL;
     }
 
     /**
diff --git a/app/Console/Tasks/Task.php b/app/Console/Tasks/Task.php
index 6478ed18..350cb5ec 100644
--- a/app/Console/Tasks/Task.php
+++ b/app/Console/Tasks/Task.php
@@ -41,7 +41,7 @@ class Task extends \Phalcon\Cli\Task
     {
         $appService = new AppService();
 
-        return $appService->getLogger($section);
+        return $appService->getSettings($section);
     }
 
 }
diff --git a/app/Console/Tasks/UpgradeTask.php b/app/Console/Tasks/UpgradeTask.php
index 13bb53fb..8700703d 100644
--- a/app/Console/Tasks/UpgradeTask.php
+++ b/app/Console/Tasks/UpgradeTask.php
@@ -43,7 +43,6 @@ class UpgradeTask extends Task
     public function resetAnnotationAction()
     {
         $config = $this->getConfig();
-
         $redis = $this->getRedis();
 
         $dbIndex = $config->path('annotation.db');
@@ -56,9 +55,7 @@ class UpgradeTask extends Task
         echo "start reset annotation..." . PHP_EOL;
 
         if (count($keys) > 0) {
-
             $keys = $this->handlePhKeys($keys);
-
             $redis->del(...$keys);
             $redis->del($statsKey);
         }
@@ -74,7 +71,6 @@ class UpgradeTask extends Task
     public function resetMetadataAction()
     {
         $config = $this->getConfig();
-
         $redis = $this->getRedis();
 
         $dbIndex = $config->path('metadata.db');
@@ -87,9 +83,7 @@ class UpgradeTask extends Task
         echo "start reset metadata..." . PHP_EOL;
 
         if (count($keys) > 0) {
-
             $keys = $this->handlePhKeys($keys);
-
             $redis->del(...$keys);
             $redis->del($statsKey);
         }

From ee20552eebf4c081298a331d42a1907e85fc174f Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Mon, 26 Oct 2020 19:59:46 +0800
Subject: [PATCH 02/16] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E7=AE=A1=E7=90=86=E5=B8=90=E5=8F=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=202.=E4=BF=AE=E6=AD=A3=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Admin/Services/AuthMenu.php              | 2 +-
 db/migrations/20200827113559_insert_user_data.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Admin/Services/AuthMenu.php b/app/Http/Admin/Services/AuthMenu.php
index 8abcfdc1..1d69cd21 100644
--- a/app/Http/Admin/Services/AuthMenu.php
+++ b/app/Http/Admin/Services/AuthMenu.php
@@ -77,7 +77,7 @@ class AuthMenu extends Component
 
         foreach ($routeIdMapping as $key => $value) {
             $ids = explode('-', $value);
-            if (in_array($key, $this->authInfo['routes'])) {
+            if (is_array($this->authInfo['routes']) && in_array($key, $this->authInfo['routes'])) {
                 $owned1stLevelIds[] = $ids[0];
                 $owned2ndLevelIds[] = $ids[0] . '-' . $ids[1];
                 $owned3rdLevelIds[] = $value;
diff --git a/db/migrations/20200827113559_insert_user_data.php b/db/migrations/20200827113559_insert_user_data.php
index 7cae238a..a11ad937 100644
--- a/db/migrations/20200827113559_insert_user_data.php
+++ b/db/migrations/20200827113559_insert_user_data.php
@@ -14,7 +14,7 @@ final class InsertUserData extends AbstractMigration
         $account = [
             'id' => 10000,
             'email' => '10000@163.com',
-            'password' => '772b6a120699280eb2cce32ec706656a',
+            'password' => '1a1e4568f1a3740b8853a8a16e29bc87',
             'salt' => 'MbZWxN3L',
             'create_time' => $now,
         ];

From cbc2e5762a5d8ab8a79e351d6ac038a0aa294cc2 Mon Sep 17 00:00:00 2001
From: koogua <xiaochong0302@gmail.com>
Date: Tue, 10 Nov 2020 10:25:16 +0800
Subject: [PATCH 03/16] =?UTF-8?q?!11=20=E9=98=B6=E6=AE=B5=E6=80=A7?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=20*=20=E6=A0=B9=E6=8D=AEapp=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E4=BD=9C=E5=87=BA=E7=9B=B8=E5=BA=94=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20*=20=E8=B7=AF=E7=94=B1=E5=A2=9E=E5=8A=A0=E5=91=BD=E5=90=8Dna?=
 =?UTF-8?q?me,=E5=A2=9E=E5=8A=A0app=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?*=20=E5=AE=8C=E6=88=90=E5=9F=BA=E6=9C=ACAPI,=E5=A2=9E=E5=8A=A0h?=
 =?UTF-8?q?5=E5=92=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Builders/CategoryTreeList.php             |  33 ++--
 app/Caches/App.php                            |  31 ++++
 app/Http/Admin/Controllers/AppController.php  | 127 ++++++++++++++
 .../Admin/Controllers/UploadController.php    |  48 +++---
 app/Http/Admin/Services/App.php               | 135 +++++++++++++++
 app/Http/Admin/Services/AuthNode.php          |  33 +++-
 app/Http/Admin/Views/app/add.volt             |  41 +++++
 app/Http/Admin/Views/app/edit.volt            |  49 ++++++
 app/Http/Admin/Views/app/list.volt            |  83 ++++++++++
 app/Http/Admin/Views/public/login.volt        |   1 -
 .../Api/Controllers/AccountController.php     | 113 +++++++++++++
 .../Api/Controllers/ChapterController.php     |  64 ++++++++
 .../Api/Controllers/ChapterLiveController.php |  73 +++++++++
 .../Api/Controllers/ConsultController.php     |  97 +++++++++++
 app/Http/Api/Controllers/Controller.php       |  28 +++-
 app/Http/Api/Controllers/CourseController.php | 128 +++++++++++++++
 app/Http/Api/Controllers/HelpController.php   |  38 +++++
 .../Api/Controllers/ImGroupController.php     |  51 ++++++
 app/Http/Api/Controllers/IndexController.php  |  58 +++++--
 app/Http/Api/Controllers/OrderController.php  |  76 +++++++++
 app/Http/Api/Controllers/PageController.php   |  25 +++
 app/Http/Api/Controllers/PublicController.php |  73 ++++++++-
 app/Http/Api/Controllers/RefundController.php |  78 +++++++++
 app/Http/Api/Controllers/ReviewController.php |  97 +++++++++++
 app/Http/Api/Controllers/SearchController.php |  61 +++++++
 .../Api/Controllers/TeacherController.php     |  51 ++++++
 app/Http/Api/Controllers/TradeController.php  |  88 ++++++++++
 app/Http/Api/Controllers/UploadController.php |  50 ++++++
 .../Api/Controllers/UserConsoleController.php | 155 ++++++++++++++++++
 app/Http/Api/Controllers/UserController.php   |  77 +++++++++
 app/Http/Api/Controllers/VerifyController.php |  38 +++++
 app/Http/Api/Controllers/VipController.php    |  40 +++++
 app/Http/Api/Module.php                       |   4 +-
 app/Http/Api/Services/Account.php             |  85 ++++++++++
 app/Http/Api/Services/Login.php               |  33 ----
 app/Http/Api/Services/Logout.php              |  17 --
 app/Http/Api/Services/Trade.php               | 125 ++++++++++++++
 .../Home/Controllers/AccountController.php    |   8 +-
 .../Home/Controllers/ChapterController.php    |  28 ++--
 .../Controllers/ChapterLiveController.php     |   3 -
 .../Home/Controllers/ConsultController.php    |  37 +++--
 app/Http/Home/Controllers/Controller.php      |   1 +
 app/Http/Home/Controllers/ImController.php    |  19 +--
 .../Controllers/ImGroupManageController.php   |   8 +-
 app/Http/Home/Controllers/IndexController.php |  16 ++
 app/Http/Home/Controllers/OrderController.php |   4 +-
 .../Home/Controllers/RefundController.php     |   8 +-
 .../Home/Controllers/ReviewController.php     |   8 +-
 .../Home/Controllers/SearchController.php     |  11 --
 .../Home/Controllers/UploadController.php     |  16 +-
 .../Home/Controllers/VerifyController.php     |  13 --
 app/Http/Home/Services/Account.php            |  14 +-
 app/Http/Home/Views/course/show_catalog.volt  |   2 +-
 app/Http/Home/Views/macros/course.volt        |  10 +-
 app/Http/Home/Views/order/confirm.volt        |   4 +-
 app/Models/App.php                            | 136 +++++++++++++++
 app/Models/AppVersion.php                     | 126 ++++++++++++++
 app/Models/Client.php                         |  28 +++-
 app/Repos/App.php                             |  78 +++++++++
 app/Services/Auth/Api.php                     |   9 +-
 app/Services/Logic/Consult/ConsultInfo.php    |  83 ++++++----
 app/Services/Logic/Course/BasicInfo.php       |   1 +
 app/Services/Logic/Course/CategoryList.php    |  19 +++
 app/Services/Logic/Course/CourseList.php      |  28 ++++
 app/Services/Logic/Im/GroupInfo.php           |  42 +++++
 app/Services/Logic/Im/GroupList.php           |  70 ++++++++
 app/Services/Logic/Im/GroupUserList.php       |  61 +++++++
 app/Services/Logic/ImGroupTrait.php           |  17 ++
 app/Services/Logic/Order/OrderInfo.php        |   2 +
 app/Services/Logic/Refund/RefundCancel.php    |   2 +
 app/Services/Logic/Review/ReviewCreate.php    |  15 +-
 app/Services/Logic/Review/ReviewInfo.php      |  42 ++++-
 app/Services/Logic/Teacher/CourseList.php     |  57 +++++++
 app/Services/Logic/Teacher/TeacherInfo.php    |   2 +-
 .../Logic/User/Console/ConsultList.php        |   1 +
 app/Services/Logic/User/Console/GroupList.php |   2 +-
 app/Services/Logic/User/CourseList.php        |   1 +
 app/Services/Logic/Verify/VerifyCode.php      |  36 ----
 app/Services/Pay.php                          |   2 +-
 app/Services/Pay/Alipay.php                   |  64 +++++++-
 app/Services/Pay/Wxpay.php                    |  64 +++++++-
 app/Traits/Client.php                         |  18 +-
 app/Traits/Response.php                       |  49 +++++-
 app/Traits/Security.php                       |   9 +-
 app/Validators/ApiSecurity.php                | 133 +++++++++++++++
 app/Validators/App.php                        |  73 +++++++++
 app/Validators/Client.php                     |  46 ++++++
 app/Validators/Security.php                   |  16 +-
 config/config.default.php                     |  10 ++
 public/h5/index.html                          |  10 ++
 public/static/home/js/order.pay.js            |   2 +-
 91 files changed, 3633 insertions(+), 335 deletions(-)
 create mode 100644 app/Caches/App.php
 create mode 100644 app/Http/Admin/Controllers/AppController.php
 create mode 100644 app/Http/Admin/Services/App.php
 create mode 100644 app/Http/Admin/Views/app/add.volt
 create mode 100644 app/Http/Admin/Views/app/edit.volt
 create mode 100644 app/Http/Admin/Views/app/list.volt
 create mode 100644 app/Http/Api/Controllers/AccountController.php
 create mode 100644 app/Http/Api/Controllers/ChapterController.php
 create mode 100644 app/Http/Api/Controllers/ChapterLiveController.php
 create mode 100644 app/Http/Api/Controllers/ConsultController.php
 create mode 100644 app/Http/Api/Controllers/CourseController.php
 create mode 100644 app/Http/Api/Controllers/HelpController.php
 create mode 100644 app/Http/Api/Controllers/ImGroupController.php
 create mode 100644 app/Http/Api/Controllers/OrderController.php
 create mode 100644 app/Http/Api/Controllers/PageController.php
 create mode 100644 app/Http/Api/Controllers/RefundController.php
 create mode 100644 app/Http/Api/Controllers/ReviewController.php
 create mode 100644 app/Http/Api/Controllers/SearchController.php
 create mode 100644 app/Http/Api/Controllers/TeacherController.php
 create mode 100644 app/Http/Api/Controllers/TradeController.php
 create mode 100644 app/Http/Api/Controllers/UploadController.php
 create mode 100644 app/Http/Api/Controllers/UserConsoleController.php
 create mode 100644 app/Http/Api/Controllers/UserController.php
 create mode 100644 app/Http/Api/Controllers/VerifyController.php
 create mode 100644 app/Http/Api/Controllers/VipController.php
 create mode 100644 app/Http/Api/Services/Account.php
 delete mode 100644 app/Http/Api/Services/Login.php
 delete mode 100644 app/Http/Api/Services/Logout.php
 create mode 100644 app/Http/Api/Services/Trade.php
 create mode 100644 app/Models/App.php
 create mode 100644 app/Models/AppVersion.php
 create mode 100644 app/Repos/App.php
 create mode 100644 app/Services/Logic/Course/CategoryList.php
 create mode 100644 app/Services/Logic/Im/GroupInfo.php
 create mode 100644 app/Services/Logic/Im/GroupList.php
 create mode 100644 app/Services/Logic/Im/GroupUserList.php
 create mode 100644 app/Services/Logic/ImGroupTrait.php
 create mode 100644 app/Services/Logic/Teacher/CourseList.php
 delete mode 100644 app/Services/Logic/Verify/VerifyCode.php
 create mode 100644 app/Validators/ApiSecurity.php
 create mode 100644 app/Validators/App.php
 create mode 100644 app/Validators/Client.php
 create mode 100644 public/h5/index.html

diff --git a/app/Builders/CategoryTreeList.php b/app/Builders/CategoryTreeList.php
index dbc32de9..944b5236 100644
--- a/app/Builders/CategoryTreeList.php
+++ b/app/Builders/CategoryTreeList.php
@@ -11,7 +11,7 @@ class CategoryTreeList extends Builder
 
     public function handle($type)
     {
-        $topCategories = $this->findChildCategories($type, 0);
+        $topCategories = $this->findTopCategories($type);
 
         if ($topCategories->count() == 0) {
             return [];
@@ -32,7 +32,7 @@ class CategoryTreeList extends Builder
 
     protected function handleChildren(CategoryModel $category)
     {
-        $subCategories = $this->findChildCategories($category->type, $category->id);
+        $subCategories = $this->findChildCategories($category->id);
 
         if ($subCategories->count() == 0) {
             return [];
@@ -51,24 +51,31 @@ class CategoryTreeList extends Builder
     }
 
     /**
-     * @param string $type
+     * @param int $type
+     * @return ResultsetInterface|Resultset|CategoryModel[]
+     */
+    protected function findTopCategories($type)
+    {
+        $query = CategoryModel::query();
+
+        $query->where('parent_id = 0');
+        $query->andWhere('published = 1');
+        $query->andWhere('type = :type:', ['type' => $type]);
+        $query->orderBy('priority ASC');
+
+        return $query->execute();
+    }
+
+    /**
      * @param int $parentId
      * @return ResultsetInterface|Resultset|CategoryModel[]
      */
-    protected function findChildCategories($type = 'course', $parentId = 0)
+    protected function findChildCategories($parentId)
     {
         $query = CategoryModel::query();
 
         $query->where('published = 1');
-
-        if ($type) {
-            $query->andWhere('type = :type:', ['type' => $type]);
-        }
-
-        if ($parentId) {
-            $query->andWhere('parent_id = :parent_id:', ['parent_id' => $parentId]);
-        }
-
+        $query->andWhere('parent_id = :parent_id:', ['parent_id' => $parentId]);
         $query->orderBy('priority ASC');
 
         return $query->execute();
diff --git a/app/Caches/App.php b/app/Caches/App.php
new file mode 100644
index 00000000..479ca191
--- /dev/null
+++ b/app/Caches/App.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Caches;
+
+use App\Repos\App as AppRepo;
+
+class App extends Cache
+{
+
+    protected $lifetime = 365 * 86400;
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return "app:{$id}";
+    }
+
+    public function getContent($id = null)
+    {
+        $appRepo = new AppRepo();
+
+        $result = $appRepo->findByAppKey($id);
+
+        return $result ?: null;
+    }
+
+}
diff --git a/app/Http/Admin/Controllers/AppController.php b/app/Http/Admin/Controllers/AppController.php
new file mode 100644
index 00000000..5871cb68
--- /dev/null
+++ b/app/Http/Admin/Controllers/AppController.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace App\Http\Admin\Controllers;
+
+use App\Http\Admin\Services\App as AppService;
+
+/**
+ * @RoutePrefix("/admin/app")
+ */
+class AppController extends Controller
+{
+
+    /**
+     * @Get("/list", name="admin.app.list")
+     */
+    public function listAction()
+    {
+        $appService = new AppService();
+
+        $pager = $appService->getApps();
+
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/add", name="admin.app.add")
+     */
+    public function addAction()
+    {
+        $appService = new AppService();
+
+        $types = $appService->getAppTypes();
+
+        $this->view->setVar('types', $types);
+    }
+
+    /**
+     * @Post("/create", name="admin.app.create")
+     */
+    public function createAction()
+    {
+        $appService = new AppService();
+
+        $appService->createApp();
+
+        $location = $this->url->get(['for' => 'admin.app.list']);
+
+        $content = [
+            'location' => $location,
+            'msg' => '创建应用成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/edit", name="admin.app.edit")
+     */
+    public function editAction($id)
+    {
+        $appService = new AppService;
+
+        $app = $appService->getApp($id);
+        $types = $appService->getAppTypes();
+
+        $this->view->setVar('app', $app);
+        $this->view->setVar('types', $types);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="admin.app.update")
+     */
+    public function updateAction($id)
+    {
+        $appService = new AppService();
+
+        $appService->updateApp($id);
+
+        $location = $this->url->get(['for' => 'admin.app.list']);
+
+        $content = [
+            'location' => $location,
+            'msg' => '更新应用成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="admin.app.delete")
+     */
+    public function deleteAction($id)
+    {
+        $appService = new AppService();
+
+        $appService->deleteApp($id);
+
+        $location = $this->request->getHTTPReferer();
+
+        $content = [
+            'location' => $location,
+            'msg' => '删除应用成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/restore", name="admin.app.restore")
+     */
+    public function restoreAction($id)
+    {
+        $appService = new AppService();
+
+        $appService->restoreApp($id);
+
+        $location = $this->request->getHTTPReferer();
+
+        $content = [
+            'location' => $location,
+            'msg' => '还原应用成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+}
diff --git a/app/Http/Admin/Controllers/UploadController.php b/app/Http/Admin/Controllers/UploadController.php
index d180c70a..878b784a 100644
--- a/app/Http/Admin/Controllers/UploadController.php
+++ b/app/Http/Admin/Controllers/UploadController.php
@@ -19,16 +19,16 @@ class UploadController extends Controller
 
         $file = $service->uploadCoverImage();
 
-        if ($file) {
-            return $this->jsonSuccess([
-                'data' => [
-                    'src' => $service->getImageUrl($file->path),
-                    'title' => $file->name,
-                ]
-            ]);
-        } else {
+        if (!$file) {
             return $this->jsonError(['msg' => '上传文件失败']);
         }
+
+        $data = [
+            'src' => $service->getImageUrl($file->path),
+            'title' => $file->name,
+        ];
+
+        return $this->jsonSuccess(['data' => $data]);
     }
 
     /**
@@ -40,16 +40,16 @@ class UploadController extends Controller
 
         $file = $service->uploadAvatarImage();
 
-        if ($file) {
-            return $this->jsonSuccess([
-                'data' => [
-                    'src' => $service->getImageUrl($file->path),
-                    'title' => $file->name,
-                ]
-            ]);
-        } else {
+        if (!$file) {
             return $this->jsonError(['msg' => '上传文件失败']);
         }
+
+        $data = [
+            'src' => $service->getImageUrl($file->path),
+            'title' => $file->name,
+        ];
+
+        return $this->jsonSuccess(['data' => $data]);
     }
 
     /**
@@ -61,16 +61,16 @@ class UploadController extends Controller
 
         $file = $service->uploadContentImage();
 
-        if ($file) {
-            return $this->jsonSuccess([
-                'data' => [
-                    'src' => $service->getImageUrl($file->path),
-                    'title' => $file->name,
-                ]
-            ]);
-        } else {
+        if (!$file) {
             return $this->jsonError(['msg' => '上传文件失败']);
         }
+
+        $data = [
+            'src' => $service->getImageUrl($file->path),
+            'title' => $file->name,
+        ];
+
+        return $this->jsonSuccess(['data' => $data]);
     }
 
     /**
diff --git a/app/Http/Admin/Services/App.php b/app/Http/Admin/Services/App.php
new file mode 100644
index 00000000..100daf8a
--- /dev/null
+++ b/app/Http/Admin/Services/App.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace App\Http\Admin\Services;
+
+use App\Caches\App as AppCache;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\App as AppModel;
+use App\Repos\App as AppRepo;
+use App\Validators\App as AppValidator;
+
+class App extends Service
+{
+
+    public function getApps()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['deleted'] = $params['deleted'] ?? 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $appRepo = new AppRepo();
+
+        return $appRepo->paginate($params, $sort, $page, $limit);
+    }
+
+    public function getApp($id)
+    {
+        return $this->findOrFail($id);
+    }
+
+    public function createApp()
+    {
+        $post = $this->request->getPost();
+
+        $validator = new AppValidator();
+
+        $data = [];
+
+        $data['type'] = $validator->checkType($post['type']);
+        $data['name'] = $validator->checkName($post['name']);
+        $data['remark'] = $validator->checkRemark($post['remark']);
+
+        $page = new AppModel();
+
+        $page->create($data);
+
+        $this->rebuildAppCache($page);
+
+        return $page;
+    }
+
+    public function updateApp($id)
+    {
+        $app = $this->findOrFail($id);
+
+        $post = $this->request->getPost();
+
+        $validator = new AppValidator();
+
+        $data = [];
+
+        if (isset($post['type'])) {
+            $data['type'] = $validator->checkType($post['type']);
+        }
+
+        if (isset($post['name'])) {
+            $data['name'] = $validator->checkName($post['name']);
+        }
+
+        if (isset($post['remark'])) {
+            $data['remark'] = $validator->checkRemark($post['remark']);
+        }
+
+        if (isset($post['published'])) {
+            $data['published'] = $validator->checkPublishStatus($post['published']);
+        }
+
+        $app->update($data);
+
+        $this->rebuildAppCache($app);
+
+        return $app;
+    }
+
+    public function deleteApp($id)
+    {
+        $app = $this->findOrFail($id);
+
+        $app->deleted = 1;
+
+        $app->update();
+
+        $this->rebuildAppCache($app);
+
+        return $app;
+    }
+
+    public function restoreApp($id)
+    {
+        $app = $this->findOrFail($id);
+
+        $app->deleted = 0;
+
+        $app->update();
+
+        $this->rebuildAppCache($app);
+
+        return $app;
+    }
+
+    public function getAppTypes()
+    {
+        return AppModel::types();
+    }
+
+    protected function rebuildAppCache(AppModel $app)
+    {
+        $cache = new AppCache();
+
+        $cache->rebuild($app->key);
+    }
+
+    protected function findOrFail($id)
+    {
+        $validator = new AppValidator();
+
+        return $validator->checkApp($id);
+    }
+
+}
diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php
index 86b54761..9f321357 100644
--- a/app/Http/Admin/Services/AuthNode.php
+++ b/app/Http/Admin/Services/AuthNode.php
@@ -671,7 +671,7 @@ class AuthNode extends Service
     {
         return [
             'id' => '5',
-            'title' => '系统配置',
+            'title' => '系统管理',
             'children' => [
                 [
                     'id' => '5-1',
@@ -746,6 +746,37 @@ class AuthNode extends Service
                         ],
                     ],
                 ],
+                [
+                    'id' => '5-2',
+                    'title' => '应用管理',
+                    'type' => 'menu',
+                    'children' => [
+                        [
+                            'id' => '5-2-1',
+                            'title' => '应用列表',
+                            'type' => 'menu',
+                            'route' => 'admin.app.list',
+                        ],
+                        [
+                            'id' => '5-2-2',
+                            'title' => '添加应用',
+                            'type' => 'menu',
+                            'route' => 'admin.app.add',
+                        ],
+                        [
+                            'id' => '5-2-3',
+                            'title' => '编辑应用',
+                            'type' => 'button',
+                            'route' => 'admin.app.edit',
+                        ],
+                        [
+                            'id' => '5-2-4',
+                            'title' => '删除应用',
+                            'type' => 'button',
+                            'route' => 'admin.app.delete',
+                        ],
+                    ],
+                ],
             ],
         ];
     }
diff --git a/app/Http/Admin/Views/app/add.volt b/app/Http/Admin/Views/app/add.volt
new file mode 100644
index 00000000..7ff4f88e
--- /dev/null
+++ b/app/Http/Admin/Views/app/add.volt
@@ -0,0 +1,41 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.app.create'}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>添加应用</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">类型</label>
+            <div class="layui-input-block">
+                <select name="type" lay-verify="required">
+                    <option value="">选择类型</option>
+                    {% for key,name in types %}
+                        <option value="{{ key }}">{{ name }}</option>
+                    {% endfor %}
+                </select>
+            </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="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="remark">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button class="kg-submit layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/app/edit.volt b/app/Http/Admin/Views/app/edit.volt
new file mode 100644
index 00000000..921acd3e
--- /dev/null
+++ b/app/Http/Admin/Views/app/edit.volt
@@ -0,0 +1,49 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.app.update','id':app.id}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>编辑应用</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">类型</label>
+            <div class="layui-input-block">
+                <select name="type" lay-verify="required">
+                    <option value="">选择类型</option>
+                    {% for key,name in types %}
+                        {% set selected = key == app.type ? 'selected="selected"' : '' %}
+                        <option value="{{ key }}" {{ selected }}>{{ name }}</option>
+                    {% endfor %}
+                </select>
+            </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="name" value="{{ app.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="remark" value="{{ app.remark }}">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">发布</label>
+            <div class="layui-input-block">
+                <input type="radio" name="published" value="1" title="是" {% if app.published == 1 %}checked="checked"{% endif %}>
+                <input type="radio" name="published" value="0" title="否" {% if app.published == 0 %}checked="checked"{% endif %}>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button class="kg-submit layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/app/list.volt b/app/Http/Admin/Views/app/list.volt
new file mode 100644
index 00000000..3c3a5394
--- /dev/null
+++ b/app/Http/Admin/Views/app/list.volt
@@ -0,0 +1,83 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {%- macro type_info(value) %}
+        {% if value == 'pc' %}
+            PC客户端
+        {% elseif value == 'h5' %}
+            H5客户端
+        {% elseif value == 'ios' %}
+            IOS客户端
+        {% elseif value == 'android' %}
+            Android客户端
+        {% elseif value == 'mp_weixin' %}
+            微信小程序
+        {% elseif value == 'mp_alipay' %}
+            支付宝小程序
+        {% else %}
+            未知
+        {% endif %}
+    {%- endmacro %}
+
+    <div class="kg-nav">
+        <div class="kg-nav-left">
+            <span class="layui-breadcrumb">
+                <a><cite>应用管理</cite></a>
+            </span>
+        </div>
+    </div>
+
+    <table class="kg-table layui-table layui-form">
+        <colgroup>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col width="10%">
+            <col width="12%">
+        </colgroup>
+        <thead>
+        <tr>
+            <th>编号</th>
+            <th>名称</th>
+            <th>类型</th>
+            <th>Key / Secret</th>
+            <th>创建时间</th>
+            <th>发布</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            {% set edit_url = url({'for':'admin.app.edit','id':item.id}) %}
+            {% set update_url = url({'for':'admin.app.update','id':item.id}) %}
+            {% set delete_url = url({'for':'admin.app.delete','id':item.id}) %}
+            {% set restore_url = url({'for':'admin.app.restore','id':item.id}) %}
+            <tr>
+                <td>{{ item.id }}</td>
+                <td><a href="{{ edit_url }}" title="{{ item.remark }}">{{ item.name }}</a></td>
+                <td>{{ type_info(item.type) }}</td>
+                <td>{{ item.key }} / {{ item.secret }}</td>
+                <td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
+                <td class="center"><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">
+                    <div class="layui-dropdown">
+                        <button class="layui-btn layui-btn-sm">操作 <i class="layui-icon layui-icon-triangle-d"></i></button>
+                        <ul>
+                            <li><a href="{{ edit_url }}">编辑</a></li>
+                            {% if item.deleted == 0 %}
+                                <li><a href="javascript:" class="kg-delete" data-url="{{ delete_url }}">删除</a></li>
+                            {% else %}
+                                <li><a href="javascript:" class="kg-restore" data-url="{{ restore_url }}">还原</a></li>
+                            {% endif %}
+                        </ul>
+                    </div>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/public/login.volt b/app/Http/Admin/Views/public/login.volt
index 9b51cbd7..adcbcbc1 100644
--- a/app/Http/Admin/Views/public/login.volt
+++ b/app/Http/Admin/Views/public/login.volt
@@ -29,7 +29,6 @@
                     {% endif %}
                     <div class="layui-form-item">
                         <div class="layui-input-block">
-
                             <button id="submit-btn" class="layui-btn layui-btn-fluid {{ disabled_class }}" {{ disabled_submit }} lay-submit="true" lay-filter="go">立即登录</button>
                             <input type="hidden" name="ticket">
                             <input type="hidden" name="rand">
diff --git a/app/Http/Api/Controllers/AccountController.php b/app/Http/Api/Controllers/AccountController.php
new file mode 100644
index 00000000..6ce03879
--- /dev/null
+++ b/app/Http/Api/Controllers/AccountController.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Http\Api\Services\Account as AccountService;
+use App\Services\Logic\Account\EmailUpdate as EmailUpdateService;
+use App\Services\Logic\Account\PasswordReset as PasswordResetService;
+use App\Services\Logic\Account\PasswordUpdate as PasswordUpdateService;
+use App\Services\Logic\Account\PhoneUpdate as PhoneUpdateService;
+
+/**
+ * @RoutePrefix("/api/account")
+ */
+class AccountController extends Controller
+{
+
+    /**
+     * @Post("/register", name="api.account.register")
+     */
+    public function registerAction()
+    {
+        $service = new AccountService();
+
+        $token = $service->register();
+
+        return $this->jsonSuccess(['token' => $token]);
+    }
+
+    /**
+     * @Post("/password/login", name="api.account.register")
+     */
+    public function loginByPasswordAction()
+    {
+        $service = new AccountService();
+
+        $token = $service->loginByPassword();
+
+        return $this->jsonSuccess(['token' => $token]);
+    }
+
+    /**
+     * @Post("/verify/login", name="api.account.verify_login")
+     */
+    public function loginByVerifyAction()
+    {
+        $service = new AccountService();
+
+        $token = $service->loginByVerify();
+
+        return $this->jsonSuccess(['token' => $token]);
+    }
+
+    /**
+     * @Get("/logout", name="api.account.logout")
+     */
+    public function logoutAction()
+    {
+        $service = new AccountService();
+
+        $service->logout();
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/password/reset", name="api.account.reset_pwd")
+     */
+    public function resetPasswordAction()
+    {
+        $service = new PasswordResetService();
+
+        $service->handle();
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/phone/update", name="api.account.update_phone")
+     */
+    public function updatePhoneAction()
+    {
+        $service = new PhoneUpdateService();
+
+        $service->handle();
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/email/update", name="api.account.update_email")
+     */
+    public function updateEmailAction()
+    {
+        $service = new EmailUpdateService();
+
+        $service->handle();
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/password/update", name="api.account.update_pwd")
+     */
+    public function updatePasswordAction()
+    {
+        $service = new PasswordUpdateService();
+
+        $service->handle();
+
+        return $this->jsonSuccess();
+    }
+
+}
diff --git a/app/Http/Api/Controllers/ChapterController.php b/app/Http/Api/Controllers/ChapterController.php
new file mode 100644
index 00000000..3e0a75eb
--- /dev/null
+++ b/app/Http/Api/Controllers/ChapterController.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Chapter\ChapterInfo as ChapterInfoService;
+use App\Services\Logic\Chapter\ChapterLike as ChapterLikeService;
+use App\Services\Logic\Chapter\Learning as ChapterLearningService;
+use App\Services\Logic\Chapter\ResourceList as ChapterResourceListService;
+
+/**
+ * @RoutePrefix("/api/chapter")
+ */
+class ChapterController extends Controller
+{
+
+    /**
+     * @Get("/{id:[0-9]+}/resources", name="api.chapter.resourses")
+     */
+    public function resourcesAction($id)
+    {
+        $service = new ChapterResourceListService();
+
+        $resources = $service->handle($id);
+
+        return $this->jsonSuccess(['resources' => $resources]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/info", name="api.chapter.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new ChapterInfoService();
+
+        $chapter = $service->handle($id);
+
+        return $this->jsonSuccess(['chapter' => $chapter]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/like", name="api.chapter.like")
+     */
+    public function likeAction($id)
+    {
+        $service = new ChapterLikeService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/learning", name="api.chapter.learning")
+     */
+    public function learningAction($id)
+    {
+        $service = new ChapterLearningService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+}
diff --git a/app/Http/Api/Controllers/ChapterLiveController.php b/app/Http/Api/Controllers/ChapterLiveController.php
new file mode 100644
index 00000000..e54c9ad2
--- /dev/null
+++ b/app/Http/Api/Controllers/ChapterLiveController.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Http\Home\Services\ChapterLive as ChapterLiveService;
+
+/**
+ * @RoutePrefix("/api/live")
+ */
+class ChapterLiveController extends Controller
+{
+
+    /**
+     * @Get("/{id:[0-9]+}/chats", name="api.live.chats")
+     */
+    public function chatsAction($id)
+    {
+        $service = new ChapterLiveService();
+
+        $chats = $service->getRecentChats($id);
+
+        return $this->jsonSuccess(['chats' => $chats]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/stats", name="api.live.stats")
+     */
+    public function statsAction($id)
+    {
+        $service = new ChapterLiveService();
+
+        $stats = $service->getStats($id);
+
+        return $this->jsonSuccess(['stats' => $stats]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/status", name="api.live.status")
+     */
+    public function statusAction($id)
+    {
+        $service = new ChapterLiveService();
+
+        $status = $service->getStatus($id);
+
+        return $this->jsonSuccess(['status' => $status]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/user/bind", name="api.live.bind_user")
+     */
+    public function bindUserAction($id)
+    {
+        $service = new ChapterLiveService();
+
+        $service->bindUser($id);
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/msg/send", name="api.live.send_msg")
+     */
+    public function sendMessageAction($id)
+    {
+        $service = new ChapterLiveService();
+
+        $message = $service->sendMessage($id);
+
+        return $this->jsonSuccess(['message' => $message]);
+    }
+
+}
diff --git a/app/Http/Api/Controllers/ConsultController.php b/app/Http/Api/Controllers/ConsultController.php
new file mode 100644
index 00000000..79f3e03c
--- /dev/null
+++ b/app/Http/Api/Controllers/ConsultController.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Consult\ConsultCreate as ConsultCreateService;
+use App\Services\Logic\Consult\ConsultDelete as ConsultDeleteService;
+use App\Services\Logic\Consult\ConsultInfo as ConsultInfoService;
+use App\Services\Logic\Consult\ConsultLike as ConsultLikeService;
+use App\Services\Logic\Consult\ConsultUpdate as ConsultUpdateService;
+
+/**
+ * @RoutePrefix("/api/consult")
+ */
+class ConsultController extends Controller
+{
+
+    /**
+     * @Get("/{id:[0-9]+}/info", name="api.consult.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new ConsultInfoService();
+
+        $consult = $service->handle($id);
+
+        return $this->jsonSuccess(['consult' => $consult]);
+    }
+
+    /**
+     * @Post("/create", name="api.consult.create")
+     */
+    public function createAction()
+    {
+        $service = new ConsultCreateService();
+
+        $consult = $service->handle();
+
+        $service = new ConsultInfoService();
+
+        $consult = $service->handle($consult->id);
+
+        return $this->jsonSuccess(['consult' => $consult]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="api.consult.update")
+     */
+    public function updateAction($id)
+    {
+        $service = new ConsultUpdateService();
+
+        $consult = $service->handle($id);
+
+        $service = new ConsultInfoService();
+
+        $consult = $service->handle($consult->id);
+
+        return $this->jsonSuccess(['consult' => $consult]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="api.consult.delete")
+     */
+    public function deleteAction($id)
+    {
+        $service = new ConsultDeleteService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/like", name="api.consult.like")
+     */
+    public function likeAction($id)
+    {
+        $service = new ConsultLikeService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/unlike", name="api.consult.unlike")
+     */
+    public function unlikeAction($id)
+    {
+        $service = new ConsultLikeService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+}
diff --git a/app/Http/Api/Controllers/Controller.php b/app/Http/Api/Controllers/Controller.php
index 24ae2d03..50a6611d 100644
--- a/app/Http/Api/Controllers/Controller.php
+++ b/app/Http/Api/Controllers/Controller.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Api\Controllers;
 
+use App\Services\Auth\Api as AppAuth;
 use App\Traits\Response as ResponseTrait;
 use App\Traits\Security as SecurityTrait;
 use Phalcon\Mvc\Dispatcher;
@@ -14,7 +15,32 @@ class Controller extends \Phalcon\Mvc\Controller
 
     public function beforeExecuteRoute(Dispatcher $dispatcher)
     {
-        $this->checkRateLimit();
+        /**
+         * 存在Origin头信息才设置跨域
+         */
+        if ($this->request->getHeader('Origin')) {
+            $this->setCors();
+        }
+
+        /**
+         * Options请求不验证签名和限流
+         */
+        if (!$this->request->isOptions()) {
+            //$this->checkApiSignature();
+            //$this->checkRateLimit();
+        }
+
+        return true;
+    }
+
+    protected function getAuthUser()
+    {
+        /**
+         * @var AppAuth $auth
+         */
+        $auth = $this->getDI()->get('auth');
+
+        return $auth->getCurrentUser();
     }
 
 }
diff --git a/app/Http/Api/Controllers/CourseController.php b/app/Http/Api/Controllers/CourseController.php
new file mode 100644
index 00000000..a130533b
--- /dev/null
+++ b/app/Http/Api/Controllers/CourseController.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Course\CategoryList as CourseCategoryListService;
+use App\Services\Logic\Course\ChapterList as CourseChapterListService;
+use App\Services\Logic\Course\ConsultList as CourseConsultListService;
+use App\Services\Logic\Course\CourseFavorite as CourseFavoriteService;
+use App\Services\Logic\Course\CourseInfo as CourseInfoService;
+use App\Services\Logic\Course\CourseList as CourseListService;
+use App\Services\Logic\Course\PackageList as CoursePackageListService;
+use App\Services\Logic\Course\ReviewList as CourseReviewListService;
+
+/**
+ * @RoutePrefix("/api/course")
+ */
+class CourseController extends Controller
+{
+
+    /**
+     * @Get("/categories", name="api.course.categories")
+     */
+    public function categoriesAction()
+    {
+        $service = new CourseCategoryListService();
+
+        $categories = $service->handle();
+
+        return $this->jsonSuccess(['categories' => $categories]);
+    }
+
+    /**
+     * @Get("/list", name="api.course.list")
+     */
+    public function listAction()
+    {
+        $service = new CourseListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/info", name="api.course.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new CourseInfoService();
+
+        $course = $service->handle($id);
+
+        return $this->jsonSuccess(['course' => $course]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/chapters", name="api.course.chapters")
+     */
+    public function chaptersAction($id)
+    {
+        $service = new CourseChapterListService();
+
+        $chapters = $service->handle($id);
+
+        return $this->jsonSuccess(['chapters' => $chapters]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/packages", name="api.course.packages")
+     */
+    public function packagesAction($id)
+    {
+        $service = new CoursePackageListService();
+
+        $packages = $service->handle($id);
+
+        return $this->jsonSuccess(['packages' => $packages]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/consults", name="api.course.consults")
+     */
+    public function consultsAction($id)
+    {
+        $service = new CourseConsultListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/reviews", name="api.course.reviews")
+     */
+    public function reviewsAction($id)
+    {
+        $service = new CourseReviewListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/favorite", name="api.course.favorite")
+     */
+    public function favoriteAction($id)
+    {
+        $service = new CourseFavoriteService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/unfavorite", name="api.course.unfavorite")
+     */
+    public function unfavoriteAction($id)
+    {
+        $service = new CourseFavoriteService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+}
diff --git a/app/Http/Api/Controllers/HelpController.php b/app/Http/Api/Controllers/HelpController.php
new file mode 100644
index 00000000..60879eb3
--- /dev/null
+++ b/app/Http/Api/Controllers/HelpController.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Help\HelpInfo as HelpInfoService;
+use App\Services\Logic\Help\HelpList as HelpListService;
+
+/**
+ * @RoutePrefix("/api/help")
+ */
+class HelpController extends Controller
+{
+
+    /**
+     * @Get("/list", name="api.help.list")
+     */
+    public function listAction()
+    {
+        $service = new HelpListService();
+
+        $helps = $service->handle();
+
+        return $this->jsonSuccess(['helps' => $helps]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}", name="api.help.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new HelpInfoService();
+
+        $help = $service->handle($id);
+
+        return $this->jsonSuccess(['help' => $help]);
+    }
+
+}
diff --git a/app/Http/Api/Controllers/ImGroupController.php b/app/Http/Api/Controllers/ImGroupController.php
new file mode 100644
index 00000000..330d7c31
--- /dev/null
+++ b/app/Http/Api/Controllers/ImGroupController.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Im\GroupInfo as GroupInfoService;
+use App\Services\Logic\Im\GroupList as GroupListService;
+use App\Services\Logic\Im\GroupUserList as GroupUserListService;
+
+/**
+ * @RoutePrefix("/api/im/group")
+ */
+class ImGroupController extends Controller
+{
+
+    /**
+     * @Get("/list", name="api.im_group.list")
+     */
+    public function listAction()
+    {
+        $service = new GroupListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/info", name="api.im_group.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new GroupInfoService();
+
+        $group = $service->handle($id);
+
+        return $this->jsonSuccess(['group' => $group]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/users", name="api.im_group.users")
+     */
+    public function usersAction($id)
+    {
+        $service = new GroupUserListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+}
diff --git a/app/Http/Api/Controllers/IndexController.php b/app/Http/Api/Controllers/IndexController.php
index b7c9f968..1aba3a64 100644
--- a/app/Http/Api/Controllers/IndexController.php
+++ b/app/Http/Api/Controllers/IndexController.php
@@ -2,39 +2,63 @@
 
 namespace App\Http\Api\Controllers;
 
+use App\Caches\IndexSimpleFreeCourseList;
+use App\Caches\IndexSimpleNewCourseList;
+use App\Caches\IndexSimpleVipCourseList;
+use App\Caches\IndexSlideList;
+
 /**
- * @RoutePrefix("/api")
+ * @RoutePrefix("/api/index")
  */
 class IndexController extends Controller
 {
 
     /**
-     * @Get("/", name="api.index")
+     * @Get("/slides", name="api.index.slides")
      */
-    public function indexAction()
+    public function slidesAction()
     {
-        return $this->jsonSuccess(['data' => 'ok']);
+        $cache = new IndexSlideList();
+
+        $slides = $cache->get();
+
+        return $this->jsonSuccess(['slides' => $slides]);
     }
 
     /**
-     * @Get("/routes", name="api.routes")
+     * @Get("/courses/new", name="api.index.new_courses")
      */
-    public function routesAction()
+    public function newCoursesAction()
     {
-        $definitions = [];
+        $cache = new IndexSimpleNewCourseList();
 
-        $routes = $this->router->getRoutes();
+        $courses = $cache->get();
 
-        foreach ($routes as $route) {
-            if (strpos($route->getPattern(), '/api') !== false) {
-                $definitions[] = [
-                    'pattern' => $route->getPattern(),
-                    'methods' => $route->getHttpMethods(),
-                ];
-            }
-        }
+        return $this->jsonSuccess(['courses' => $courses]);
+    }
 
-        return $this->jsonSuccess(['routes' => $definitions]);
+    /**
+     * @Get("/courses/free", name="api.index.free_courses")
+     */
+    public function freeCoursesAction()
+    {
+        $cache = new IndexSimpleFreeCourseList();
+
+        $courses = $cache->get();
+
+        return $this->jsonSuccess(['courses' => $courses]);
+    }
+
+    /**
+     * @Get("/courses/vip", name="api.index.vip_courses")
+     */
+    public function vipCoursesAction()
+    {
+        $cache = new IndexSimpleVipCourseList();
+
+        $courses = $cache->get();
+
+        return $this->jsonSuccess(['courses' => $courses]);
     }
 
 }
diff --git a/app/Http/Api/Controllers/OrderController.php b/app/Http/Api/Controllers/OrderController.php
new file mode 100644
index 00000000..5aeb68fe
--- /dev/null
+++ b/app/Http/Api/Controllers/OrderController.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Order\OrderCancel as OrderCancelService;
+use App\Services\Logic\Order\OrderConfirm as OrderConfirmService;
+use App\Services\Logic\Order\OrderCreate as OrderCreateService;
+use App\Services\Logic\Order\OrderInfo as OrderInfoService;
+
+/**
+ * @RoutePrefix("/api/order")
+ */
+class OrderController extends Controller
+{
+
+    /**
+     * @Get("/info", name="api.order.info")
+     */
+    public function infoAction()
+    {
+        $sn = $this->request->getQuery('sn', 'string');
+
+        $service = new OrderInfoService();
+
+        $order = $service->handle($sn);
+
+        return $this->jsonSuccess(['order' => $order]);
+    }
+
+    /**
+     * @Get("/confirm", name="api.order.confirm")
+     */
+    public function confirmAction()
+    {
+        $itemId = $this->request->getQuery('item_id', 'int');
+        $itemType = $this->request->getQuery('item_type', 'int');
+
+        $service = new OrderConfirmService();
+
+        $confirm = $service->handle($itemId, $itemType);
+
+        return $this->jsonSuccess(['confirm' => $confirm]);
+
+    }
+
+    /**
+     * @Post("/create", name="api.order.create")
+     */
+    public function createAction()
+    {
+        $service = new OrderCreateService();
+
+        $order = $service->handle();
+
+        $service = new OrderInfoService();
+
+        $order = $service->handle($order->sn);
+
+        return $this->jsonSuccess(['order' => $order]);
+    }
+
+    /**
+     * @Post("/cancel", name="api.order.cancel")
+     */
+    public function cancelAction()
+    {
+        $sn = $this->request->getPost('sn', 'string');
+
+        $service = new OrderCancelService();
+
+        $order = $service->handle($sn);
+
+        return $this->jsonSuccess(['order' => $order]);
+    }
+
+}
diff --git a/app/Http/Api/Controllers/PageController.php b/app/Http/Api/Controllers/PageController.php
new file mode 100644
index 00000000..b18e31f6
--- /dev/null
+++ b/app/Http/Api/Controllers/PageController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Page\PageInfo as PageInfoService;
+
+/**
+ * @RoutePrefix("/api/page")
+ */
+class PageController extends Controller
+{
+
+    /**
+     * @Get("/{id:[0-9]+}", name="api.page.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new PageInfoService();
+
+        $page = $service->handle($id);
+
+        return $this->jsonSuccess(['page' => $page]);
+    }
+
+}
diff --git a/app/Http/Api/Controllers/PublicController.php b/app/Http/Api/Controllers/PublicController.php
index f2f0a85c..27d98e64 100644
--- a/app/Http/Api/Controllers/PublicController.php
+++ b/app/Http/Api/Controllers/PublicController.php
@@ -2,14 +2,85 @@
 
 namespace App\Http\Api\Controllers;
 
+use App\Services\Logic\Reward\OptionList as RewardOptionList;
+use App\Services\Logic\Vip\OptionList as VipOptionList;
+use App\Services\Service as AppService;
 use App\Traits\Response as ResponseTrait;
 
 /**
  * @RoutePrefix("/api")
  */
-class PublicController extends \Phalcon\Mvc\Controller
+class PublicController extends Controller
 {
 
     use ResponseTrait;
 
+    /**
+     * @Options("/{match:(.*)}", name="api.match_options")
+     */
+    public function corsAction()
+    {
+        $this->response->setStatusCode(204);
+
+        return $this->response;
+    }
+
+    /**
+     * @Get("/now", name="api.public.now")
+     */
+    public function nowAction()
+    {
+        return $this->jsonSuccess(['now' => time()]);
+    }
+
+    /**
+     * @Get("/site/info", name="api.public.site_info")
+     */
+    public function siteInfoAction()
+    {
+        $service = new AppService();
+
+        $site = $service->getSettings('site');
+
+        return $this->jsonSuccess(['site' => $site]);
+    }
+
+    /**
+     * @Get("/captcha/info", name="api.public.captcha_info")
+     */
+    public function captchaInfoAction()
+    {
+        $service = new AppService();
+
+        $captcha = $service->getSettings('captcha');
+
+        unset($captcha['secret_key']);
+
+        return $this->jsonSuccess(['captcha' => $captcha]);
+    }
+
+    /**
+     * @Get("/reward/options", name="api.public.reward_options")
+     */
+    public function rewardOptionsAction()
+    {
+        $service = new RewardOptionList();
+
+        $options = $service->handle();
+
+        return $this->jsonSuccess(['options' => $options]);
+    }
+
+    /**
+     * @Get("/vip/options", name="api.public.vip_options")
+     */
+    public function vipOptionsAction()
+    {
+        $service = new VipOptionList();
+
+        $options = $service->handle();
+
+        return $this->jsonSuccess(['options' => $options]);
+    }
+
 }
diff --git a/app/Http/Api/Controllers/RefundController.php b/app/Http/Api/Controllers/RefundController.php
new file mode 100644
index 00000000..018cf1cf
--- /dev/null
+++ b/app/Http/Api/Controllers/RefundController.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Refund\RefundCancel as RefundCancelService;
+use App\Services\Logic\Refund\RefundConfirm as RefundConfirmService;
+use App\Services\Logic\Refund\RefundCreate as RefundCreateService;
+use App\Services\Logic\Refund\RefundInfo as RefundInfoService;
+
+/**
+ * @RoutePrefix("/api/refund")
+ */
+class RefundController extends Controller
+{
+
+    /**
+     * @Get("/confirm", name="api.refund.confirm")
+     */
+    public function confirmAction()
+    {
+        $sn = $this->request->getQuery('sn', 'string');
+
+        $service = new RefundConfirmService();
+
+        $confirm = $service->handle($sn);
+
+        return $this->jsonSuccess(['confirm' => $confirm]);
+    }
+
+    /**
+     * @Get("/info", name="api.refund.info")
+     */
+    public function infoAction()
+    {
+        $sn = $this->request->getQuery('sn', 'string');
+
+        $service = new RefundInfoService();
+
+        $refund = $service->handle($sn);
+
+        return $this->jsonSuccess(['refund' => $refund]);
+    }
+
+    /**
+     * @Post("/create", name="api.refund.create")
+     */
+    public function createAction()
+    {
+        $service = new RefundCreateService();
+
+        $refund = $service->handle();
+
+        $service = new RefundInfoService();
+
+        $refund = $service->handle($refund->sn);
+
+        return $this->jsonSuccess(['refund' => $refund]);
+    }
+
+    /**
+     * @Post("/cancel", name="api.refund.cancel")
+     */
+    public function cancelAction()
+    {
+        $sn = $this->request->getPost('sn', 'string');
+
+        $service = new RefundCancelService();
+
+        $service->handle($sn);
+
+        $service = new RefundInfoService();
+
+        $refund = $service->handle($sn);
+
+        return $this->jsonSuccess(['refund' => $refund]);
+    }
+
+}
diff --git a/app/Http/Api/Controllers/ReviewController.php b/app/Http/Api/Controllers/ReviewController.php
new file mode 100644
index 00000000..7030ccbf
--- /dev/null
+++ b/app/Http/Api/Controllers/ReviewController.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Review\ReviewCreate as ReviewCreateService;
+use App\Services\Logic\Review\ReviewDelete as ReviewDeleteService;
+use App\Services\Logic\Review\ReviewInfo as ReviewInfoService;
+use App\Services\Logic\Review\ReviewLike as ReviewLikeService;
+use App\Services\Logic\Review\ReviewUpdate as ReviewUpdateService;
+
+/**
+ * @RoutePrefix("/api/review")
+ */
+class ReviewController extends Controller
+{
+
+    /**
+     * @Get("/{id:[0-9]+}/info", name="api.review.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new ReviewInfoService();
+
+        $review = $service->handle($id);
+
+        return $this->jsonSuccess(['review' => $review]);
+    }
+
+    /**
+     * @Post("/create", name="api.order.create")
+     */
+    public function createAction()
+    {
+        $service = new ReviewCreateService();
+
+        $review = $service->handle();
+
+        $service = new ReviewInfoService();
+
+        $review = $service->handle($review->id);
+
+        return $this->jsonSuccess(['review' => $review]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="api.review.update")
+     */
+    public function updateAction($id)
+    {
+        $service = new ReviewUpdateService();
+
+        $service->handle($id);
+
+        $service = new ReviewInfoService();
+
+        $review = $service->handle($id);
+
+        return $this->jsonSuccess(['review' => $review]);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="api.review.delete")
+     */
+    public function deleteAction($id)
+    {
+        $service = new ReviewDeleteService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/like", name="api.review.like")
+     */
+    public function likeAction($id)
+    {
+        $service = new ReviewLikeService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/unlike", name="api.review.unlike")
+     */
+    public function unlikeAction($id)
+    {
+        $service = new ReviewLikeService();
+
+        $service->handle($id);
+
+        return $this->jsonSuccess();
+    }
+
+}
diff --git a/app/Http/Api/Controllers/SearchController.php b/app/Http/Api/Controllers/SearchController.php
new file mode 100644
index 00000000..e2a8dd32
--- /dev/null
+++ b/app/Http/Api/Controllers/SearchController.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Search\Course as CourseSearchService;
+use App\Services\Logic\Search\Group as GroupSearchService;
+use App\Services\Logic\Search\User as UserSearchService;
+
+/**
+ * @RoutePrefix("/api/search")
+ */
+class SearchController extends Controller
+{
+
+    /**
+     * @Get("/", name="api.search.index")
+     */
+    public function indexAction()
+    {
+        $query = $this->request->get('query', ['trim', 'string']);
+        $type = $this->request->get('type', ['trim', 'string'], 'course');
+
+        $pager = [
+            'total_pages' => 0,
+            'total_items' => 0,
+            'items' => [],
+        ];
+
+        if (empty($query)) {
+            return $this->jsonSuccess(['pager' => $pager]);
+        }
+
+        $service = $this->getSearchService($type);
+
+        $pager = $service->search();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @param string $type
+     * @return CourseSearchService|GroupSearchService|UserSearchService
+     */
+    protected function getSearchService($type)
+    {
+        switch ($type) {
+            case 'group':
+                $service = new GroupSearchService;
+                break;
+            case 'user':
+                $service = new UserSearchService();
+                break;
+            default:
+                $service = new CourseSearchService();
+                break;
+        }
+
+        return $service;
+    }
+
+}
diff --git a/app/Http/Api/Controllers/TeacherController.php b/app/Http/Api/Controllers/TeacherController.php
new file mode 100644
index 00000000..f9c000a7
--- /dev/null
+++ b/app/Http/Api/Controllers/TeacherController.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Teacher\CourseList as CourseListService;
+use App\Services\Logic\Teacher\TeacherInfo as TeacherInfoService;
+use App\Services\Logic\Teacher\TeacherList as TeacherListService;
+
+/**
+ * @RoutePrefix("/api/teacher")
+ */
+class TeacherController extends Controller
+{
+
+    /**
+     * @Get("/list", name="api.teacher.list")
+     */
+    public function listAction()
+    {
+        $service = new TeacherListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/info", name="api.teacher.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new TeacherInfoService();
+
+        $teacher = $service->handle($id);
+
+        return $this->jsonSuccess(['teacher' => $teacher]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/courses", name="api.teacher.courses")
+     */
+    public function coursesAction($id)
+    {
+        $service = new CourseListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+}
diff --git a/app/Http/Api/Controllers/TradeController.php b/app/Http/Api/Controllers/TradeController.php
new file mode 100644
index 00000000..f9252452
--- /dev/null
+++ b/app/Http/Api/Controllers/TradeController.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Http\Api\Services\Trade as TradeService;
+use App\Services\Logic\Trade\TradeInfo as TradeInfoService;
+
+/**
+ * @RoutePrefix("/api/trade")
+ */
+class TradeController extends Controller
+{
+
+    /**
+     * @Get("/info", name="api.trade.info")
+     */
+    public function infoAction()
+    {
+        $sn = $this->request->getQuery('sn', 'string');
+
+        $service = new TradeInfoService();
+
+        $trade = $service->handle($sn);
+
+        return $this->jsonSuccess(['trade' => $trade]);
+    }
+
+    /**
+     * @Get("/h5/pay", name="api.trade.h5_pay")
+     */
+    public function h5PayAction()
+    {
+        $sn = $this->request->getQuery('sn', 'string');
+
+        $service = new TradeService();
+
+        $response = $service->h5Pay($sn);
+
+        if (!$response) {
+            echo "H5支付跳转失败，请回退重试";
+        }
+
+        $response->send();
+
+        exit();
+    }
+
+    /**
+     * @Post("/h5/create", name="api.trade.h5_create")
+     */
+    public function createH5TradeAction()
+    {
+        $service = new TradeService();
+
+        $trade = $service->createH5Trade();
+
+        $service = new TradeInfoService();
+
+        $trade = $service->handle($trade->sn);
+
+        return $this->jsonSuccess(['trade' => $trade]);
+    }
+
+    /**
+     * @Post("/mp/create", name="api.trade.mp_create")
+     */
+    public function createMpTradeAction()
+    {
+        $service = new TradeService();
+
+        $content = $service->createMpTrade();
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/app/create", name="api.trade.app_create")
+     */
+    public function createAppTradeAction()
+    {
+        $service = new TradeService();
+
+        $content = $service->createMpTrade();
+
+        return $this->jsonSuccess($content);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Api/Controllers/UploadController.php b/app/Http/Api/Controllers/UploadController.php
new file mode 100644
index 00000000..40cf7a61
--- /dev/null
+++ b/app/Http/Api/Controllers/UploadController.php
@@ -0,0 +1,50 @@
+<?php
+
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\MyStorage as StorageService;
+
+/**
+ * @RoutePrefix("/api/upload")
+ */
+class UploadController extends Controller
+{
+
+    /**
+     * @Post("/avatar/img", name="api.upload.avatar_img")
+     */
+    public function uploadAvatarImageAction()
+    {
+        $service = new StorageService();
+
+        $file = $service->uploadAvatarImage();
+
+        if (!$file) {
+            return $this->jsonError(['msg' => '上传文件失败']);
+        }
+
+        $data = [
+            'src' => $service->getImageUrl($file->path),
+            'title' => $file->name,
+        ];
+
+        return $this->jsonSuccess(['data' => $data]);
+    }
+
+    /**
+     * @Post("/im/img", name="api.upload.im_img")
+     */
+    public function uploadImImageAction()
+    {
+    }
+
+    /**
+     * @Post("/im/file", name="api.upload.im_file")
+     */
+    public function uploadImFileAction()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Api/Controllers/UserConsoleController.php b/app/Http/Api/Controllers/UserConsoleController.php
new file mode 100644
index 00000000..671ff955
--- /dev/null
+++ b/app/Http/Api/Controllers/UserConsoleController.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\User\Console\AccountInfo as AccountInfoService;
+use App\Services\Logic\User\Console\ConsultList as ConsultListService;
+use App\Services\Logic\User\Console\CourseList as CourseListService;
+use App\Services\Logic\User\Console\FavoriteList as FavoriteListService;
+use App\Services\Logic\User\Console\FriendList as FriendListService;
+use App\Services\Logic\User\Console\GroupList as GroupListService;
+use App\Services\Logic\User\Console\OrderList as OrderListService;
+use App\Services\Logic\User\Console\ProfileInfo as ProfileInfoService;
+use App\Services\Logic\User\Console\ProfileUpdate as ProfileUpdateService;
+use App\Services\Logic\User\Console\RefundList as RefundListService;
+use App\Services\Logic\User\Console\ReviewList as ReviewListService;
+
+/**
+ * @RoutePrefix("/api/uc")
+ */
+class UserConsoleController extends Controller
+{
+
+    /**
+     * @Get("/profile", name="api.uc.profile")
+     */
+    public function profileAction()
+    {
+        $service = new ProfileInfoService();
+
+        $profile = $service->handle();
+
+        return $this->jsonSuccess(['profile' => $profile]);
+    }
+
+    /**
+     * @Get("/account", name="api.uc.account")
+     */
+    public function accountAction()
+    {
+        $service = new AccountInfoService();
+
+        $account = $service->handle();
+
+        return $this->jsonSuccess(['account' => $account]);
+    }
+
+    /**
+     * @Get("/courses", name="api.uc.courses")
+     */
+    public function coursesAction()
+    {
+        $service = new CourseListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/favorites", name="api.uc.favorites")
+     */
+    public function favoritesAction()
+    {
+        $service = new FavoriteListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/consults", name="api.uc.consults")
+     */
+    public function consultsAction()
+    {
+        $service = new ConsultListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/reviews", name="api.uc.reviews")
+     */
+    public function reviewsAction()
+    {
+        $service = new ReviewListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/orders", name="api.uc.orders")
+     */
+    public function ordersAction()
+    {
+        $service = new OrderListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/refunds", name="api.uc.refunds")
+     */
+    public function refundsAction()
+    {
+        $service = new RefundListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/friends", name="api.uc.friends")
+     */
+    public function friendsAction()
+    {
+        $service = new FriendListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/groups", name="api.uc.groups")
+     */
+    public function groupsAction()
+    {
+        $service = new GroupListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Post("/profile/update", name="api.uc.update_profile")
+     */
+    public function updateProfileAction()
+    {
+        $service = new ProfileUpdateService();
+
+        $service->handle();
+
+        return $this->jsonSuccess();
+    }
+
+}
diff --git a/app/Http/Api/Controllers/UserController.php b/app/Http/Api/Controllers/UserController.php
new file mode 100644
index 00000000..8bd37126
--- /dev/null
+++ b/app/Http/Api/Controllers/UserController.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\User\CourseList as UserCourseListService;
+use App\Services\Logic\User\FavoriteList as UserFavoriteListService;
+use App\Services\Logic\User\FriendList as UserFriendListService;
+use App\Services\Logic\User\GroupList as UserGroupListService;
+use App\Services\Logic\User\UserInfo as UserInfoService;
+
+/**
+ * @RoutePrefix("/api/user")
+ */
+class UserController extends Controller
+{
+
+    /**
+     * @Get("/{id:[0-9]+}/info", name="api.user.info")
+     */
+    public function infoAction($id)
+    {
+        $service = new UserInfoService();
+
+        $user = $service->handle($id);
+
+        return $this->jsonSuccess(['user' => $user]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/courses", name="api.user.courses")
+     */
+    public function coursesAction($id)
+    {
+        $service = new UserCourseListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/favorites", name="api.user.favorites")
+     */
+    public function favoritesAction($id)
+    {
+        $service = new UserFavoriteListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/friends", name="api.user.friends")
+     */
+    public function friendsAction($id)
+    {
+        $service = new UserFriendListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/groups", name="api.user.groups")
+     */
+    public function groupsAction($id)
+    {
+        $service = new UserGroupListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+}
diff --git a/app/Http/Api/Controllers/VerifyController.php b/app/Http/Api/Controllers/VerifyController.php
new file mode 100644
index 00000000..5594e7ab
--- /dev/null
+++ b/app/Http/Api/Controllers/VerifyController.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Verify\EmailCode as EmailCodeService;
+use App\Services\Logic\Verify\SmsCode as SmsCodeService;
+
+/**
+ * @RoutePrefix("/api/verify")
+ */
+class VerifyController extends Controller
+{
+
+    /**
+     * @Post("/sms/code", name="api.verify.sms_code")
+     */
+    public function smsCodeAction()
+    {
+        $service = new SmsCodeService();
+
+        $service->handle();
+
+        return $this->jsonSuccess();
+    }
+
+    /**
+     * @Post("/email/code", name="api.verify.email_code")
+     */
+    public function emailCodeAction()
+    {
+        $service = new EmailCodeService();
+
+        $service->handle();
+
+        return $this->jsonSuccess();
+    }
+
+}
diff --git a/app/Http/Api/Controllers/VipController.php b/app/Http/Api/Controllers/VipController.php
new file mode 100644
index 00000000..a9854b11
--- /dev/null
+++ b/app/Http/Api/Controllers/VipController.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\Vip\CourseList as VipCourseListService;
+use App\Services\Logic\Vip\UserList as VipUserListService;
+
+/**
+ * @RoutePrefix("/api/vip")
+ */
+class VipController extends Controller
+{
+
+    /**
+     * @Get("/courses", name="api.vip.courses")
+     */
+    public function coursesAction()
+    {
+        $type = $this->request->getQuery('type', 'string', 'discount');
+
+        $service = new VipCourseListService();
+
+        $pager = $service->handle($type);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+    /**
+     * @Get("/users", name="api.vip.users")
+     */
+    public function usersAction()
+    {
+        $service = new VipUserListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
+}
diff --git a/app/Http/Api/Module.php b/app/Http/Api/Module.php
index 3ea77f24..684e10e6 100644
--- a/app/Http/Api/Module.php
+++ b/app/Http/Api/Module.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Api;
 
-use App\Services\Auth\Api as ApiAuth;
+use App\Services\Auth\Api as AppAuth;
 use Phalcon\DiInterface;
 use Phalcon\Mvc\ModuleDefinitionInterface;
 use Phalcon\Mvc\View;
@@ -24,7 +24,7 @@ class Module implements ModuleDefinitionInterface
         });
 
         $di->setShared('auth', function () {
-            return new ApiAuth();
+            return new AppAuth();
         });
     }
 
diff --git a/app/Http/Api/Services/Account.php b/app/Http/Api/Services/Account.php
new file mode 100644
index 00000000..96d09ce6
--- /dev/null
+++ b/app/Http/Api/Services/Account.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Api\Services;
+
+use App\Repos\User as UserRepo;
+use App\Services\Auth\Api as AuthService;
+use App\Services\Logic\Account\Register as RegisterService;
+use App\Validators\Account as AccountValidator;
+
+class Account extends Service
+{
+
+    /**
+     * @var AuthService
+     */
+    protected $auth;
+
+    public function __construct()
+    {
+        $this->auth = $this->getDI()->get('auth');
+    }
+
+    public function register()
+    {
+        $service = new RegisterService();
+
+        $account = $service->handle();
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($account->id);
+
+        return $this->auth->saveAuthInfo($user);
+    }
+
+    public function loginByPassword()
+    {
+        $post = $this->request->getPost();
+
+        /**
+         * 使用[account|phone|email]做账户名字段兼容
+         */
+        if (isset($post['phone'])) {
+            $post['account'] = $post['phone'];
+        } elseif (isset($post['email'])) {
+            $post['account'] = $post['email'];
+        }
+
+        $validator = new AccountValidator();
+
+        $user = $validator->checkUserLogin($post['account'], $post['password']);
+
+        //$validator = new CaptchaValidator();
+
+        //$validator->checkCode($post['ticket'], $post['rand']);
+
+        return $this->auth->saveAuthInfo($user);
+    }
+
+    public function loginByVerify()
+    {
+        $post = $this->request->getPost();
+
+        /**
+         * 使用[account|phone|email]做账户名字段兼容
+         */
+        if (isset($post['phone'])) {
+            $post['account'] = $post['phone'];
+        } elseif (isset($post['email'])) {
+            $post['account'] = $post['email'];
+        }
+
+        $validator = new AccountValidator();
+
+        $user = $validator->checkVerifyLogin($post['account'], $post['verify_code']);
+
+        return $this->auth->saveAuthInfo($user);
+    }
+
+    public function logout()
+    {
+        $this->auth->clearAuthInfo();
+    }
+
+}
diff --git a/app/Http/Api/Services/Login.php b/app/Http/Api/Services/Login.php
deleted file mode 100644
index 7ffc50fe..00000000
--- a/app/Http/Api/Services/Login.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Api\Services;
-
-use App\Services\Auth\Api as ApiAuth;
-use App\Validators\Account as AccountValidator;
-
-class Login extends Service
-{
-
-    public function loginByPassword($name, $password)
-    {
-        $validator = new AccountValidator();
-
-        $user = $validator->checkUserLogin($name, $password);
-
-        $auth = new ApiAuth();
-
-        return $auth->saveAuthInfo($user);
-    }
-
-    public function loginByVerify($name, $code)
-    {
-        $validator = new AccountValidator();
-
-        $user = $validator->checkVerifyLogin($name, $code);
-
-        $auth = new ApiAuth();
-
-        return $auth->saveAuthInfo($user);
-    }
-
-}
diff --git a/app/Http/Api/Services/Logout.php b/app/Http/Api/Services/Logout.php
deleted file mode 100644
index 76877ce8..00000000
--- a/app/Http/Api/Services/Logout.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Api\Services;
-
-use App\Services\Auth\Api as ApiAuth;
-
-class Logout extends Service
-{
-
-    public function logout()
-    {
-        $auth = new ApiAuth();
-
-        return $auth->clearAuthInfo();
-    }
-
-}
diff --git a/app/Http/Api/Services/Trade.php b/app/Http/Api/Services/Trade.php
new file mode 100644
index 00000000..74b3f7ae
--- /dev/null
+++ b/app/Http/Api/Services/Trade.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Http\Api\Services;
+
+use App\Models\Client as ClientModel;
+use App\Models\Trade as TradeModel;
+use App\Services\Logic\OrderTrait;
+use App\Services\Logic\TradeTrait;
+use App\Services\Pay\Alipay;
+use App\Services\Pay\Wxpay;
+use App\Validators\Client as ClientValidator;
+use App\Validators\Trade as TradeValidator;
+
+class Trade extends Service
+{
+
+    use OrderTrait;
+    use TradeTrait;
+
+    public function h5Pay($sn)
+    {
+        $trade = $this->checkTradeBySn($sn);
+
+        $response = null;
+
+        if ($trade->channel == TradeModel::CHANNEL_ALIPAY) {
+            $alipay = new Alipay();
+            $response = $alipay->wap($trade);
+        } elseif ($trade->channel == TradeModel::CHANNEL_WXPAY) {
+            $wxpay = new Wxpay();
+            $response = $wxpay->wap($trade);
+        }
+
+        return $response;
+    }
+
+    public function createH5Trade()
+    {
+        $post = $this->request->getPost();
+
+        $validator = new ClientValidator();
+
+        $platform = $this->getPlatform();
+
+        $validator->checkH5Platform($platform);
+
+        $order = $this->checkOrderBySn($post['order_sn']);
+
+        $user = $this->getLoginUser();
+
+        $validator = new TradeValidator();
+
+        $channel = $validator->checkChannel($post['channel']);
+
+        $trade = new TradeModel();
+
+        $trade->subject = $order->subject;
+        $trade->amount = $order->amount;
+        $trade->channel = $channel;
+        $trade->order_id = $order->id;
+        $trade->owner_id = $user->id;
+
+        $trade->create();
+
+        return $trade;
+    }
+
+    public function createMpTrade()
+    {
+        $post = $this->request->getPost();
+
+        $validator = new ClientValidator();
+
+        $platform = $this->getPlatform();
+
+        $platform = $validator->checkMpPlatform($platform);
+
+        $order = $this->checkOrderBySn($post['order_sn']);
+
+        $user = $this->getLoginUser();
+
+        $channel = TradeModel::CHANNEL_WXPAY;
+
+        if ($platform == ClientModel::TYPE_MP_ALIPAY) {
+            $channel = TradeModel::CHANNEL_ALIPAY;
+        } elseif ($platform == ClientModel::TYPE_MP_WEIXIN) {
+            $channel = TradeModel::CHANNEL_WXPAY;
+        }
+
+        $trade = new TradeModel();
+
+        $trade->subject = $order->subject;
+        $trade->amount = $order->amount;
+        $trade->channel = $channel;
+        $trade->order_id = $order->id;
+        $trade->owner_id = $user->id;
+
+        $trade->create();
+
+        $response = null;
+
+        if ($post['channel'] == TradeModel::CHANNEL_ALIPAY) {
+            $alipay = new Alipay();
+            $buyerId = '';
+            $response = $alipay->mini($trade, $buyerId);
+        } elseif ($post['channel'] == TradeModel::CHANNEL_WXPAY) {
+            $wxpay = new Wxpay();
+            $openId = '';
+            $response = $wxpay->mini($trade, $openId);
+        }
+
+        return $response;
+    }
+
+    public function createAppTrade()
+    {
+
+    }
+
+    protected function getPlatform()
+    {
+        return $this->request->getHeader('X-Platform');
+    }
+
+}
diff --git a/app/Http/Home/Controllers/AccountController.php b/app/Http/Home/Controllers/AccountController.php
index 4e2fc3d0..8dc2d285 100644
--- a/app/Http/Home/Controllers/AccountController.php
+++ b/app/Http/Home/Controllers/AccountController.php
@@ -81,9 +81,7 @@ class AccountController extends Controller
 
         $location = $returnUrl ?: $this->url->get(['for' => 'home.index']);
 
-        $content = ['location' => $location];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['location' => $location]);
     }
 
     /**
@@ -99,9 +97,7 @@ class AccountController extends Controller
 
         $location = $returnUrl ?: $this->url->get(['for' => 'home.index']);
 
-        $content = ['location' => $location];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['location' => $location]);
     }
 
     /**
diff --git a/app/Http/Home/Controllers/ChapterController.php b/app/Http/Home/Controllers/ChapterController.php
index dace273d..4cc0cc3c 100644
--- a/app/Http/Home/Controllers/ChapterController.php
+++ b/app/Http/Home/Controllers/ChapterController.php
@@ -29,6 +29,18 @@ 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")
      */
@@ -75,18 +87,6 @@ class ChapterController extends Controller
         $this->view->setVar('catalog', $catalog);
     }
 
-    /**
-     * @Get("/{id:[0-9]+}/danmu", name="home.chapter.danmu")
-     */
-    public function danmuAction($id)
-    {
-        $service = new ChapterDanmuListService();
-
-        $items = $service->handle($id);
-
-        return $this->jsonSuccess(['items' => $items]);
-    }
-
     /**
      * @Post("/{id:[0-9]+}/like", name="home.chapter.like")
      */
@@ -98,9 +98,7 @@ class ChapterController extends Controller
 
         $msg = $like->deleted == 0 ? '点赞成功' : '取消点赞成功';
 
-        $content = ['msg' => $msg];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => $msg]);
     }
 
     /**
diff --git a/app/Http/Home/Controllers/ChapterLiveController.php b/app/Http/Home/Controllers/ChapterLiveController.php
index 9261f92b..e68c33d0 100644
--- a/app/Http/Home/Controllers/ChapterLiveController.php
+++ b/app/Http/Home/Controllers/ChapterLiveController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Home\Controllers;
 
 use App\Http\Home\Services\ChapterLive as ChapterLiveService;
-use App\Traits\Response as ResponseTrait;
 use Phalcon\Mvc\View;
 
 /**
@@ -12,8 +11,6 @@ use Phalcon\Mvc\View;
 class ChapterLiveController extends Controller
 {
 
-    use ResponseTrait;
-
     /**
      * @Get("/{id:[0-9]+}/chats", name="home.live.chats")
      */
diff --git a/app/Http/Home/Controllers/ConsultController.php b/app/Http/Home/Controllers/ConsultController.php
index e31c1f32..93779f46 100644
--- a/app/Http/Home/Controllers/ConsultController.php
+++ b/app/Http/Home/Controllers/ConsultController.php
@@ -58,9 +58,12 @@ class ConsultController extends Controller
 
         $service = new ConsultInfoService();
 
-        $service->handle($consult->id);
+        $consult = $service->handle($consult->id);
 
-        $content = ['msg' => '提交咨询成功'];
+        $content = [
+            'consult' => $consult,
+            'msg' => '提交咨询成功',
+        ];
 
         return $this->jsonSuccess($content);
     }
@@ -72,9 +75,16 @@ class ConsultController extends Controller
     {
         $service = new ConsultUpdateService();
 
-        $service->handle($id);
+        $consult = $service->handle($id);
 
-        $content = ['msg' => '更新咨询成功'];
+        $service = new ConsultInfoService();
+
+        $consult = $service->handle($consult->id);
+
+        $content = [
+            'consult' => $consult,
+            'msg' => '更新咨询成功',
+        ];
 
         return $this->jsonSuccess($content);
     }
@@ -88,9 +98,7 @@ class ConsultController extends Controller
 
         $service->handle($id);
 
-        $content = ['msg' => '删除咨询成功'];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '删除咨询成功']);
     }
 
     /**
@@ -102,9 +110,16 @@ class ConsultController extends Controller
 
             $service = new ConsultReplyService();
 
-            $service->handle($id);
+            $consult = $service->handle($id);
 
-            $content = ['msg' => '回复咨询成功'];
+            $service = new ConsultInfoService();
+
+            $consult = $service->handle($consult->id);
+
+            $content = [
+                'consult' => $consult,
+                'msg' => '回复咨询成功',
+            ];
 
             return $this->jsonSuccess($content);
 
@@ -129,9 +144,7 @@ class ConsultController extends Controller
 
         $msg = $like->deleted == 0 ? '点赞成功' : '取消点赞成功';
 
-        $content = ['msg' => $msg];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => $msg]);
     }
 
 }
diff --git a/app/Http/Home/Controllers/Controller.php b/app/Http/Home/Controllers/Controller.php
index 30819779..df84d9d2 100644
--- a/app/Http/Home/Controllers/Controller.php
+++ b/app/Http/Home/Controllers/Controller.php
@@ -58,6 +58,7 @@ class Controller extends \Phalcon\Mvc\Controller
                 'controller' => 'error',
                 'action' => 'maintain',
             ]);
+            return false;
         }
 
         if ($this->isNotSafeRequest()) {
diff --git a/app/Http/Home/Controllers/ImController.php b/app/Http/Home/Controllers/ImController.php
index f768edb4..7461363e 100644
--- a/app/Http/Home/Controllers/ImController.php
+++ b/app/Http/Home/Controllers/ImController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Home\Controllers;
 
 use App\Http\Home\Services\Im as ImService;
-use App\Traits\Response as ResponseTrait;
 use Phalcon\Mvc\View;
 
 /**
@@ -12,8 +11,6 @@ use Phalcon\Mvc\View;
 class ImController extends Controller
 {
 
-    use ResponseTrait;
-
     public function initialize()
     {
         parent::initialize();
@@ -265,9 +262,7 @@ class ImController extends Controller
 
         $service->applyFriend();
 
-        $content = ['msg' => '发送申请成功，请等待对方通过'];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '发送申请成功']);
     }
 
     /**
@@ -303,9 +298,7 @@ class ImController extends Controller
 
         $service->applyGroup();
 
-        $content = ['msg' => '发送申请成功，请等待管理员通过'];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '发送申请成功']);
     }
 
     /**
@@ -341,9 +334,7 @@ class ImController extends Controller
 
         $service->quitFriend($id);
 
-        $content = ['msg' => '解除好友成功'];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '解除好友成功']);
     }
 
     /**
@@ -355,9 +346,7 @@ class ImController extends Controller
 
         $service->quitGroup($id);
 
-        $content = ['msg' => '退出群组成功'];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '退出群组成功']);
     }
 
 }
diff --git a/app/Http/Home/Controllers/ImGroupManageController.php b/app/Http/Home/Controllers/ImGroupManageController.php
index 3b76dcfc..f62bf1b1 100644
--- a/app/Http/Home/Controllers/ImGroupManageController.php
+++ b/app/Http/Home/Controllers/ImGroupManageController.php
@@ -48,9 +48,7 @@ class ImGroupManageController extends Controller
 
         $service->updateGroup($id);
 
-        $content = ['msg' => '更新群组成功'];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '更新群组成功']);
     }
 
     /**
@@ -62,8 +60,10 @@ class ImGroupManageController extends Controller
 
         $service->deleteGroupUser($gid, $uid);
 
+        $location = $this->request->getHTTPReferer();
+
         $content = [
-            'location' => $this->request->getHTTPReferer(),
+            'location' => $location,
             'msg' => '移除用户成功',
         ];
 
diff --git a/app/Http/Home/Controllers/IndexController.php b/app/Http/Home/Controllers/IndexController.php
index bdee64b7..ea099b71 100644
--- a/app/Http/Home/Controllers/IndexController.php
+++ b/app/Http/Home/Controllers/IndexController.php
@@ -3,10 +3,26 @@
 namespace App\Http\Home\Controllers;
 
 use App\Http\Home\Services\Index as IndexService;
+use App\Traits\Client as ClientTrait;
+use Phalcon\Mvc\Dispatcher;
 
 class IndexController extends Controller
 {
 
+    use ClientTrait;
+
+    public function beforeExecuteRoute(Dispatcher $dispatcher)
+    {
+        if ($this->isMobileBrowser()) {
+
+            $this->response->redirect('/h5', true);
+
+            return false;
+        }
+
+        return parent::beforeExecuteRoute($dispatcher);
+    }
+
     /**
      * @Get("/", name="home.index")
      */
diff --git a/app/Http/Home/Controllers/OrderController.php b/app/Http/Home/Controllers/OrderController.php
index 591c8187..2fe33eff 100644
--- a/app/Http/Home/Controllers/OrderController.php
+++ b/app/Http/Home/Controllers/OrderController.php
@@ -48,8 +48,8 @@ class OrderController extends Controller
      */
     public function confirmAction()
     {
-        $itemId = $this->request->getQuery('item_id', 'int');
-        $itemType = $this->request->getQuery('item_type', 'int');
+        $itemId = $this->request->getQuery('item_id', 'string');
+        $itemType = $this->request->getQuery('item_type', 'string');
 
         $service = new OrderConfirmService();
 
diff --git a/app/Http/Home/Controllers/RefundController.php b/app/Http/Home/Controllers/RefundController.php
index 327cc361..b55bd061 100644
--- a/app/Http/Home/Controllers/RefundController.php
+++ b/app/Http/Home/Controllers/RefundController.php
@@ -44,8 +44,10 @@ class RefundController extends Controller
 
         $service->handle();
 
+        $location = $this->url->get(['for' => 'home.my.refunds']);
+
         $content = [
-            'location' => $this->url->get(['for' => 'home.my.refunds']),
+            'location' => $location,
             'msg' => '申请退款成功',
         ];
 
@@ -78,8 +80,10 @@ class RefundController extends Controller
 
         $service->handle($sn);
 
+        $location = $this->url->get(['for' => 'home.my.refunds']);
+
         $content = [
-            'location' => $this->url->get(['for' => 'home.my.refunds']),
+            'location' => $location,
             'msg' => '取消退款成功',
         ];
 
diff --git a/app/Http/Home/Controllers/ReviewController.php b/app/Http/Home/Controllers/ReviewController.php
index 48b09a67..e353bf9d 100644
--- a/app/Http/Home/Controllers/ReviewController.php
+++ b/app/Http/Home/Controllers/ReviewController.php
@@ -99,9 +99,7 @@ class ReviewController extends Controller
 
         $service->handle($id);
 
-        $content = ['msg' => '删除评价成功'];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '删除评价成功']);
     }
 
     /**
@@ -115,9 +113,7 @@ class ReviewController extends Controller
 
         $msg = $like->deleted == 0 ? '点赞成功' : '取消点赞成功';
 
-        $content = ['msg' => $msg];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => $msg]);
     }
 
 }
diff --git a/app/Http/Home/Controllers/SearchController.php b/app/Http/Home/Controllers/SearchController.php
index 66c249fa..e722a23e 100644
--- a/app/Http/Home/Controllers/SearchController.php
+++ b/app/Http/Home/Controllers/SearchController.php
@@ -5,7 +5,6 @@ namespace App\Http\Home\Controllers;
 use App\Services\Logic\Search\Course as CourseSearchService;
 use App\Services\Logic\Search\Group as GroupSearchService;
 use App\Services\Logic\Search\User as UserSearchService;
-use App\Traits\Response as ResponseTrait;
 
 /**
  * @RoutePrefix("/search")
@@ -13,8 +12,6 @@ use App\Traits\Response as ResponseTrait;
 class SearchController extends Controller
 {
 
-    use ResponseTrait;
-
     /**
      * @Get("/", name="home.search.index")
      */
@@ -42,14 +39,6 @@ class SearchController extends Controller
         $this->view->setVar('pager', $pager);
     }
 
-    /**
-     * @Get("/form", name="home.search.form")
-     */
-    public function formAction()
-    {
-
-    }
-
     /**
      * @param string $type
      * @return CourseSearchService|GroupSearchService|UserSearchService
diff --git a/app/Http/Home/Controllers/UploadController.php b/app/Http/Home/Controllers/UploadController.php
index 73da70f8..e7877cf0 100644
--- a/app/Http/Home/Controllers/UploadController.php
+++ b/app/Http/Home/Controllers/UploadController.php
@@ -20,16 +20,16 @@ class UploadController extends Controller
 
         $file = $service->uploadAvatarImage();
 
-        if ($file) {
-            return $this->jsonSuccess([
-                'data' => [
-                    'src' => $service->getImageUrl($file->path),
-                    'title' => $file->name,
-                ]
-            ]);
-        } else {
+        if (!$file) {
             return $this->jsonError(['msg' => '上传文件失败']);
         }
+
+        $data = [
+            'src' => $service->getImageUrl($file->path),
+            'title' => $file->name,
+        ];
+
+        return $this->jsonSuccess(['data' => $data]);
     }
 
     /**
diff --git a/app/Http/Home/Controllers/VerifyController.php b/app/Http/Home/Controllers/VerifyController.php
index d89245bb..1e1666a5 100644
--- a/app/Http/Home/Controllers/VerifyController.php
+++ b/app/Http/Home/Controllers/VerifyController.php
@@ -4,7 +4,6 @@ namespace App\Http\Home\Controllers;
 
 use App\Services\Logic\Verify\EmailCode as EmailCodeService;
 use App\Services\Logic\Verify\SmsCode as SmsCodeService;
-use App\Services\Logic\Verify\VerifyCode as VerifyCodeService;
 use App\Traits\Response as ResponseTrait;
 
 /**
@@ -15,18 +14,6 @@ class VerifyController extends \Phalcon\Mvc\Controller
 
     use ResponseTrait;
 
-    /**
-     * @Post("/code", name="verify.code")
-     */
-    public function verifyCodeAction()
-    {
-        $service = new VerifyCodeService();
-
-        $service->handle();
-
-        return $this->jsonSuccess();
-    }
-
     /**
      * @Post("/sms/code", name="verify.sms_code")
      */
diff --git a/app/Http/Home/Services/Account.php b/app/Http/Home/Services/Account.php
index 4858213d..38efb3b2 100644
--- a/app/Http/Home/Services/Account.php
+++ b/app/Http/Home/Services/Account.php
@@ -3,7 +3,7 @@
 namespace App\Http\Home\Services;
 
 use App\Repos\User as UserRepo;
-use App\Services\Auth as AuthService;
+use App\Services\Auth\Home as AuthService;
 use App\Services\Logic\Account\Register as RegisterService;
 use App\Validators\Account as AccountValidator;
 use App\Validators\Captcha as CaptchaValidator;
@@ -40,13 +40,13 @@ class Account extends Service
     {
         $post = $this->request->getPost();
 
-        $accountValidator = new AccountValidator();
+        $validator = new AccountValidator();
 
-        $user = $accountValidator->checkUserLogin($post['account'], $post['password']);
+        $user = $validator->checkUserLogin($post['account'], $post['password']);
 
-        $captchaValidator = new CaptchaValidator();
+        $validator = new CaptchaValidator();
 
-        $captchaValidator->checkCode($post['ticket'], $post['rand']);
+        $validator->checkCode($post['ticket'], $post['rand']);
 
         $this->auth->saveAuthInfo($user);
     }
@@ -55,9 +55,9 @@ class Account extends Service
     {
         $post = $this->request->getPost();
 
-        $accountValidator = new AccountValidator();
+        $validator = new AccountValidator();
 
-        $user = $accountValidator->checkVerifyLogin($post['account'], $post['verify_code']);
+        $user = $validator->checkVerifyLogin($post['account'], $post['verify_code']);
 
         $this->auth->saveAuthInfo($user);
     }
diff --git a/app/Http/Home/Views/course/show_catalog.volt b/app/Http/Home/Views/course/show_catalog.volt
index cf542f8f..60500c47 100644
--- a/app/Http/Home/Views/course/show_catalog.volt
+++ b/app/Http/Home/Views/course/show_catalog.volt
@@ -36,7 +36,7 @@
     {% set priv = lesson.me.owned ? 'allow' : 'deny' %}
     <a class="{{ priv }} view-lesson" href="javascript:" data-url="{{ url }}">
         <i class="layui-icon layui-icon-read"></i>
-        <span class="title">{{ lesson.title|e }}</span>
+        <span class="title">{{ lesson.title }}</span>
         {% if lesson.free == 1 %}
             <span class="layui-badge free-badge">免费</span>
         {% endif %}
diff --git a/app/Http/Home/Views/macros/course.volt b/app/Http/Home/Views/macros/course.volt
index e6f7dfa9..82f6d237 100644
--- a/app/Http/Home/Views/macros/course.volt
+++ b/app/Http/Home/Views/macros/course.volt
@@ -32,12 +32,12 @@
     <div class="course-card">
         <div class="cover">
             <a href="{{ course_url }}">
-                <img src="{{ course.cover }}!cover_270" alt="{{ course.title|e }}" title="{{ course.title|e }}">
+                <img src="{{ course.cover }}!cover_270" alt="{{ course.title }}" title="{{ course.title }}">
             </a>
         </div>
         <div class="info">
             <div class="title layui-elip">
-                <a href="{{ course_url }}" title="{{ course.title|e }}">{{ course.title }}</a>
+                <a href="{{ course_url }}" title="{{ course.title }}">{{ course.title }}</a>
             </div>
             <div class="meta">
                 {% if course.market_price > course.vip_price %}
@@ -69,11 +69,11 @@
     {% set course_url = url({'for':'home.course.show','id':course.id}) %}
     <div class="sidebar-course-card clearfix">
         <div class="cover">
-            <img src="{{ course.cover }}!cover_270" alt="{{ course.title|e }}">
+            <img src="{{ course.cover }}!cover_270" alt="{{ course.title }}">
         </div>
         <div class="info">
             <div class="title layui-elip">
-                <a href="{{ course_url }}" title="{{ course.title|e }}">{{ course.title }}</a>
+                <a href="{{ course_url }}" title="{{ course.title }}">{{ course.title }}</a>
             </div>
             <div class="meta">
                 {% if course.market_price > 0 %}
@@ -91,7 +91,7 @@
 {%- endmacro %}
 
 {%- macro learning_course_card(item) %}
-    {% set course_title = item.course.title|e %}
+    {% set course_title = item.course.title %}
     {% set course_url = url({'for':'home.course.show','id':item.course.id}) %}
     <div class="course-card">
         <div class="cover">
diff --git a/app/Http/Home/Views/order/confirm.volt b/app/Http/Home/Views/order/confirm.volt
index 20b35abc..e0df3869 100644
--- a/app/Http/Home/Views/order/confirm.volt
+++ b/app/Http/Home/Views/order/confirm.volt
@@ -8,7 +8,7 @@
         {% set course_url = url({'for':'home.course.show','id':course.id}) %}
         <div class="cart-course-card clearfix">
             <div class="cover">
-                <img src="{{ course.cover }}!cover_270" alt="course.title|e">
+                <img src="{{ course.cover }}!cover_270" alt="{{ course.title }}">
             </div>
             <div class="info">
                 <p><a href="{{ course_url }}" target="_blank">{{ course.title }}</a></p>
@@ -30,7 +30,7 @@
         {% set course_url = url({'for':'home.course.show','id':course.id}) %}
         <div class="cart-course-card clearfix">
             <div class="cover">
-                <img src="{{ course.cover }}!cover_270" alt="course.title|e">
+                <img src="{{ course.cover }}!cover_270" alt="{{ course.title }}">
             </div>
             <div class="info">
                 <p><a href="{{ course_url }}" target="_blank">{{ course.title }}</a></p>
diff --git a/app/Models/App.php b/app/Models/App.php
new file mode 100644
index 00000000..3dd844c1
--- /dev/null
+++ b/app/Models/App.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace App\Models;
+
+use Phalcon\Mvc\Model\Behavior\SoftDelete;
+use Phalcon\Text;
+
+class App extends Model
+{
+
+    /**
+     * 应用类型
+     */
+    const TYPE_PC = 'pc';
+    const TYPE_H5 = 'h5';
+    const TYPE_IOS = 'ios';
+    const TYPE_ANDROID = 'android';
+    const TYPE_MP_WEIXIN = 'mp_weixin';
+    const TYPE_MP_ALIPAY = 'mp_alipay';
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id;
+
+    /**
+     * 名称
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * key
+     *
+     * @var string
+     */
+    public $key;
+
+    /**
+     * secret
+     *
+     * @var string
+     */
+    public $secret;
+
+    /**
+     * 类型
+     *
+     * @var string
+     */
+    public $type;
+
+    /**
+     * 备注
+     *
+     * @var string
+     */
+    public $remark;
+
+    /**
+     * 发布标识
+     *
+     * @var int
+     */
+    public $published;
+
+    /**
+     * 删除标识
+     *
+     * @var int
+     */
+    public $deleted;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time;
+
+    /**
+     * 更新时间
+     *
+     * @var int
+     */
+    public $update_time;
+
+    public function getSource(): string
+    {
+        return 'kg_app';
+    }
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        $this->addBehavior(
+            new SoftDelete([
+                'field' => 'deleted',
+                'value' => 1,
+            ])
+        );
+    }
+
+    public function beforeCreate()
+    {
+        $this->key = Text::random(Text::RANDOM_ALNUM, 16);
+        $this->secret = Text::random(Text::RANDOM_ALNUM, 16);
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        if ($this->deleted == 1) {
+            $this->published = 0;
+        }
+
+        $this->update_time = time();
+    }
+
+    public static function types()
+    {
+        return [
+            self::TYPE_PC => 'PC客户端',
+            self::TYPE_H5 => 'H5客户端',
+            self::TYPE_IOS => 'IOS客户端',
+            self::TYPE_ANDROID => 'Android客户端',
+            self::TYPE_MP_WEIXIN => '微信小程序',
+            self::TYPE_MP_ALIPAY => '支付宝小程序',
+        ];
+    }
+
+}
diff --git a/app/Models/AppVersion.php b/app/Models/AppVersion.php
new file mode 100644
index 00000000..5dc49c6a
--- /dev/null
+++ b/app/Models/AppVersion.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace App\Models;
+
+use App\Caches\MaxCategoryId as MaxCategoryIdCache;
+use Phalcon\Mvc\Model\Behavior\SoftDelete;
+
+class AppVersion extends Model
+{
+
+    /**
+     * 平台类型
+     */
+    const PLATFORM_IOS = 1;
+    const PLATFORM_ANDROID = 2;
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id;
+
+    /**
+     * 平台类型
+     *
+     * @var int
+     */
+    public $platform;
+
+    /**
+     * 版本名（例如：v1.0.0）
+     *
+     * @var string
+     */
+    public $version_name;
+
+    /**
+     * 版本号（例如：100）
+     *
+     * @var string
+     */
+    public $version_code;
+
+    /**
+     * 下载地址
+     *
+     * @var string
+     */
+    public $download_url;
+
+    /**
+     * 发布标识
+     *
+     * @var int
+     */
+    public $published;
+
+    /**
+     * 删除标识
+     *
+     * @var int
+     */
+    public $deleted;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time;
+
+    /**
+     * 更新时间
+     *
+     * @var int
+     */
+    public $update_time;
+
+    public function getSource(): string
+    {
+        return 'kg_category';
+    }
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        $this->addBehavior(
+            new SoftDelete([
+                'field' => 'deleted',
+                'value' => 1,
+            ])
+        );
+    }
+
+    public function beforeCreate()
+    {
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        if ($this->deleted == 1) {
+            $this->published = 0;
+        }
+
+        $this->update_time = time();
+    }
+
+    public function afterCreate()
+    {
+        $cache = new MaxCategoryIdCache();
+
+        $cache->rebuild();
+    }
+
+    public static function types()
+    {
+        return [
+            self::TYPE_COURSE => '课程',
+            self::TYPE_HELP => '帮助',
+        ];
+    }
+
+}
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 80e546a3..624fc3d8 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -8,18 +8,30 @@ class Client
     /**
      * 类型
      */
-    const TYPE_DESKTOP = 1; // desktop
-    const TYPE_MOBILE = 2; // mobile
-    const TYPE_APP = 3; // app
-    const TYPE_MINI = 4; // 小程序
+    const TYPE_PC = 1;
+    const TYPE_H5 = 2;
+    const TYPE_APP = 3;
+    const TYPE_MP = 4;
+    const TYPE_MP_WEIXIN = 5;
+    const TYPE_MP_ALIPAY = 6;
+    const TYPE_MP_BAIDU = 7;
+    const TYPE_MP_TOUTIAO = 8;
+    const TYPE_MP_QQ = 9;
+    const TYPE_MP_360 = 10;
 
     public static function types()
     {
         return [
-            self::TYPE_DESKTOP => 'desktop',
-            self::TYPE_MOBILE => 'mobile',
-            self::TYPE_APP => 'app',
-            self::TYPE_MINI => 'mini',
+            self::TYPE_PC => 'PC',
+            self::TYPE_H5 => 'H5',
+            self::TYPE_APP => 'APP',
+            self::TYPE_MP => 'MP',
+            self::TYPE_MP_WEIXIN => 'MP-WEIXIN',
+            self::TYPE_MP_ALIPAY => 'MP-ALIPAY',
+            self::TYPE_MP_BAIDU => 'MP-BAIDU',
+            self::TYPE_MP_TOUTIAO => 'MP-TOUTIAO',
+            self::TYPE_MP_QQ => 'MP-QQ',
+            self::TYPE_MP_360 => 'MP-360',
         ];
     }
 
diff --git a/app/Repos/App.php b/app/Repos/App.php
new file mode 100644
index 00000000..028c280a
--- /dev/null
+++ b/app/Repos/App.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\App as AppModel;
+use Phalcon\Mvc\Model;
+
+class App extends Repository
+{
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(AppModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['id'])) {
+            $builder->andWhere('id = :id:', ['id' => $where['id']]);
+        }
+
+        if (!empty($where['key'])) {
+            $builder->andWhere('key = :key:', ['key' => $where['key']]);
+        }
+
+        if (!empty($where['type'])) {
+            $builder->andWhere('type = :type:', ['type' => $where['type']]);
+        }
+
+        if (!empty($where['published'])) {
+            $builder->andWhere('published = :published:', ['published' => $where['published']]);
+        }
+
+        if (isset($where['deleted'])) {
+            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
+        }
+
+        switch ($sort) {
+            default:
+                $orderBy = 'id DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+    /**
+     * @param int $id
+     * @return AppModel|Model|bool
+     */
+    public function findById($id)
+    {
+        return AppModel::findFirst($id);
+    }
+
+    /**
+     * @param string $appKey
+     * @return AppModel|Model|bool
+     */
+    public function findByAppKey($appKey)
+    {
+        return AppModel::findFirst([
+            'conditions' => 'key = :key:',
+            'bind' => ['key' => $appKey],
+        ]);
+    }
+
+}
diff --git a/app/Services/Auth/Api.php b/app/Services/Auth/Api.php
index 06afce50..fbc76eae 100644
--- a/app/Services/Auth/Api.php
+++ b/app/Services/Auth/Api.php
@@ -41,7 +41,7 @@ class Api extends AuthService
 
     public function getAuthInfo()
     {
-        $authToken = $this->getAuthToken();
+        $authToken = $this->request->getHeader('X-Token');
 
         if (!$authToken) return null;
 
@@ -69,11 +69,4 @@ class Api extends AuthService
         ];
     }
 
-    protected function getAuthToken()
-    {
-        $authorization = $this->request->getHeader('Authorization');
-
-        return trim(str_ireplace('Bearer', '', $authorization));
-    }
-
 }
diff --git a/app/Services/Logic/Consult/ConsultInfo.php b/app/Services/Logic/Consult/ConsultInfo.php
index d402d9a1..52dcf335 100644
--- a/app/Services/Logic/Consult/ConsultInfo.php
+++ b/app/Services/Logic/Consult/ConsultInfo.php
@@ -32,46 +32,57 @@ class ConsultInfo extends Service
             'like_count' => $consult->like_count,
             'create_time' => $consult->create_time,
             'update_time' => $consult->update_time,
-            'course' => new \stdClass(),
-            'chapter' => new \stdClass(),
-            'owner' => new \stdClass(),
         ];
 
-        $courseRepo = new CourseRepo();
-
-        $course = $courseRepo->findById($consult->course_id);
-
-        if ($course) {
-            $result['course'] = [
-                'id' => $course->id,
-                'title' => $course->title,
-            ];
-        }
-
-        $chapterRepo = new ChapterRepo();
-
-        $chapter = $chapterRepo->findById($consult->chapter_id);
-
-        if ($chapter) {
-            $result['chapter'] = [
-                'id' => $chapter->id,
-                'title' => $chapter->title,
-            ];
-        }
-
-        $userRepo = new UserRepo();
-
-        $owner = $userRepo->findById($consult->owner_id);
-
-        if ($owner) {
-            $result['owner'] = [
-                'id' => $owner->id,
-                'name' => $owner->name,
-                'avatar' => $owner->avatar,
-            ];
-        }
+        $result['course'] = $this->handleCourseInfo($consult);
+        $result['chapter'] = $this->handleChapterInfo($consult);
+        $result['owner'] = $this->handleOwnerInfo($consult);
 
         return $result;
     }
 
+    protected function handleCourseInfo(ConsultModel $consult)
+    {
+        $courseRepo = new CourseRepo();
+
+        $course = $courseRepo->findById($consult->course_id);
+
+        if (!$course) return new \stdClass();
+
+        return [
+            'id' => $course->id,
+            'title' => $course->title,
+            'cover' => $course->cover,
+        ];
+    }
+
+    protected function handleChapterInfo(ConsultModel $consult)
+    {
+        $chapterRepo = new ChapterRepo();
+
+        $chapter = $chapterRepo->findById($consult->chapter_id);
+
+        if (!$chapter) return new \stdClass();
+
+        return [
+            'id' => $chapter->id,
+            'title' => $chapter->title,
+        ];
+    }
+
+    protected function handleOwnerInfo(ConsultModel $consult)
+    {
+        $userRepo = new UserRepo();
+
+        $owner = $userRepo->findById($consult->owner_id);
+
+        if (!$owner) return new \stdClass();
+
+        return [
+            'id' => $owner->id,
+            'name' => $owner->name,
+            'avatar' => $owner->avatar,
+        ];
+    }
+
 }
diff --git a/app/Services/Logic/Course/BasicInfo.php b/app/Services/Logic/Course/BasicInfo.php
index 8103e5f0..ad16bb4d 100644
--- a/app/Services/Logic/Course/BasicInfo.php
+++ b/app/Services/Logic/Course/BasicInfo.php
@@ -43,6 +43,7 @@ class BasicInfo extends Service
             'attrs' => $course->attrs,
             'user_count' => $course->user_count,
             'lesson_count' => $course->lesson_count,
+            'resource_count' => $course->resource_count,
             'package_count' => $course->package_count,
             'review_count' => $course->review_count,
             'consult_count' => $course->consult_count,
diff --git a/app/Services/Logic/Course/CategoryList.php b/app/Services/Logic/Course/CategoryList.php
new file mode 100644
index 00000000..3fed96a3
--- /dev/null
+++ b/app/Services/Logic/Course/CategoryList.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Services\Logic\Course;
+
+use App\Caches\CategoryTreeList as CategoryTreeListCache;
+use App\Models\Category as CategoryModel;
+use App\Services\Logic\Service;
+
+class CategoryList extends Service
+{
+
+    public function handle()
+    {
+        $cache = new CategoryTreeListCache();
+
+        return $cache->get(CategoryModel::TYPE_COURSE);
+    }
+
+}
diff --git a/app/Services/Logic/Course/CourseList.php b/app/Services/Logic/Course/CourseList.php
index a8faf011..0f68f8ba 100644
--- a/app/Services/Logic/Course/CourseList.php
+++ b/app/Services/Logic/Course/CourseList.php
@@ -6,6 +6,7 @@ use App\Library\Paginator\Query as PagerQuery;
 use App\Repos\Course as CourseRepo;
 use App\Services\Category as CategoryService;
 use App\Services\Logic\Service;
+use App\Validators\CourseQuery as CourseQueryValidator;
 
 class CourseList extends Service
 {
@@ -16,6 +17,8 @@ class CourseList extends Service
 
         $params = $pagerQuery->getParams();
 
+        $params = $this->checkQueryParams($params);
+
         /**
          * tc => top_category
          * sc => sub_category
@@ -84,4 +87,29 @@ class CourseList extends Service
         return $pager;
     }
 
+    protected function checkQueryParams($params)
+    {
+        $validator = new CourseQueryValidator();
+
+        $query = [];
+
+        if (isset($params['tc'])) {
+            $query['tc'] = $validator->checkTopCategory($params['tc']);
+        }
+
+        if (isset($params['sc'])) {
+            $query['sc'] = $validator->checkSubCategory($params['sc']);
+        }
+
+        if (isset($params['model'])) {
+            $query['model'] = $validator->checkModel($params['model']);
+        }
+
+        if (isset($params['level'])) {
+            $query['level'] = $validator->checkLevel($params['level']);
+        }
+
+        return $query;
+    }
+
 }
diff --git a/app/Services/Logic/Im/GroupInfo.php b/app/Services/Logic/Im/GroupInfo.php
new file mode 100644
index 00000000..13aaec2d
--- /dev/null
+++ b/app/Services/Logic/Im/GroupInfo.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Services\Logic\Im;
+
+use App\Repos\User as UserRepo;
+use App\Services\Logic\ImGroupTrait;
+use App\Services\Logic\Service;
+
+
+class GroupInfo extends Service
+{
+
+    use ImGroupTrait;
+
+    public function handle($id)
+    {
+        $group = $this->checkGroup($id);
+
+        $userRepo = new UserRepo();
+
+        $owner = $userRepo->findById($group->owner_id);
+
+        return [
+            'id' => $group->id,
+            'type' => $group->type,
+            'name' => $group->name,
+            'avatar' => $group->avatar,
+            'about' => $group->about,
+            'user_count' => $group->user_count,
+            'msg_count' => $group->msg_count,
+            'owner' => [
+                'id' => $owner->id,
+                'name' => $owner->name,
+                'avatar' => $owner->avatar,
+                'title' => $owner->title,
+                'about' => $owner->about,
+                'vip' => $owner->vip,
+            ],
+        ];
+    }
+
+}
diff --git a/app/Services/Logic/Im/GroupList.php b/app/Services/Logic/Im/GroupList.php
new file mode 100644
index 00000000..88160b9e
--- /dev/null
+++ b/app/Services/Logic/Im/GroupList.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Services\Logic\Im;
+
+use App\Builders\ImGroupList as ImGroupListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\ImGroup as ImGroupRepo;
+use App\Services\Logic\Service;
+
+class GroupList extends Service
+{
+
+    public function handle()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['published'] = 1;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $groupRepo = new ImGroupRepo();
+
+        $pager = $groupRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleGroups($pager);
+    }
+
+    protected function handleGroups($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new ImGroupListBuilder();
+
+        $groups = $pager->items->toArray();
+
+        $users = $builder->getUsers($groups);
+
+        $baseUrl = kg_cos_url();
+
+        $items = [];
+
+        foreach ($groups as $group) {
+
+            $group['avatar'] = $baseUrl . $group['avatar'];
+            $group['owner'] = $users[$group['owner_id']] ?? new \stdClass();
+
+            $items[] = [
+                'id' => $group['id'],
+                'type' => $group['type'],
+                'name' => $group['name'],
+                'avatar' => $group['avatar'],
+                'about' => $group['about'],
+                'user_count' => $group['user_count'],
+                'msg_count' => $group['msg_count'],
+                'owner' => $group['owner'],
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/Im/GroupUserList.php b/app/Services/Logic/Im/GroupUserList.php
new file mode 100644
index 00000000..b0fed864
--- /dev/null
+++ b/app/Services/Logic/Im/GroupUserList.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Services\Logic\Im;
+
+use App\Builders\ImGroupUserList as ImGroupUserListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\ImGroupUser as ImGroupUserRepo;
+use App\Services\Logic\ImGroupTrait;
+use App\Services\Logic\Service;
+
+class GroupUserList extends Service
+{
+
+    use ImGroupTrait;
+
+    public function handle($id)
+    {
+        $group = $this->checkGroup($id);
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['group_id'] = $group->id;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $repo = new ImGroupUserRepo();
+
+        $pager = $repo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleGroupUsers($pager);
+    }
+
+    protected function handleGroupUsers($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new ImGroupUserListBuilder();
+
+        $relations = $pager->items->toArray();
+
+        $users = $builder->getUsers($relations);
+
+        $items = [];
+
+        foreach ($relations as $relation) {
+            $user = $users[$relation['user_id']] ?? new \stdClass();
+            $items[] = $user;
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/ImGroupTrait.php b/app/Services/Logic/ImGroupTrait.php
new file mode 100644
index 00000000..cde6ea57
--- /dev/null
+++ b/app/Services/Logic/ImGroupTrait.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Services\Logic;
+
+use App\Validators\ImGroup as ImGroupValidator;
+
+trait ImGroupTrait
+{
+
+    public function checkGroup($id)
+    {
+        $validator = new ImGroupValidator();
+
+        return $validator->checkGroup($id);
+    }
+
+}
diff --git a/app/Services/Logic/Order/OrderInfo.php b/app/Services/Logic/Order/OrderInfo.php
index 2b577021..abc21362 100644
--- a/app/Services/Logic/Order/OrderInfo.php
+++ b/app/Services/Logic/Order/OrderInfo.php
@@ -34,6 +34,8 @@ class OrderInfo extends Service
             'item_id' => $order->item_id,
             'item_type' => $order->item_type,
             'item_info' => $order->item_info,
+            'create_time' => $order->create_time,
+            'update_time' => $order->update_time,
         ];
     }
 
diff --git a/app/Services/Logic/Refund/RefundCancel.php b/app/Services/Logic/Refund/RefundCancel.php
index 84ae4e6e..288e02fc 100644
--- a/app/Services/Logic/Refund/RefundCancel.php
+++ b/app/Services/Logic/Refund/RefundCancel.php
@@ -22,6 +22,8 @@ class RefundCancel extends Service
 
         $validator = new RefundValidator();
 
+        $validator->checkIfAllowCancel($refund);
+
         $validator->checkOwner($user->id, $refund->owner_id);
 
         $refund->status = RefundModel::STATUS_CANCELED;
diff --git a/app/Services/Logic/Review/ReviewCreate.php b/app/Services/Logic/Review/ReviewCreate.php
index 73309717..deb208a1 100644
--- a/app/Services/Logic/Review/ReviewCreate.php
+++ b/app/Services/Logic/Review/ReviewCreate.php
@@ -3,6 +3,7 @@
 namespace App\Services\Logic\Review;
 
 use App\Models\Course as CourseModel;
+use App\Models\CourseUser as CourseUserModel;
 use App\Models\Review as ReviewModel;
 use App\Services\CourseStat as CourseStatService;
 use App\Services\Logic\CourseTrait;
@@ -21,13 +22,14 @@ class ReviewCreate extends Service
     {
         $post = $this->request->getPost();
 
-        $course = $this->checkCourseCache($post['course_id']);
+        $course = $this->checkCourse($post['course_id']);
 
         $user = $this->getLoginUser();
 
         $validator = new CourseUserValidator();
 
-        $validator->checkCourseUser($course->id, $user->id);
+        $courseUser = $validator->checkCourseUser($course->id, $user->id);
+
         $validator->checkIfReviewed($course->id, $user->id);
 
         $validator = new ReviewValidator();
@@ -46,6 +48,8 @@ class ReviewCreate extends Service
 
         $review->create($data);
 
+        $this->updateCourseUserReview($courseUser);
+
         $this->incrCourseReviewCount($course);
 
         $this->updateCourseRating($course->id);
@@ -53,6 +57,13 @@ class ReviewCreate extends Service
         return $review;
     }
 
+    protected function updateCourseUserReview(CourseUserModel $courseUser)
+    {
+        $courseUser->reviewed = 1;
+
+        $courseUser->update();
+    }
+
     protected function incrCourseReviewCount(CourseModel $course)
     {
         $course->review_count += 1;
diff --git a/app/Services/Logic/Review/ReviewInfo.php b/app/Services/Logic/Review/ReviewInfo.php
index 45cbf5c1..692fa381 100644
--- a/app/Services/Logic/Review/ReviewInfo.php
+++ b/app/Services/Logic/Review/ReviewInfo.php
@@ -3,6 +3,7 @@
 namespace App\Services\Logic\Review;
 
 use App\Models\Review as ReviewModel;
+use App\Repos\Course as CourseRepo;
 use App\Repos\User as UserRepo;
 use App\Services\Logic\ReviewTrait;
 use App\Services\Logic\Service;
@@ -34,17 +35,40 @@ class ReviewInfo extends Service
             'update_time' => $review->update_time,
         ];
 
-        $userRepo = new UserRepo();
-
-        $owner = $userRepo->findById($review->owner_id);
-
-        $result['owner'] = [
-            'id' => $owner->id,
-            'name' => $owner->name,
-            'avatar' => $owner->avatar,
-        ];
+        $result['course'] = $this->handleCourseInfo($review);
+        $result['owner'] = $this->handleOwnerInfo($review);
 
         return $result;
     }
 
+    protected function handleCourseInfo(ReviewModel $review)
+    {
+        $courseRepo = new CourseRepo();
+
+        $course = $courseRepo->findById($review->course_id);
+
+        if (!$course) return new \stdClass();
+
+        return [
+            'id' => $course->id,
+            'title' => $course->title,
+            'cover' => $course->cover,
+        ];
+    }
+
+    protected function handleOwnerInfo(ReviewModel $review)
+    {
+        $userRepo = new UserRepo();
+
+        $owner = $userRepo->findById($review->owner_id);
+
+        if (!$owner) return new \stdClass();
+
+        return [
+            'id' => $owner->id,
+            'name' => $owner->name,
+            'avatar' => $owner->avatar,
+        ];
+    }
+
 }
diff --git a/app/Services/Logic/Teacher/CourseList.php b/app/Services/Logic/Teacher/CourseList.php
new file mode 100644
index 00000000..80e5c181
--- /dev/null
+++ b/app/Services/Logic/Teacher/CourseList.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Services\Logic\Teacher;
+
+use App\Builders\CourseUserList as CourseUserListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\CourseUser as CourseUserModel;
+use App\Repos\CourseUser as CourseUserRepo;
+use App\Services\Logic\Service;
+use App\Services\Logic\UserTrait;
+
+class CourseList extends Service
+{
+
+    use UserTrait;
+
+    public function handle($id)
+    {
+        $user = $this->checkUser($id);
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['role_type'] = CourseUserModel::ROLE_TEACHER;
+        $params['user_id'] = $user->id;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $courseUserRepo = new CourseUserRepo();
+
+        $pager = $courseUserRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleCourses($pager);
+    }
+
+    protected function handleCourses($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new CourseUserListBuilder();
+
+        $relations = $pager->items->toArray();
+
+        $courses = $builder->getCourses($relations);
+
+        $pager->items = $courses;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/Teacher/TeacherInfo.php b/app/Services/Logic/Teacher/TeacherInfo.php
index f2ecda6a..ee17103c 100644
--- a/app/Services/Logic/Teacher/TeacherInfo.php
+++ b/app/Services/Logic/Teacher/TeacherInfo.php
@@ -8,7 +8,7 @@ use App\Services\Logic\User\UserInfo as UserInfoService;
 class TeacherInfo extends Service
 {
 
-    public function getUser($id)
+    public function handle($id)
     {
         $service = new UserInfoService();
 
diff --git a/app/Services/Logic/User/Console/ConsultList.php b/app/Services/Logic/User/Console/ConsultList.php
index e5c58e84..d023a329 100644
--- a/app/Services/Logic/User/Console/ConsultList.php
+++ b/app/Services/Logic/User/Console/ConsultList.php
@@ -63,6 +63,7 @@ class ConsultList extends Service
                 'update_time' => $consult['update_time'],
                 'course' => $course,
                 'chapter' => $chapter,
+                'show' => false,
             ];
         }
 
diff --git a/app/Services/Logic/User/Console/GroupList.php b/app/Services/Logic/User/Console/GroupList.php
index 4d82b4a6..434442dd 100644
--- a/app/Services/Logic/User/Console/GroupList.php
+++ b/app/Services/Logic/User/Console/GroupList.php
@@ -11,7 +11,7 @@ use App\Services\Logic\User\GroupList as UserGroupListService;
 class GroupList extends Service
 {
 
-    public function handle($scope)
+    public function handle($scope = 'joined')
     {
         $result = [];
 
diff --git a/app/Services/Logic/User/CourseList.php b/app/Services/Logic/User/CourseList.php
index 39347215..431ad8ba 100644
--- a/app/Services/Logic/User/CourseList.php
+++ b/app/Services/Logic/User/CourseList.php
@@ -54,6 +54,7 @@ class CourseList extends Service
             $course = $courses[$relation['course_id']] ?? new \stdClass();
 
             $items[] = [
+                'plan_id' => $relation['plan_id'],
                 'progress' => $relation['progress'],
                 'duration' => $relation['duration'],
                 'reviewed' => $relation['reviewed'],
diff --git a/app/Services/Logic/Verify/VerifyCode.php b/app/Services/Logic/Verify/VerifyCode.php
deleted file mode 100644
index e2f35aa7..00000000
--- a/app/Services/Logic/Verify/VerifyCode.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Services\Logic\Verify;
-
-use App\Library\Validators\Common as CommonValidator;
-use App\Services\Logic\Service;
-use App\Services\Mail\Verify as VerifyMailService;
-use App\Services\Sms\Verify as VerifySmsService;
-use App\Validators\Captcha as CaptchaValidator;
-
-class VerifyCode extends Service
-{
-
-    public function handle()
-    {
-        $post = $this->request->getPost();
-
-        $captchaValidator = new CaptchaValidator();
-
-        $captchaValidator->checkCode($post['ticket'], $post['rand']);
-
-        if (CommonValidator::phone($post['account'])) {
-
-            $service = new VerifySmsService();
-
-            $service->handle($post['account']);
-
-        } elseif (CommonValidator::email($post['account'])) {
-
-            $service = new VerifyMailService();
-
-            $service->handle($post['account']);
-        }
-    }
-
-}
diff --git a/app/Services/Pay.php b/app/Services/Pay.php
index 9cc34cf5..2acc3ac7 100644
--- a/app/Services/Pay.php
+++ b/app/Services/Pay.php
@@ -32,7 +32,7 @@ abstract class Pay extends Service
     abstract public function scan(TradeModel $trade);
 
     /**
-     * mobile下单
+     * wap下单
      *
      * @param TradeModel $trade
      */
diff --git a/app/Services/Pay/Alipay.php b/app/Services/Pay/Alipay.php
index 9413f139..447acd51 100644
--- a/app/Services/Pay/Alipay.php
+++ b/app/Services/Pay/Alipay.php
@@ -57,7 +57,36 @@ class Alipay extends PayService
     }
 
     /**
-     * 移动端支付
+     * app支付
+     *
+     * @param TradeModel $trade
+     * @return Response|bool
+     */
+    public function app(TradeModel $trade)
+    {
+        try {
+
+            $result = $this->gateway->app([
+                'out_trade_no' => $trade->sn,
+                'total_amount' => $trade->amount,
+                'subject' => $trade->subject,
+            ]);
+
+        } catch (\Exception $e) {
+
+            Log::error('Alipay app Exception', [
+                'code' => $e->getCode(),
+                'message' => $e->getMessage(),
+            ]);
+
+            $result = false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * wap支付
      *
      * @param TradeModel $trade
      * @return Response|bool
@@ -66,7 +95,7 @@ class Alipay extends PayService
     {
         try {
 
-            return $this->gateway->wap([
+            $result = $this->gateway->wap([
                 'out_trade_no' => $trade->sn,
                 'total_amount' => $trade->amount,
                 'subject' => $trade->subject,
@@ -85,6 +114,37 @@ class Alipay extends PayService
         return $result;
     }
 
+    /**
+     * 小程序支付
+     *
+     * @param TradeModel $trade
+     * @param string $buyerId
+     * @return Collection|bool
+     */
+    public function mini(TradeModel $trade, $buyerId)
+    {
+        try {
+
+            $result = $this->gateway->mini([
+                'out_trade_no' => $trade->sn,
+                'total_amount' => $trade->amount,
+                'subject' => $trade->subject,
+                'buyer_id' => $buyerId,
+            ]);
+
+        } catch (\Exception $e) {
+
+            Log::error('Alipay Mini Exception', [
+                'code' => $e->getCode(),
+                'message' => $e->getMessage(),
+            ]);
+
+            $result = false;
+        }
+
+        return $result;
+    }
+
     /**
      * 异步通知
      *
diff --git a/app/Services/Pay/Wxpay.php b/app/Services/Pay/Wxpay.php
index 53640ad9..2f8e9e05 100644
--- a/app/Services/Pay/Wxpay.php
+++ b/app/Services/Pay/Wxpay.php
@@ -58,7 +58,36 @@ class Wxpay extends PayService
     }
 
     /**
-     * 移动端支付
+     * app支付
+     *
+     * @param TradeModel $trade
+     * @return Response|bool
+     */
+    public function app(TradeModel $trade)
+    {
+        try {
+
+            $result = $this->gateway->app([
+                'out_trade_no' => $trade->sn,
+                'total_fee' => 100 * $trade->amount,
+                'body' => $trade->subject,
+            ]);
+
+        } catch (\Exception $e) {
+
+            Log::error('Wxpay App Exception', [
+                'code' => $e->getCode(),
+                'message' => $e->getMessage(),
+            ]);
+
+            $result = false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * wap支付
      *
      * @param TradeModel $trade
      * @return Response|bool
@@ -67,7 +96,7 @@ class Wxpay extends PayService
     {
         try {
 
-            return $this->gateway->wap([
+            $result = $this->gateway->wap([
                 'out_trade_no' => $trade->sn,
                 'total_fee' => 100 * $trade->amount,
                 'body' => $trade->subject,
@@ -86,6 +115,37 @@ class Wxpay extends PayService
         return $result;
     }
 
+    /**
+     * 小程序支付
+     *
+     * @param TradeModel $trade
+     * @param string $openId
+     * @return Collection|bool
+     */
+    public function mini(TradeModel $trade, $openId)
+    {
+        try {
+
+            $result = $this->gateway->miniapp([
+                'out_trade_no' => $trade->sn,
+                'total_fee' => 100 * $trade->amount,
+                'body' => $trade->subject,
+                'openid' => $openId,
+            ]);
+
+        } catch (\Exception $e) {
+
+            Log::error('Wxpay Mini Exception', [
+                'code' => $e->getCode(),
+                'message' => $e->getMessage(),
+            ]);
+
+            $result = false;
+        }
+
+        return $result;
+    }
+
     /**
      * 异步通知
      *
diff --git a/app/Traits/Client.php b/app/Traits/Client.php
index 65660412..678a3415 100644
--- a/app/Traits/Client.php
+++ b/app/Traits/Client.php
@@ -31,13 +31,27 @@ trait Client
 
         $result = new BrowserParser($userAgent);
 
-        $clientType = ClientModel::TYPE_DESKTOP;
+        $clientType = ClientModel::TYPE_PC;
 
         if ($result->isMobile()) {
-            $clientType = ClientModel::TYPE_MOBILE;
+            $clientType = ClientModel::TYPE_H5;
         }
 
         return $clientType;
     }
 
+    public function isMobileBrowser()
+    {
+        /**
+         * @var Request $request
+         */
+        $request = Di::getDefault()->get('request');
+
+        $userAgent = $request->getServer('HTTP_USER_AGENT');
+
+        $result = new BrowserParser($userAgent);
+
+        return $result->isMobile();
+    }
+
 }
\ No newline at end of file
diff --git a/app/Traits/Response.php b/app/Traits/Response.php
index 1cb89589..95596ea2 100644
--- a/app/Traits/Response.php
+++ b/app/Traits/Response.php
@@ -2,12 +2,57 @@
 
 namespace App\Traits;
 
+use Phalcon\Config;
 use Phalcon\Di;
+use Phalcon\Http\Request as HttpRequest;
 use Phalcon\Http\Response as HttpResponse;
 
 trait Response
 {
 
+    public function setCors()
+    {
+        /**
+         * @var Config $config
+         */
+        $config = Di::getDefault()->getShared('config');
+
+        $cors = $config->get('cors')->toArray();
+
+        if (!$cors['enabled']) return;
+
+        if (is_array($cors['allow_headers'])) {
+            $cors['allow_headers'] = implode(',', $cors['allow_headers']);
+        }
+
+        if (is_array($cors['allow_methods'])) {
+            $cors['allow_methods'] = implode(',', $cors['allow_methods']);
+        }
+
+        /**
+         * @var HttpRequest $request
+         */
+        $request = Di::getDefault()->getShared('request');
+
+        $origin = $request->getHeader('Origin');
+
+        if (is_array($cors['allow_origin']) && in_array($origin, $cors['allow_origin'])) {
+            $cors['allow_origin'] = $origin;
+        }
+
+        /**
+         * @var HttpResponse $response
+         */
+        $response = Di::getDefault()->getShared('response');
+
+        $response->setHeader('Access-Control-Allow-Origin', $cors['allow_origin']);
+
+        if ($request->isOptions()) {
+            $response->setHeader('Access-Control-Allow-Headers', $cors['allow_headers']);
+            $response->setHeader('Access-Control-Allow-Methods', $cors['allow_methods']);
+        }
+    }
+
     public function jsonSuccess($content = [])
     {
         $content['code'] = 0;
@@ -17,7 +62,7 @@ trait Response
         /**
          * @var HttpResponse $response
          */
-        $response = Di::getDefault()->get('response');
+        $response = Di::getDefault()->getShared('response');
 
         $response->setStatusCode(200);
 
@@ -35,7 +80,7 @@ trait Response
         /**
          * @var HttpResponse $response
          */
-        $response = Di::getDefault()->get('response');
+        $response = Di::getDefault()->getShared('response');
 
         $response->setJsonContent($content);
 
diff --git a/app/Traits/Security.php b/app/Traits/Security.php
index cb8a86e4..408d7339 100644
--- a/app/Traits/Security.php
+++ b/app/Traits/Security.php
@@ -30,12 +30,19 @@ trait Security
         $validator->checkRateLimit();
     }
 
+    public function checkApiSignature()
+    {
+        $validator = new SecurityValidator();
+
+        $validator->checkApiSignature();
+    }
+
     public function isNotSafeRequest()
     {
         /**
          * @var Request $request
          */
-        $request = Di::getDefault()->get('request');
+        $request = Di::getDefault()->getShared('request');
 
         $method = $request->getMethod();
 
diff --git a/app/Validators/ApiSecurity.php b/app/Validators/ApiSecurity.php
new file mode 100644
index 00000000..855354bc
--- /dev/null
+++ b/app/Validators/ApiSecurity.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Validators;
+
+use App\Caches\App as AppCache;
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Models\App as AppModel;
+
+class ApiSecurity extends Validator
+{
+
+    public function check()
+    {
+        $query = $this->request->getQuery();
+
+        if (isset($query['_url'])) {
+            unset($query['_url']);
+        }
+
+        $extra = [
+            '_timestamp' => $this->checkTimestamp(),
+            '_nonce' => $this->checkNonce(),
+        ];
+
+        $appKey = $this->checkAppKey();
+
+        $app = $this->getApp($appKey);
+
+        if (!$app || $app->published == 0) {
+            throw new BadRequestException('api.invalid_app_key');
+        }
+
+        $url = $this->getRequestUrl();
+
+        if ($this->request->getMethod() == 'POST') {
+            $mySignature = $this->httpPostSignature($url, $extra, $app->secret);
+        } else {
+            $params = array_merge($query, $extra);
+            $mySignature = $this->httpGetSignature($url, $params, $app->secret);
+        }
+
+        $signature = $this->request->getHeader('X-Signature');
+
+        if ($signature != $mySignature) {
+            throw new BadRequestException('api.invalid_signature');
+        }
+
+        return $signature;
+    }
+
+    protected function checkTimestamp()
+    {
+        $timestamp = $this->request->getHeader('X-Timestamp');
+
+        $timestamp = $timestamp > 0 ? $timestamp : 0;
+
+        if (abs(time() - $timestamp) > 300) {
+            throw new BadRequestException('api.invalid_timestamp');
+        }
+
+        return $timestamp;
+    }
+
+    protected function checkNonce()
+    {
+        $nonce = $this->request->getHeader('X-Nonce');
+
+        if (!$nonce) {
+            throw new BadRequestException('api.invalid_nonce');
+        }
+
+        return $nonce;
+    }
+
+    protected function checkAppKey()
+    {
+        $appKey = $this->request->getHeader('X-App-Key');
+
+        if (!$appKey) {
+            throw new BadRequestException('api.invalid_app_key');
+        }
+
+        return $appKey;
+    }
+
+    protected function checkPlatform()
+    {
+        $platform = $this->request->getHeader('X-Platform');
+
+        if (!array_key_exists($platform, AppModel::types())) {
+            throw new BadRequestException('api.invalid_platform');
+        }
+
+        return $platform;
+    }
+
+    protected function getRequestUrl()
+    {
+        return sprintf('%s://%s%s',
+            $this->request->getScheme(),
+            $this->request->getHttpHost(),
+            $this->request->getURI()
+        );
+    }
+
+    protected function getApp($appKey)
+    {
+        $cache = new AppCache();
+
+        return $cache->get($appKey);
+    }
+
+    protected function httpGetSignature($url, $params, $appSecret)
+    {
+        ksort($params);
+
+        $query = http_build_query($params);
+
+        return md5($url . $query . $appSecret);
+    }
+
+    protected function httpPostSignature($url, $params, $appSecret)
+    {
+        ksort($params);
+
+        $query = http_build_query($params);
+
+        $body = $this->request->getRawBody();
+
+        return md5($url . $query . $body . $appSecret);
+    }
+
+}
diff --git a/app/Validators/App.php b/app/Validators/App.php
new file mode 100644
index 00000000..105fe914
--- /dev/null
+++ b/app/Validators/App.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Validators;
+
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Models\App as AppModel;
+use App\Repos\App as AppRepo;
+
+class App extends Validator
+{
+
+    public function checkApp($id)
+    {
+        $appRepo = new AppRepo();
+
+        $app = $appRepo->findById($id);
+
+        if (!$app) {
+            throw new BadRequestException('app.not_found');
+        }
+
+        return $app;
+    }
+
+    public function checkName($name)
+    {
+        $value = $this->filter->sanitize($name, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 2) {
+            throw new BadRequestException('app.name_too_short');
+        }
+
+        if ($length > 50) {
+            throw new BadRequestException('app.name_too_long');
+        }
+
+        return $value;
+    }
+
+    public function checkType($type)
+    {
+        if (!array_key_exists($type, AppModel::types())) {
+            throw new BadRequestException('app.invalid_type');
+        }
+
+        return $type;
+    }
+
+    public function checkRemark($remark)
+    {
+        $value = $this->filter->sanitize($remark, ['trim', 'striptags']);
+
+        $length = kg_strlen($value);
+
+        if ($length > 255) {
+            throw new BadRequestException('app.remark_too_long');
+        }
+
+        return $value;
+    }
+
+    public function checkPublishStatus($status)
+    {
+        if (!in_array($status, [0, 1])) {
+            throw new BadRequestException('app.invalid_publish_status');
+        }
+
+        return $status;
+    }
+
+}
diff --git a/app/Validators/Client.php b/app/Validators/Client.php
new file mode 100644
index 00000000..b1537609
--- /dev/null
+++ b/app/Validators/Client.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Validators;
+
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Models\Client as ClientModel;
+
+class Client extends Validator
+{
+
+    public function checkH5Platform($platform)
+    {
+        $platform = strtoupper($platform);
+
+        if ($platform == 'H5') {
+            return ClientModel::TYPE_H5;
+        }
+
+        throw new BadRequestException('client.invalid_type');
+    }
+
+    public function checkMpPlatform($platform)
+    {
+        $platform = strtoupper($platform);
+
+        if ($platform == 'MP-WEIXIN') {
+            return ClientModel::TYPE_MP_WEIXIN;
+        } elseif ($platform == 'MP-ALIPAY') {
+            return ClientModel::TYPE_MP_ALIPAY;
+        } else {
+            throw new BadRequestException('client.invalid_type');
+        }
+    }
+
+    public function checkAppPlatform($platform)
+    {
+        $platform = strtoupper($platform);
+
+        if ($platform == 'APP-PLUS') {
+            return ClientModel::TYPE_APP;
+        }
+
+        throw new BadRequestException('client.invalid_type');
+    }
+
+}
diff --git a/app/Validators/Security.php b/app/Validators/Security.php
index 7a061ac5..534dff3d 100644
--- a/app/Validators/Security.php
+++ b/app/Validators/Security.php
@@ -4,6 +4,7 @@ namespace App\Validators;
 
 use App\Exceptions\BadRequest as BadRequestException;
 use App\Exceptions\ServiceUnavailable as ServiceUnavailableException;
+use App\Library\CsrfToken as CsrfTokenService;
 use App\Services\Throttle as ThrottleService;
 
 class Security extends Validator
@@ -13,7 +14,9 @@ class Security extends Validator
     {
         $token = $this->request->getHeader('X-Csrf-Token');
 
-        $result = $this->csrfToken->checkToken($token);
+        $service = new CsrfTokenService();
+
+        $result = $service->checkToken($token);
 
         if (!$result) {
             throw new BadRequestException('security.invalid_csrf_token');
@@ -42,4 +45,15 @@ class Security extends Validator
         }
     }
 
+    public function checkApiSignature()
+    {
+        $validator = new ApiSecurity();
+
+        $result = $validator->check();
+
+        if (!$result) {
+            throw new BadRequestException('security.invalid_api_signature');
+        }
+    }
+
 }
diff --git a/config/config.default.php b/config/config.default.php
index c813a552..1b8d0d39 100644
--- a/config/config.default.php
+++ b/config/config.default.php
@@ -147,6 +147,16 @@ $config['jwt']['lifetime'] = 7 * 86400;
  */
 $config['jwt']['leeway'] = 30;
 
+/**
+ * 允许跨域
+ */
+$config['cors']['enabled'] = true;
+
+/**
+ * 允许跨域域名(字符|数组)
+ */
+$config['cors']['allow_origin'] = '*';
+
 /**
  * 限流开启
  */
diff --git a/public/h5/index.html b/public/h5/index.html
new file mode 100644
index 00000000..0171ffbd
--- /dev/null
+++ b/public/h5/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>H5 Page</title>
+</head>
+<body>
+<h1>Welcome to H5</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/public/static/home/js/order.pay.js b/public/static/home/js/order.pay.js
index 3ec42261..e2eaf894 100644
--- a/public/static/home/js/order.pay.js
+++ b/public/static/home/js/order.pay.js
@@ -28,7 +28,7 @@ layui.use(['jquery', 'layer'], function () {
                 var interval = setInterval(function () {
                     var queryData = {sn: res.sn};
                     $.get(statusUrl, queryData, function (res) {
-                        if ($.inArray(res.status, [2, 3]) > -1) {
+                        if (res.status === 2) {
                             clearInterval(interval);
                             $('#pay-layer').html('<div class="success-tips">支付成功</div>');
                             setTimeout(function () {

From 5877874d64a83ebdabd549c3ce76abc676c271fc Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Tue, 10 Nov 2020 14:33:27 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A9=BA=E7=99=BD=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Home/Views/refund/confirm.volt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Home/Views/refund/confirm.volt b/app/Http/Home/Views/refund/confirm.volt
index ce25af46..c19683f9 100644
--- a/app/Http/Home/Views/refund/confirm.volt
+++ b/app/Http/Home/Views/refund/confirm.volt
@@ -3,7 +3,7 @@
 {% block content %}
 
     {%- macro item_info(confirm) %}
-        {% if confirm.item_type == 'course' %}
+        {% if confirm.item_type == 1 %}
             {% set course = confirm.item_info.course %}
             {% set expiry_flag = course.refund_expiry_time < time() ? '（已过期）' : '' %}
             <div class="order-item">
@@ -11,7 +11,7 @@
                 <p>退款期限：<span>{{ date('Y-m-d H:i:s',course.refund_expiry_time) }} {{ expiry_flag }}</span></p>
                 <p>退款金额：<span class="price">{{ '￥%0.2f'|format(course.refund_amount) }}</span>退款比例：<span class="price">{{ 100 * course.refund_percent }}%</span></p>
             </div>
-        {% elseif confirm.item_type == 'package' %}
+        {% elseif confirm.item_type == 2 %}
             {% set courses = confirm.item_info.courses %}
             {% for course in courses %}
                 {% set expiry_flag = course.refund_expiry_time < time() ? '（已过期）' : '' %}
@@ -45,7 +45,6 @@
                     <textarea class="layui-textarea" name="apply_note" lay-verify="required"></textarea>
                 </div>
             </div>
-            <br>
             <div class="layui-form-item center">
                 <button class="layui-btn" lay-submit="true" lay-filter="go">申请退款</button>
                 <input type="hidden" name="order_sn" value="{{ order.sn }}">
@@ -63,6 +62,7 @@
         layui.use(['jquery', 'layer'], function () {
             var index = parent.layer.getFrameIndex(window.name);
             parent.layer.title('申请退款', index);
+            parent.layer.iframeAuto(index);
         });
     </script>
 

From 7453a1448ad454c91e08e614274dd09bad0a4d29 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Tue, 10 Nov 2020 14:33:27 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A9=BA=E7=99=BD=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Home/Controllers/OrderController.php  | 2 +-
 app/Http/Home/Controllers/RefundController.php | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/Http/Home/Controllers/OrderController.php b/app/Http/Home/Controllers/OrderController.php
index 2fe33eff..acf797a8 100644
--- a/app/Http/Home/Controllers/OrderController.php
+++ b/app/Http/Home/Controllers/OrderController.php
@@ -87,7 +87,7 @@ class OrderController extends Controller
         $order = $service->handle($sn);
 
         if ($order['status'] != OrderModel::STATUS_PENDING) {
-            $this->response->redirect(['for' => 'home.my.orders']);
+            $this->response->redirect(['for' => 'home.uc.orders']);
         }
 
         $this->view->setVar('order', $order);
diff --git a/app/Http/Home/Controllers/RefundController.php b/app/Http/Home/Controllers/RefundController.php
index b55bd061..767050d1 100644
--- a/app/Http/Home/Controllers/RefundController.php
+++ b/app/Http/Home/Controllers/RefundController.php
@@ -44,10 +44,8 @@ class RefundController extends Controller
 
         $service->handle();
 
-        $location = $this->url->get(['for' => 'home.my.refunds']);
-
         $content = [
-            'location' => $location,
+            'location' => $this->url->get(['for' => 'home.uc.refunds']),
             'msg' => '申请退款成功',
         ];
 
@@ -80,10 +78,8 @@ class RefundController extends Controller
 
         $service->handle($sn);
 
-        $location = $this->url->get(['for' => 'home.my.refunds']);
-
         $content = [
-            'location' => $location,
+            'location' => $this->url->get(['for' => 'home.uc.refunds']),
             'msg' => '取消退款成功',
         ];
 

From f4dda5a58cb4760ad1ef33820027f856460ebe14 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Tue, 10 Nov 2020 14:33:27 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A9=BA=E7=99=BD=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E9=80=80=E6=AC=BE=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Home/Controllers/RefundController.php | 14 ++------------
 app/Http/Home/Views/refund/info.volt           | 10 ++++++----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/Http/Home/Controllers/RefundController.php b/app/Http/Home/Controllers/RefundController.php
index 767050d1..1aaf813a 100644
--- a/app/Http/Home/Controllers/RefundController.php
+++ b/app/Http/Home/Controllers/RefundController.php
@@ -44,12 +44,7 @@ class RefundController extends Controller
 
         $service->handle();
 
-        $content = [
-            'location' => $this->url->get(['for' => 'home.uc.refunds']),
-            'msg' => '申请退款成功',
-        ];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '申请退款成功']);
     }
 
     /**
@@ -78,12 +73,7 @@ class RefundController extends Controller
 
         $service->handle($sn);
 
-        $content = [
-            'location' => $this->url->get(['for' => 'home.uc.refunds']),
-            'msg' => '取消退款成功',
-        ];
-
-        return $this->jsonSuccess($content);
+        return $this->jsonSuccess(['msg' => '取消退款成功']);
     }
 
 }
diff --git a/app/Http/Home/Views/refund/info.volt b/app/Http/Home/Views/refund/info.volt
index 31ae9047..d2365231 100644
--- a/app/Http/Home/Views/refund/info.volt
+++ b/app/Http/Home/Views/refund/info.volt
@@ -21,7 +21,7 @@
     </table>
     <br>
     <div class="center">
-        {% if refund.status == 'approved' %}
+        {% if refund.status == 3 %}
             <button class="kg-refund layui-btn" data-sn="{{ refund.sn }}" data-url="{{ cancel_url }}">取消退款</button>
         {% endif %}
     </div>
@@ -40,15 +40,17 @@
             parent.layer.iframeAuto(index);
 
             $('.kg-refund').on('click', function () {
+                var url = $(this).data('url');
+                var data = {sn: $(this).data('sn')};
                 layer.confirm('确定要取消退款吗？', function () {
                     $.ajax({
                         type: 'POST',
-                        url: $(this).data('url'),
-                        data: {sn: $(this).data('sn')},
+                        url: url,
+                        data: data,
                         success: function (res) {
                             layer.msg(res.msg, {icon: 1});
                             setTimeout(function () {
-                                parent.window.location.href = '/my/refunds';
+                                parent.window.location.href = '/uc/refunds';
                             }, 1500);
                         }
                     });

From 3ce6897de1e87cfc5570534696d7fa5c3bb9afa7 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Wed, 11 Nov 2020 20:39:49 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9=E6=92=AD?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/Logic/Chapter/Learning.php      | 4 ++--
 app/Services/Logic/Teacher/CourseList.php    | 2 +-
 app/Services/Sync/Learning.php               | 8 ++++----
 app/Validators/Learning.php                  | 6 +++---
 app/Validators/Refund.php                    | 7 ++++++-
 config/errors.php                            | 2 +-
 public/static/home/js/chapter.live.player.js | 9 ++-------
 public/static/home/js/chapter.vod.player.js  | 6 ++----
 8 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/app/Services/Logic/Chapter/Learning.php b/app/Services/Logic/Chapter/Learning.php
index 7b08b06d..25fb9f09 100644
--- a/app/Services/Logic/Chapter/Learning.php
+++ b/app/Services/Logic/Chapter/Learning.php
@@ -38,13 +38,13 @@ class Learning extends Service
             $data['position'] = $validator->checkPosition($post['position']);
         }
 
-        $interval = $validator->checkInterval($post['interval']);
+        $intervalTime = $validator->checkIntervalTime($post['interval_time']);
 
         $learning = new LearningModel($data);
 
         $sync = new LearningSyncService();
 
-        $sync->addItem($learning, $interval);
+        $sync->addItem($learning, $intervalTime);
     }
 
 }
\ No newline at end of file
diff --git a/app/Services/Logic/Teacher/CourseList.php b/app/Services/Logic/Teacher/CourseList.php
index 80e5c181..76079073 100644
--- a/app/Services/Logic/Teacher/CourseList.php
+++ b/app/Services/Logic/Teacher/CourseList.php
@@ -49,7 +49,7 @@ class CourseList extends Service
 
         $courses = $builder->getCourses($relations);
 
-        $pager->items = $courses;
+        $pager->items = array_values($courses);
 
         return $pager;
     }
diff --git a/app/Services/Sync/Learning.php b/app/Services/Sync/Learning.php
index fb5a3576..fe5ba353 100644
--- a/app/Services/Sync/Learning.php
+++ b/app/Services/Sync/Learning.php
@@ -18,9 +18,9 @@ class Learning extends Service
 
     /**
      * @param LearningModel $learning
-     * @param int $interval
+     * @param int $intervalTime
      */
-    public function addItem(LearningModel $learning, $interval = 10)
+    public function addItem(LearningModel $learning, $intervalTime = 10)
     {
         $cache = $this->getCache();
 
@@ -37,14 +37,14 @@ class Learning extends Service
 
             $learning->client_type = $this->getClientType();
             $learning->client_ip = $this->getClientIp();
-            $learning->duration = $interval;
+            $learning->duration = $intervalTime;
             $learning->active_time = time();
 
             $cache->save($itemKey, $learning, $this->lifetime);
 
         } else {
 
-            $cacheLearning->duration += $interval;
+            $cacheLearning->duration += $intervalTime;
             $cacheLearning->position = $learning->position;
             $cacheLearning->active_time = time();
 
diff --git a/app/Validators/Learning.php b/app/Validators/Learning.php
index 97365394..aa539a1e 100644
--- a/app/Validators/Learning.php
+++ b/app/Validators/Learning.php
@@ -26,9 +26,9 @@ class Learning extends Validator
         return $requestId;
     }
 
-    public function checkInterval($interval)
+    public function checkIntervalTime($intervalTime)
     {
-        $value = $this->filter->sanitize($interval, ['trim', 'int']);
+        $value = $this->filter->sanitize($intervalTime, ['trim', 'int']);
 
         /**
          * 兼容秒和毫秒
@@ -38,7 +38,7 @@ class Learning extends Validator
         }
 
         if ($value < 5) {
-            throw new BadRequestException('learning.invalid_interval');
+            throw new BadRequestException('learning.invalid_interval_time');
         }
 
         return $value;
diff --git a/app/Validators/Refund.php b/app/Validators/Refund.php
index 70cf91b5..1b309b91 100644
--- a/app/Validators/Refund.php
+++ b/app/Validators/Refund.php
@@ -108,7 +108,12 @@ class Refund extends Validator
 
     public function checkIfAllowCancel(RefundModel $refund)
     {
-        if ($refund->status != RefundModel::STATUS_PENDING) {
+        $scopes = [
+            RefundModel::STATUS_PENDING,
+            RefundModel::STATUS_APPROVED,
+        ];
+
+        if (!in_array($refund->status, $scopes)) {
             throw new BadRequestException('refund.cancel_not_allowed');
         }
     }
diff --git a/config/errors.php b/config/errors.php
index 94e90723..4ccb1907 100644
--- a/config/errors.php
+++ b/config/errors.php
@@ -321,8 +321,8 @@ $error['course_query.invalid_sort'] = '无效的排序类别';
  */
 $error['learning.invalid_plan_id'] = '无效的计划编号';
 $error['learning.invalid_request_id'] = '无效的请求编号';
+$error['learning.invalid_interval_time'] = '无效的间隔时间';
 $error['learning.invalid_position'] = '无效的播放位置';
-$error['learning.invalid_interval'] = '无效的间隔时间';
 
 /**
  * 即时通讯
diff --git a/public/static/home/js/chapter.live.player.js b/public/static/home/js/chapter.live.player.js
index 87c2bb84..915c50fa 100644
--- a/public/static/home/js/chapter.live.player.js
+++ b/public/static/home/js/chapter.live.player.js
@@ -6,7 +6,6 @@ layui.use(['jquery', 'helper'], function () {
     var interval = null;
     var intervalTime = 15000;
     var userId = window.user.id;
-    var chapterId = $('input[name="chapter.id"]').val();
     var planId = $('input[name="chapter.plan_id"]').val();
     var learningUrl = $('input[name="chapter.learning_url"]').val();
     var playUrls = JSON.parse($('input[name="chapter.play_urls"]').val());
@@ -17,7 +16,7 @@ layui.use(['jquery', 'helper'], function () {
         autoplay: true,
         h5_flv: true,
         width: 760,
-        height: 428
+        height: 428,
     };
 
     var formats = ['rtmp', 'flv', 'm3u8'];
@@ -32,14 +31,12 @@ layui.use(['jquery', 'helper'], function () {
         });
     });
 
-    console.log(options);
-
     options.listener = function (msg) {
         if (msg.type === 'play') {
             start();
         } else if (msg.type === 'pause') {
             stop();
-        } else if (msg.type === 'end') {
+        } else if (msg.type === 'ended') {
             stop();
         }
     };
@@ -68,10 +65,8 @@ layui.use(['jquery', 'helper'], function () {
                 url: learningUrl,
                 data: {
                     plan_id: planId,
-                    chapter_id: chapterId,
                     request_id: requestId,
                     interval: intervalTime,
-                    position: player.currentTime(),
                 }
             });
         }
diff --git a/public/static/home/js/chapter.vod.player.js b/public/static/home/js/chapter.vod.player.js
index 03dadd7a..628b9067 100644
--- a/public/static/home/js/chapter.vod.player.js
+++ b/public/static/home/js/chapter.vod.player.js
@@ -7,7 +7,6 @@ layui.use(['jquery', 'helper'], function () {
     var intervalTime = 15000;
     var userId = window.user.id;
     var requestId = helper.getRequestId();
-    var chapterId = $('input[name="chapter.id"]').val();
     var planId = $('input[name="chapter.plan_id"]').val();
     var lastPosition = $('input[name="chapter.position"]').val();
     var learningUrl = $('input[name="chapter.learning_url"]').val();
@@ -16,7 +15,7 @@ layui.use(['jquery', 'helper'], function () {
     var options = {
         autoplay: false,
         width: 760,
-        height: 428
+        height: 428,
     };
 
     if (playUrls.hasOwnProperty('od')) {
@@ -84,10 +83,9 @@ layui.use(['jquery', 'helper'], function () {
                 url: learningUrl,
                 data: {
                     plan_id: planId,
-                    chapter_id: chapterId,
                     request_id: requestId,
                     interval: intervalTime,
-                    position: player.currentTime()
+                    position: player.currentTime(),
                 }
             });
         }

From a59ab3c6d8934e0ad6442f6a3811e1ff633e0bc1 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Thu, 12 Nov 2020 20:50:01 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9=E6=92=AD?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/home/js/chapter.live.player.js | 2 +-
 public/static/home/js/chapter.read.js        | 6 ++----
 public/static/home/js/chapter.vod.player.js  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/static/home/js/chapter.live.player.js b/public/static/home/js/chapter.live.player.js
index 915c50fa..bcebb321 100644
--- a/public/static/home/js/chapter.live.player.js
+++ b/public/static/home/js/chapter.live.player.js
@@ -66,7 +66,7 @@ layui.use(['jquery', 'helper'], function () {
                 data: {
                     plan_id: planId,
                     request_id: requestId,
-                    interval: intervalTime,
+                    interval_time: intervalTime,
                 }
             });
         }
diff --git a/public/static/home/js/chapter.read.js b/public/static/home/js/chapter.read.js
index df0769de..dee01578 100644
--- a/public/static/home/js/chapter.read.js
+++ b/public/static/home/js/chapter.read.js
@@ -6,7 +6,6 @@ layui.use(['jquery', 'helper'], function () {
     var interval = null;
     var intervalTime = 15000;
     var userId = window.user.id;
-    var chapterId = $('input[name="chapter.id"]').val();
     var planId = $('input[name="chapter.plan_id"]').val();
     var learningUrl = $('input[name="chapter.learning_url"]').val();
     var requestId = helper.getRequestId();
@@ -40,10 +39,9 @@ layui.use(['jquery', 'helper'], function () {
             type: 'POST',
             url: learningUrl,
             data: {
-                request_id: requestId,
-                chapter_id: chapterId,
                 plan_id: planId,
-                interval: intervalTime,
+                request_id: requestId,
+                interval_time: intervalTime,
             }
         });
     }
diff --git a/public/static/home/js/chapter.vod.player.js b/public/static/home/js/chapter.vod.player.js
index 628b9067..a379d65f 100644
--- a/public/static/home/js/chapter.vod.player.js
+++ b/public/static/home/js/chapter.vod.player.js
@@ -84,7 +84,7 @@ layui.use(['jquery', 'helper'], function () {
                 data: {
                     plan_id: planId,
                     request_id: requestId,
-                    interval: intervalTime,
+                    interval_time: intervalTime,
                     position: player.currentTime(),
                 }
             });

From 10c43d0ab3a908c6ccb41430dc7d7f6ff855c035 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Sun, 15 Nov 2020 18:26:35 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 app/Builders/LiveList.php                     | 70 +++++++++++++++++++
 ...rLiveController.php => LiveController.php} | 27 +++++--
 app/Http/Api/Controllers/PublicController.php | 22 ++++++
 app/Http/Home/Controllers/IndexController.php |  2 +
 ...rLiveController.php => LiveController.php} | 14 ++--
 app/Repos/ChapterLive.php                     | 57 +++++++++++++++
 app/Services/Logic/Course/CourseList.php      |  1 -
 .../Logic/Live/LiveChapter.php}               |  6 +-
 app/Services/Logic/Live/LiveList.php          | 64 +++++++++++++++++
 public/h5/index.html                          | 10 ---
 11 files changed, 247 insertions(+), 27 deletions(-)
 create mode 100644 app/Builders/LiveList.php
 rename app/Http/Api/Controllers/{ChapterLiveController.php => LiveController.php} (66%)
 rename app/Http/Home/Controllers/{ChapterLiveController.php => LiveController.php} (79%)
 create mode 100644 app/Repos/ChapterLive.php
 rename app/{Http/Home/Services/ChapterLive.php => Services/Logic/Live/LiveChapter.php} (96%)
 create mode 100644 app/Services/Logic/Live/LiveList.php
 delete mode 100644 public/h5/index.html

diff --git a/.gitignore b/.gitignore
index 0da71a39..aff1e894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@
 /db/migrations/schema.php
 /public/robots.txt
 /public/sitemap.xml
+/public/h5
 *KgTest*
diff --git a/app/Builders/LiveList.php b/app/Builders/LiveList.php
new file mode 100644
index 00000000..e010b6eb
--- /dev/null
+++ b/app/Builders/LiveList.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Builders;
+
+use App\Repos\Chapter as ChapterRepo;
+use App\Repos\Course as CourseRepo;
+
+class LiveList extends Builder
+{
+
+    public function handleCourses(array $lives)
+    {
+        $courses = $this->getCourses($lives);
+
+        foreach ($lives as $key => $live) {
+            $lives[$key]['course'] = $courses[$live['course_id']] ?? new \stdClass();
+        }
+
+        return $lives;
+    }
+
+    public function handleChapters(array $lives)
+    {
+        $chapters = $this->getChapters($lives);
+
+        foreach ($lives as $key => $live) {
+            $lives[$key]['chapter'] = $chapters[$live['chapter_id']] ?? new \stdClass();
+        }
+
+        return $lives;
+    }
+
+    public function getCourses(array $lives)
+    {
+        $ids = kg_array_column($lives, 'course_id');
+
+        $courseRepo = new CourseRepo();
+
+        $courses = $courseRepo->findByIds($ids, ['id', 'title', 'cover']);
+
+        $baseUrl = kg_cos_url();
+
+        $result = [];
+
+        foreach ($courses->toArray() as $course) {
+            $course['cover'] = $baseUrl . $course['cover'];
+            $result[$course['id']] = $course;
+        }
+
+        return $result;
+    }
+
+    public function getChapters(array $lives)
+    {
+        $ids = kg_array_column($lives, 'chapter_id');
+
+        $chapterRepo = new ChapterRepo();
+
+        $chapters = $chapterRepo->findByIds($ids, ['id', 'title']);
+
+        $result = [];
+
+        foreach ($chapters->toArray() as $chapter) {
+            $result[$chapter['id']] = $chapter;
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/Http/Api/Controllers/ChapterLiveController.php b/app/Http/Api/Controllers/LiveController.php
similarity index 66%
rename from app/Http/Api/Controllers/ChapterLiveController.php
rename to app/Http/Api/Controllers/LiveController.php
index e54c9ad2..520fb26b 100644
--- a/app/Http/Api/Controllers/ChapterLiveController.php
+++ b/app/Http/Api/Controllers/LiveController.php
@@ -2,20 +2,33 @@
 
 namespace App\Http\Api\Controllers;
 
-use App\Http\Home\Services\ChapterLive as ChapterLiveService;
+use App\Services\Logic\Live\LiveChapter as LiveChapterService;
+use App\Services\Logic\Live\LiveList as LiveListService;
 
 /**
  * @RoutePrefix("/api/live")
  */
-class ChapterLiveController extends Controller
+class LiveController extends Controller
 {
 
+    /**
+     * @Get("/list", name="api.live.list")
+     */
+    public function listAction()
+    {
+        $service = new LiveListService();
+
+        $pager = $service->handle();
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
     /**
      * @Get("/{id:[0-9]+}/chats", name="api.live.chats")
      */
     public function chatsAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $chats = $service->getRecentChats($id);
 
@@ -27,7 +40,7 @@ class ChapterLiveController extends Controller
      */
     public function statsAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $stats = $service->getStats($id);
 
@@ -39,7 +52,7 @@ class ChapterLiveController extends Controller
      */
     public function statusAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $status = $service->getStatus($id);
 
@@ -51,7 +64,7 @@ class ChapterLiveController extends Controller
      */
     public function bindUserAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $service->bindUser($id);
 
@@ -63,7 +76,7 @@ class ChapterLiveController extends Controller
      */
     public function sendMessageAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $message = $service->sendMessage($id);
 
diff --git a/app/Http/Api/Controllers/PublicController.php b/app/Http/Api/Controllers/PublicController.php
index 27d98e64..31cd3577 100644
--- a/app/Http/Api/Controllers/PublicController.php
+++ b/app/Http/Api/Controllers/PublicController.php
@@ -33,6 +33,28 @@ class PublicController extends Controller
         return $this->jsonSuccess(['now' => time()]);
     }
 
+    /**
+     * @Get("/socket/info", name="api.public.socket_info")
+     */
+    public function socketInfoAction()
+    {
+        $service = new AppService();
+
+        $websocket = $service->getConfig()->get('websocket');
+
+        $content = [];
+
+        if ($this->request->isSecure()) {
+            $content['connect_url'] = sprintf('wss://%s/wss', $this->request->getHttpHost());
+        } else {
+            $content['connect_url'] = sprintf('ws://%s', $websocket->connect_address);
+        }
+
+        $content['ping_interval'] = $websocket->ping_interval;
+
+        return $this->jsonSuccess(['socket' => $content]);
+    }
+
     /**
      * @Get("/site/info", name="api.public.site_info")
      */
diff --git a/app/Http/Home/Controllers/IndexController.php b/app/Http/Home/Controllers/IndexController.php
index ea099b71..82430cfd 100644
--- a/app/Http/Home/Controllers/IndexController.php
+++ b/app/Http/Home/Controllers/IndexController.php
@@ -44,6 +44,8 @@ class IndexController extends Controller
     {
         $service = new IndexService();
 
+        dd($service->getLives());
+
         $this->view->pick('index/full');
         $this->view->setVar('lives', $service->getLives());
         $this->view->setVar('slides', $service->getSlides());
diff --git a/app/Http/Home/Controllers/ChapterLiveController.php b/app/Http/Home/Controllers/LiveController.php
similarity index 79%
rename from app/Http/Home/Controllers/ChapterLiveController.php
rename to app/Http/Home/Controllers/LiveController.php
index e68c33d0..b3388255 100644
--- a/app/Http/Home/Controllers/ChapterLiveController.php
+++ b/app/Http/Home/Controllers/LiveController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Home\Controllers;
 
-use App\Http\Home\Services\ChapterLive as ChapterLiveService;
+use App\Services\Logic\Live\LiveChapter as LiveChapterService;
 use Phalcon\Mvc\View;
 
 /**
  * @RoutePrefix("/live")
  */
-class ChapterLiveController extends Controller
+class LiveController extends Controller
 {
 
     /**
@@ -16,7 +16,7 @@ class ChapterLiveController extends Controller
      */
     public function chatsAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $chats = $service->getRecentChats($id);
 
@@ -30,7 +30,7 @@ class ChapterLiveController extends Controller
      */
     public function statsAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $stats = $service->getStats($id);
 
@@ -42,7 +42,7 @@ class ChapterLiveController extends Controller
      */
     public function statusAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $status = $service->getStatus($id);
 
@@ -54,7 +54,7 @@ class ChapterLiveController extends Controller
      */
     public function bindUserAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $service->bindUser($id);
 
@@ -66,7 +66,7 @@ class ChapterLiveController extends Controller
      */
     public function sendMessageAction($id)
     {
-        $service = new ChapterLiveService();
+        $service = new LiveChapterService();
 
         $response = $service->sendMessage($id);
 
diff --git a/app/Repos/ChapterLive.php b/app/Repos/ChapterLive.php
new file mode 100644
index 00000000..6319a384
--- /dev/null
+++ b/app/Repos/ChapterLive.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\Chapter as ChapterModel;
+use App\Models\ChapterLive as ChapterLiveModel;
+
+class ChapterLive extends Repository
+{
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->columns('cl.*');
+
+        $builder->addFrom(ChapterLiveModel::class, 'cl');
+
+        $builder->join(ChapterModel::class, 'cl.chapter_id = c.id', 'c');
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['start_time'])) {
+            $builder->andWhere('cl.start_time > :time:', ['time' => $where['start_time']]);
+        }
+
+        if (!empty($where['end_time'])) {
+            $builder->andWhere('cl.start_time < :time:', ['time' => $where['end_time']]);
+        }
+
+        if (!empty($where['course_id'])) {
+            $builder->andWhere('c.course_id = :course_id:', ['course_id' => $where['course_id']]);
+        }
+
+        if (isset($where['published'])) {
+            $builder->andWhere('c.published = :published:', ['published' => $where['published']]);
+        }
+
+        switch ($sort) {
+            default:
+                $orderBy = 'cl.start_time ASC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+}
diff --git a/app/Services/Logic/Course/CourseList.php b/app/Services/Logic/Course/CourseList.php
index 0f68f8ba..20c8ff53 100644
--- a/app/Services/Logic/Course/CourseList.php
+++ b/app/Services/Logic/Course/CourseList.php
@@ -37,7 +37,6 @@ class CourseList extends Service
         }
 
         $params['published'] = 1;
-        $params['deleted'] = 0;
 
         $sort = $pagerQuery->getSort();
         $page = $pagerQuery->getPage();
diff --git a/app/Http/Home/Services/ChapterLive.php b/app/Services/Logic/Live/LiveChapter.php
similarity index 96%
rename from app/Http/Home/Services/ChapterLive.php
rename to app/Services/Logic/Live/LiveChapter.php
index 82f5b108..be734728 100644
--- a/app/Http/Home/Services/ChapterLive.php
+++ b/app/Services/Logic/Live/LiveChapter.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace App\Http\Home\Services;
+namespace App\Services\Logic\Live;
 
 use App\Services\Logic\ChapterTrait;
+use App\Services\Logic\Service;
 use GatewayClient\Gateway;
 
-class ChapterLive extends Service
+class LiveChapter extends Service
 {
 
     use ChapterTrait;
@@ -105,6 +106,7 @@ class ChapterLive extends Service
         $clientId = Gateway::getClientIdByUid($user->id);
 
         $message = [
+            'id' => kg_uniqid(),
             'type' => 'new_message',
             'user' => [
                 'id' => $user->id,
diff --git a/app/Services/Logic/Live/LiveList.php b/app/Services/Logic/Live/LiveList.php
new file mode 100644
index 00000000..a461a6fa
--- /dev/null
+++ b/app/Services/Logic/Live/LiveList.php
@@ -0,0 +1,64 @@
+<?php
+
+
+namespace App\Services\Logic\Live;
+
+use App\Builders\LiveList as LiveListBuilder;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\ChapterLive as ChapterLiveRepo;
+use App\Services\Logic\Service;
+
+class LiveList extends Service
+{
+
+    public function handle()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $params = [
+            'start_time' => strtotime('today'),
+            'published' => 1,
+        ];
+
+        $chapterLiveRepo = new ChapterLiveRepo();
+
+        $pager = $chapterLiveRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleLives($pager);
+    }
+
+    protected function handleLives($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $builder = new LiveListBuilder();
+
+        $items = [];
+
+        $lives = $pager->items->toArray();
+
+        $courses = $builder->getCourses($lives);
+        $chapters = $builder->getChapters($lives);
+
+        foreach ($lives as $live) {
+            $items[] = [
+                'course' => $courses[$live['course_id']] ?? new \stdClass(),
+                'chapter' => $chapters[$live['chapter_id']] ?? new \stdClass(),
+                'status' => $live['status'],
+                'start_time' => $live['start_time'],
+                'end_time' => $live['end_time'],
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
\ No newline at end of file
diff --git a/public/h5/index.html b/public/h5/index.html
deleted file mode 100644
index 0171ffbd..00000000
--- a/public/h5/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>H5 Page</title>
-</head>
-<body>
-<h1>Welcome to H5</h1>
-</body>
-</html>
\ No newline at end of file

From 70886569d1e22f657eba52829565d0f09a6f2723 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Thu, 19 Nov 2020 21:26:01 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/Controllers/ChapterController.php     | 13 +++++
 app/Http/Api/Controllers/SearchController.php |  2 +-
 .../Home/Controllers/SearchController.php     |  2 +-
 app/Http/Home/Views/course/show_catalog.volt  |  1 -
 app/Repos/Consult.php                         |  8 +++
 app/Services/Logic/Chapter/BasicInfo.php      |  3 +
 app/Services/Logic/Chapter/ConsultList.php    | 36 ++++++++++++
 app/Services/Logic/Consult/ConsultList.php    | 56 +++++++++++++++++++
 app/Services/Logic/Search/Group.php           |  1 +
 app/Services/Logic/Teacher/TeacherList.php    |  6 +-
 config/xs.group.default.ini                   |  3 +
 11 files changed, 126 insertions(+), 5 deletions(-)
 create mode 100644 app/Services/Logic/Chapter/ConsultList.php
 create mode 100644 app/Services/Logic/Consult/ConsultList.php

diff --git a/app/Http/Api/Controllers/ChapterController.php b/app/Http/Api/Controllers/ChapterController.php
index 3e0a75eb..1897b9d1 100644
--- a/app/Http/Api/Controllers/ChapterController.php
+++ b/app/Http/Api/Controllers/ChapterController.php
@@ -4,6 +4,7 @@ namespace App\Http\Api\Controllers;
 
 use App\Services\Logic\Chapter\ChapterInfo as ChapterInfoService;
 use App\Services\Logic\Chapter\ChapterLike as ChapterLikeService;
+use App\Services\Logic\Chapter\ConsultList as ChapterConsultListService;
 use App\Services\Logic\Chapter\Learning as ChapterLearningService;
 use App\Services\Logic\Chapter\ResourceList as ChapterResourceListService;
 
@@ -13,6 +14,18 @@ use App\Services\Logic\Chapter\ResourceList as ChapterResourceListService;
 class ChapterController extends Controller
 {
 
+    /**
+     * @Get("/{id:[0-9]+}/consults", name="api.chapter.consults")
+     */
+    public function consultsAction($id)
+    {
+        $service = new ChapterConsultListService();
+
+        $pager = $service->handle($id);
+
+        return $this->jsonSuccess(['pager' => $pager]);
+    }
+
     /**
      * @Get("/{id:[0-9]+}/resources", name="api.chapter.resourses")
      */
diff --git a/app/Http/Api/Controllers/SearchController.php b/app/Http/Api/Controllers/SearchController.php
index e2a8dd32..3f25c42a 100644
--- a/app/Http/Api/Controllers/SearchController.php
+++ b/app/Http/Api/Controllers/SearchController.php
@@ -45,7 +45,7 @@ class SearchController extends Controller
     {
         switch ($type) {
             case 'group':
-                $service = new GroupSearchService;
+                $service = new GroupSearchService();
                 break;
             case 'user':
                 $service = new UserSearchService();
diff --git a/app/Http/Home/Controllers/SearchController.php b/app/Http/Home/Controllers/SearchController.php
index e722a23e..279300c3 100644
--- a/app/Http/Home/Controllers/SearchController.php
+++ b/app/Http/Home/Controllers/SearchController.php
@@ -47,7 +47,7 @@ class SearchController extends Controller
     {
         switch ($type) {
             case 'group':
-                $service = new GroupSearchService;
+                $service = new GroupSearchService();
                 break;
             case 'user':
                 $service = new UserSearchService();
diff --git a/app/Http/Home/Views/course/show_catalog.volt b/app/Http/Home/Views/course/show_catalog.volt
index 60500c47..445f8feb 100644
--- a/app/Http/Home/Views/course/show_catalog.volt
+++ b/app/Http/Home/Views/course/show_catalog.volt
@@ -17,7 +17,6 @@
 {%- macro live_lesson_info(lesson) %}
     {% set url = lesson.me.owned ? url({'for':'home.chapter.show','id':lesson.id}) : '' %}
     {% set priv = lesson.me.owned ? 'allow' : 'deny' %}
-    {% set over_flag = lesson.attrs.end_time < time() ? '已结束' : '' %}
     <a class="{{ priv }} view-lesson" href="javascript:" data-url="{{ url }}">
         <i class="layui-icon layui-icon-video"></i>
         <span class="title">{{ lesson.title }}</span>
diff --git a/app/Repos/Consult.php b/app/Repos/Consult.php
index a62a1a23..78f97eec 100644
--- a/app/Repos/Consult.php
+++ b/app/Repos/Consult.php
@@ -28,10 +28,18 @@ class Consult extends Repository
             $builder->andWhere('course_id = :course_id:', ['course_id' => $where['course_id']]);
         }
 
+        if (!empty($where['chapter_id'])) {
+            $builder->andWhere('chapter_id = :chapter_id:', ['chapter_id' => $where['chapter_id']]);
+        }
+
         if (!empty($where['owner_id'])) {
             $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]);
         }
 
+        if (!empty($where['replied'])) {
+            $builder->andWhere('reply_time > 0');
+        }
+
         if (isset($where['private'])) {
             $builder->andWhere('private = :private:', ['private' => $where['private']]);
         }
diff --git a/app/Services/Logic/Chapter/BasicInfo.php b/app/Services/Logic/Chapter/BasicInfo.php
index 50e7b66a..65e88b25 100644
--- a/app/Services/Logic/Chapter/BasicInfo.php
+++ b/app/Services/Logic/Chapter/BasicInfo.php
@@ -72,6 +72,7 @@ class BasicInfo extends Service
             'model' => $chapter->model,
             'play_urls' => $playUrls,
             'resource_count' => $chapter->resource_count,
+            'consult_count' => $chapter->consult_count,
             'user_count' => $chapter->user_count,
             'like_count' => $chapter->like_count,
         ];
@@ -99,6 +100,7 @@ class BasicInfo extends Service
             'end_time' => $live->end_time,
             'status' => $live->status,
             'resource_count' => $chapter->resource_count,
+            'consult_count' => $chapter->consult_count,
             'user_count' => $chapter->user_count,
             'like_count' => $chapter->like_count,
         ];
@@ -117,6 +119,7 @@ class BasicInfo extends Service
             'model' => $chapter->model,
             'content' => $read->content,
             'resource_count' => $chapter->resource_count,
+            'consult_count' => $chapter->consult_count,
             'user_count' => $chapter->user_count,
             'like_count' => $chapter->like_count,
         ];
diff --git a/app/Services/Logic/Chapter/ConsultList.php b/app/Services/Logic/Chapter/ConsultList.php
new file mode 100644
index 00000000..d014298a
--- /dev/null
+++ b/app/Services/Logic/Chapter/ConsultList.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Services\Logic\Chapter;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Services\Logic\ChapterTrait;
+use App\Services\Logic\Consult\ConsultList as ConsultListHandler;
+use App\Services\Logic\Service;
+
+class ConsultList extends Service
+{
+
+    use ChapterTrait;
+
+    public function handle($id)
+    {
+        $chapter = $this->checkChapter($id);
+
+        $pagerQuery = new PagerQuery();
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $params = [
+            'chapter_id' => $chapter->id,
+            'private' => 0,
+            'published' => 1,
+        ];
+
+        $service = new ConsultListHandler();
+
+        return $service->paginate($params, $sort, $page, $limit);
+    }
+
+}
diff --git a/app/Services/Logic/Consult/ConsultList.php b/app/Services/Logic/Consult/ConsultList.php
new file mode 100644
index 00000000..44b52f9f
--- /dev/null
+++ b/app/Services/Logic/Consult/ConsultList.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Services\Logic\Consult;
+
+use App\Builders\ConsultList as ConsultListBuilder;
+use App\Repos\Consult as ConsultRepo;
+use App\Services\Logic\Service;
+
+class ConsultList extends Service
+{
+
+    public function paginate($params, $sort, $page, $limit)
+    {
+        $consultRepo = new ConsultRepo();
+
+        $pager = $consultRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleConsults($pager);
+    }
+
+    protected function handleConsults($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $consults = $pager->items->toArray();
+
+        $builder = new ConsultListBuilder();
+
+        $users = $builder->getUsers($consults);
+
+        $items = [];
+
+        foreach ($consults as $consult) {
+
+            $owner = $users[$consult['owner_id']] ?? new \stdClass();
+
+            $items[] = [
+                'id' => $consult['id'],
+                'question' => $consult['question'],
+                'answer' => $consult['answer'],
+                'like_count' => $consult['like_count'],
+                'reply_time' => $consult['reply_time'],
+                'create_time' => $consult['create_time'],
+                'update_time' => $consult['update_time'],
+                'owner' => $owner,
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/Search/Group.php b/app/Services/Logic/Search/Group.php
index bf2d43c0..bd956015 100644
--- a/app/Services/Logic/Search/Group.php
+++ b/app/Services/Logic/Search/Group.php
@@ -67,6 +67,7 @@ class Group extends Handler
                 'avatar' => $item['avatar'],
                 'about' => $item['about'],
                 'user_count' => (int)$item['user_count'],
+                'msg_count' => (int)$item['msg_count'],
                 'owner' => json_decode($item['owner'], true),
             ];
         }
diff --git a/app/Services/Logic/Teacher/TeacherList.php b/app/Services/Logic/Teacher/TeacherList.php
index 4155b1d9..e20b4b48 100644
--- a/app/Services/Logic/Teacher/TeacherList.php
+++ b/app/Services/Logic/Teacher/TeacherList.php
@@ -3,7 +3,7 @@
 namespace App\Services\Logic\Teacher;
 
 use App\Library\Paginator\Query as PagerQuery;
-use App\Models\User;
+use App\Models\User as UserModel;
 use App\Repos\User as UserRepo;
 use App\Services\Logic\Service;
 
@@ -16,7 +16,7 @@ class TeacherList extends Service
 
         $params = $pagerQuery->getParams();
 
-        $params['edu_role'] = User::EDU_ROLE_TEACHER;
+        $params['edu_role'] = UserModel::EDU_ROLE_TEACHER;
         $params['deleted'] = 0;
 
         $sort = $pagerQuery->getSort();
@@ -52,6 +52,8 @@ class TeacherList extends Service
                 'avatar' => $user['avatar'],
                 'title' => $user['title'],
                 'about' => $user['about'],
+                'gender' => $user['gender'],
+                'area' => $user['area'],
             ];
         }
 
diff --git a/config/xs.group.default.ini b/config/xs.group.default.ini
index 97b2bf02..8f97485c 100644
--- a/config/xs.group.default.ini
+++ b/config/xs.group.default.ini
@@ -26,3 +26,6 @@ type = string
 
 [user_count]
 type = string
+
+[msg_count]
+type = string
\ No newline at end of file

From 27b3dc193598695adfd99dee97255ad965d1e2a2 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Mon, 23 Nov 2020 21:03:00 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E5=88=A0=E9=99=A4api=E9=AA=8C=E8=AF=81,a?=
 =?UTF-8?q?pp=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Builders/ImGroupUserList.php             |   2 +-
 app/Builders/LiveList.php                    |  26 +++-
 app/Http/Admin/Controllers/AppController.php | 127 -----------------
 app/Http/Admin/Services/App.php              | 135 ------------------
 app/Http/Admin/Services/AuthNode.php         |  31 -----
 app/Http/Admin/Views/app/add.volt            |  41 ------
 app/Http/Admin/Views/app/edit.volt           |  49 -------
 app/Http/Admin/Views/app/list.volt           |  83 -----------
 app/Http/Api/Controllers/Controller.php      |   9 +-
 app/Http/Api/Controllers/HelpController.php  |   2 +-
 app/Http/Api/Controllers/PageController.php  |   2 +-
 app/Http/Home/Views/macros/order.volt        |  30 ++--
 app/Library/AppInfo.php                      |   2 +-
 app/Models/App.php                           | 136 -------------------
 app/Models/AppVersion.php                    | 126 -----------------
 app/Repos/App.php                            |  78 -----------
 app/Repos/Consult.php                        |   8 +-
 app/Services/Logic/Consult/ConsultCreate.php |  66 ++++++++-
 app/Services/Logic/Live/LiveChapter.php      |   5 +-
 app/Services/Logic/Search/Course.php         |  10 +-
 app/Services/Logic/Search/Group.php          |   8 +-
 app/Services/Logic/Search/User.php           |  10 +-
 app/Validators/ApiSecurity.php               | 133 ------------------
 app/Validators/App.php                       |  73 ----------
 app/Validators/Consult.php                   |   4 +-
 app/Validators/Live.php                      |  27 ++++
 app/Validators/Security.php                  |  11 --
 config/config.default.php                    |  10 ++
 28 files changed, 164 insertions(+), 1080 deletions(-)
 delete mode 100644 app/Http/Admin/Controllers/AppController.php
 delete mode 100644 app/Http/Admin/Services/App.php
 delete mode 100644 app/Http/Admin/Views/app/add.volt
 delete mode 100644 app/Http/Admin/Views/app/edit.volt
 delete mode 100644 app/Http/Admin/Views/app/list.volt
 delete mode 100644 app/Models/App.php
 delete mode 100644 app/Models/AppVersion.php
 delete mode 100644 app/Repos/App.php
 delete mode 100644 app/Validators/ApiSecurity.php
 delete mode 100644 app/Validators/App.php
 create mode 100644 app/Validators/Live.php

diff --git a/app/Builders/ImGroupUserList.php b/app/Builders/ImGroupUserList.php
index 917eecd6..467db5a6 100644
--- a/app/Builders/ImGroupUserList.php
+++ b/app/Builders/ImGroupUserList.php
@@ -36,7 +36,7 @@ class ImGroupUserList extends Builder
 
         $userRepo = new UserRepo();
 
-        $columns = ['id', 'name', 'avatar', 'title', 'about', 'vip'];
+        $columns = ['id', 'name', 'avatar', 'title', 'about', 'vip', 'gender', 'area'];
 
         $users = $userRepo->findByIds($ids, $columns);
 
diff --git a/app/Builders/LiveList.php b/app/Builders/LiveList.php
index e010b6eb..a331653e 100644
--- a/app/Builders/LiveList.php
+++ b/app/Builders/LiveList.php
@@ -4,6 +4,7 @@ namespace App\Builders;
 
 use App\Repos\Chapter as ChapterRepo;
 use App\Repos\Course as CourseRepo;
+use App\Repos\User as UserRepo;
 
 class LiveList extends Builder
 {
@@ -32,19 +33,38 @@ class LiveList extends Builder
 
     public function getCourses(array $lives)
     {
-        $ids = kg_array_column($lives, 'course_id');
+        $courseIds = kg_array_column($lives, 'course_id');
 
         $courseRepo = new CourseRepo();
 
-        $courses = $courseRepo->findByIds($ids, ['id', 'title', 'cover']);
+        $courses = $courseRepo->findByIds($courseIds, ['id', 'title', 'cover', 'teacher_id']);
+
+        $teacherIds = kg_array_column($courses->toArray(), 'teacher_id');
+
+        $userRepo = new UserRepo();
+
+        $users = $userRepo->findByIds($teacherIds, ['id', 'name', 'title', 'avatar', 'about']);
 
         $baseUrl = kg_cos_url();
 
+        $teachers = [];
+
+        foreach ($users->toArray() as $user) {
+            $user['avatar'] = $baseUrl . $user['avatar'];
+            $teachers[$user['id']] = $user;
+        }
+
         $result = [];
 
         foreach ($courses->toArray() as $course) {
             $course['cover'] = $baseUrl . $course['cover'];
-            $result[$course['id']] = $course;
+            $course['teacher'] = $teachers[$course['teacher_id']] ?? new \stdClass();
+            $result[$course['id']] = [
+                'id' => $course['id'],
+                'title' => $course['title'],
+                'cover' => $course['cover'],
+                'teacher' => $course['teacher'],
+            ];
         }
 
         return $result;
diff --git a/app/Http/Admin/Controllers/AppController.php b/app/Http/Admin/Controllers/AppController.php
deleted file mode 100644
index 5871cb68..00000000
--- a/app/Http/Admin/Controllers/AppController.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace App\Http\Admin\Controllers;
-
-use App\Http\Admin\Services\App as AppService;
-
-/**
- * @RoutePrefix("/admin/app")
- */
-class AppController extends Controller
-{
-
-    /**
-     * @Get("/list", name="admin.app.list")
-     */
-    public function listAction()
-    {
-        $appService = new AppService();
-
-        $pager = $appService->getApps();
-
-        $this->view->setVar('pager', $pager);
-    }
-
-    /**
-     * @Get("/add", name="admin.app.add")
-     */
-    public function addAction()
-    {
-        $appService = new AppService();
-
-        $types = $appService->getAppTypes();
-
-        $this->view->setVar('types', $types);
-    }
-
-    /**
-     * @Post("/create", name="admin.app.create")
-     */
-    public function createAction()
-    {
-        $appService = new AppService();
-
-        $appService->createApp();
-
-        $location = $this->url->get(['for' => 'admin.app.list']);
-
-        $content = [
-            'location' => $location,
-            'msg' => '创建应用成功',
-        ];
-
-        return $this->jsonSuccess($content);
-    }
-
-    /**
-     * @Get("/{id:[0-9]+}/edit", name="admin.app.edit")
-     */
-    public function editAction($id)
-    {
-        $appService = new AppService;
-
-        $app = $appService->getApp($id);
-        $types = $appService->getAppTypes();
-
-        $this->view->setVar('app', $app);
-        $this->view->setVar('types', $types);
-    }
-
-    /**
-     * @Post("/{id:[0-9]+}/update", name="admin.app.update")
-     */
-    public function updateAction($id)
-    {
-        $appService = new AppService();
-
-        $appService->updateApp($id);
-
-        $location = $this->url->get(['for' => 'admin.app.list']);
-
-        $content = [
-            'location' => $location,
-            'msg' => '更新应用成功',
-        ];
-
-        return $this->jsonSuccess($content);
-    }
-
-    /**
-     * @Post("/{id:[0-9]+}/delete", name="admin.app.delete")
-     */
-    public function deleteAction($id)
-    {
-        $appService = new AppService();
-
-        $appService->deleteApp($id);
-
-        $location = $this->request->getHTTPReferer();
-
-        $content = [
-            'location' => $location,
-            'msg' => '删除应用成功',
-        ];
-
-        return $this->jsonSuccess($content);
-    }
-
-    /**
-     * @Post("/{id:[0-9]+}/restore", name="admin.app.restore")
-     */
-    public function restoreAction($id)
-    {
-        $appService = new AppService();
-
-        $appService->restoreApp($id);
-
-        $location = $this->request->getHTTPReferer();
-
-        $content = [
-            'location' => $location,
-            'msg' => '还原应用成功',
-        ];
-
-        return $this->jsonSuccess($content);
-    }
-
-}
diff --git a/app/Http/Admin/Services/App.php b/app/Http/Admin/Services/App.php
deleted file mode 100644
index 100daf8a..00000000
--- a/app/Http/Admin/Services/App.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-namespace App\Http\Admin\Services;
-
-use App\Caches\App as AppCache;
-use App\Library\Paginator\Query as PagerQuery;
-use App\Models\App as AppModel;
-use App\Repos\App as AppRepo;
-use App\Validators\App as AppValidator;
-
-class App extends Service
-{
-
-    public function getApps()
-    {
-        $pagerQuery = new PagerQuery();
-
-        $params = $pagerQuery->getParams();
-
-        $params['deleted'] = $params['deleted'] ?? 0;
-
-        $sort = $pagerQuery->getSort();
-        $page = $pagerQuery->getPage();
-        $limit = $pagerQuery->getLimit();
-
-        $appRepo = new AppRepo();
-
-        return $appRepo->paginate($params, $sort, $page, $limit);
-    }
-
-    public function getApp($id)
-    {
-        return $this->findOrFail($id);
-    }
-
-    public function createApp()
-    {
-        $post = $this->request->getPost();
-
-        $validator = new AppValidator();
-
-        $data = [];
-
-        $data['type'] = $validator->checkType($post['type']);
-        $data['name'] = $validator->checkName($post['name']);
-        $data['remark'] = $validator->checkRemark($post['remark']);
-
-        $page = new AppModel();
-
-        $page->create($data);
-
-        $this->rebuildAppCache($page);
-
-        return $page;
-    }
-
-    public function updateApp($id)
-    {
-        $app = $this->findOrFail($id);
-
-        $post = $this->request->getPost();
-
-        $validator = new AppValidator();
-
-        $data = [];
-
-        if (isset($post['type'])) {
-            $data['type'] = $validator->checkType($post['type']);
-        }
-
-        if (isset($post['name'])) {
-            $data['name'] = $validator->checkName($post['name']);
-        }
-
-        if (isset($post['remark'])) {
-            $data['remark'] = $validator->checkRemark($post['remark']);
-        }
-
-        if (isset($post['published'])) {
-            $data['published'] = $validator->checkPublishStatus($post['published']);
-        }
-
-        $app->update($data);
-
-        $this->rebuildAppCache($app);
-
-        return $app;
-    }
-
-    public function deleteApp($id)
-    {
-        $app = $this->findOrFail($id);
-
-        $app->deleted = 1;
-
-        $app->update();
-
-        $this->rebuildAppCache($app);
-
-        return $app;
-    }
-
-    public function restoreApp($id)
-    {
-        $app = $this->findOrFail($id);
-
-        $app->deleted = 0;
-
-        $app->update();
-
-        $this->rebuildAppCache($app);
-
-        return $app;
-    }
-
-    public function getAppTypes()
-    {
-        return AppModel::types();
-    }
-
-    protected function rebuildAppCache(AppModel $app)
-    {
-        $cache = new AppCache();
-
-        $cache->rebuild($app->key);
-    }
-
-    protected function findOrFail($id)
-    {
-        $validator = new AppValidator();
-
-        return $validator->checkApp($id);
-    }
-
-}
diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php
index 9f321357..43fb64fd 100644
--- a/app/Http/Admin/Services/AuthNode.php
+++ b/app/Http/Admin/Services/AuthNode.php
@@ -746,37 +746,6 @@ class AuthNode extends Service
                         ],
                     ],
                 ],
-                [
-                    'id' => '5-2',
-                    'title' => '应用管理',
-                    'type' => 'menu',
-                    'children' => [
-                        [
-                            'id' => '5-2-1',
-                            'title' => '应用列表',
-                            'type' => 'menu',
-                            'route' => 'admin.app.list',
-                        ],
-                        [
-                            'id' => '5-2-2',
-                            'title' => '添加应用',
-                            'type' => 'menu',
-                            'route' => 'admin.app.add',
-                        ],
-                        [
-                            'id' => '5-2-3',
-                            'title' => '编辑应用',
-                            'type' => 'button',
-                            'route' => 'admin.app.edit',
-                        ],
-                        [
-                            'id' => '5-2-4',
-                            'title' => '删除应用',
-                            'type' => 'button',
-                            'route' => 'admin.app.delete',
-                        ],
-                    ],
-                ],
             ],
         ];
     }
diff --git a/app/Http/Admin/Views/app/add.volt b/app/Http/Admin/Views/app/add.volt
deleted file mode 100644
index 7ff4f88e..00000000
--- a/app/Http/Admin/Views/app/add.volt
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends 'templates/main.volt' %}
-
-{% block content %}
-
-    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.app.create'}) }}">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>添加应用</legend>
-        </fieldset>
-        <div class="layui-form-item">
-            <label class="layui-form-label">类型</label>
-            <div class="layui-input-block">
-                <select name="type" lay-verify="required">
-                    <option value="">选择类型</option>
-                    {% for key,name in types %}
-                        <option value="{{ key }}">{{ name }}</option>
-                    {% endfor %}
-                </select>
-            </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="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="remark">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"></label>
-            <div class="layui-input-block">
-                <button class="kg-submit layui-btn" lay-submit="true" lay-filter="go">提交</button>
-                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
-            </div>
-        </div>
-    </form>
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/app/edit.volt b/app/Http/Admin/Views/app/edit.volt
deleted file mode 100644
index 921acd3e..00000000
--- a/app/Http/Admin/Views/app/edit.volt
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends 'templates/main.volt' %}
-
-{% block content %}
-
-    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.app.update','id':app.id}) }}">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>编辑应用</legend>
-        </fieldset>
-        <div class="layui-form-item">
-            <label class="layui-form-label">类型</label>
-            <div class="layui-input-block">
-                <select name="type" lay-verify="required">
-                    <option value="">选择类型</option>
-                    {% for key,name in types %}
-                        {% set selected = key == app.type ? 'selected="selected"' : '' %}
-                        <option value="{{ key }}" {{ selected }}>{{ name }}</option>
-                    {% endfor %}
-                </select>
-            </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="name" value="{{ app.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="remark" value="{{ app.remark }}">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">发布</label>
-            <div class="layui-input-block">
-                <input type="radio" name="published" value="1" title="是" {% if app.published == 1 %}checked="checked"{% endif %}>
-                <input type="radio" name="published" value="0" title="否" {% if app.published == 0 %}checked="checked"{% endif %}>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"></label>
-            <div class="layui-input-block">
-                <button class="kg-submit layui-btn" lay-submit="true" lay-filter="go">提交</button>
-                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
-            </div>
-        </div>
-    </form>
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/app/list.volt b/app/Http/Admin/Views/app/list.volt
deleted file mode 100644
index 3c3a5394..00000000
--- a/app/Http/Admin/Views/app/list.volt
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends 'templates/main.volt' %}
-
-{% block content %}
-
-    {%- macro type_info(value) %}
-        {% if value == 'pc' %}
-            PC客户端
-        {% elseif value == 'h5' %}
-            H5客户端
-        {% elseif value == 'ios' %}
-            IOS客户端
-        {% elseif value == 'android' %}
-            Android客户端
-        {% elseif value == 'mp_weixin' %}
-            微信小程序
-        {% elseif value == 'mp_alipay' %}
-            支付宝小程序
-        {% else %}
-            未知
-        {% endif %}
-    {%- endmacro %}
-
-    <div class="kg-nav">
-        <div class="kg-nav-left">
-            <span class="layui-breadcrumb">
-                <a><cite>应用管理</cite></a>
-            </span>
-        </div>
-    </div>
-
-    <table class="kg-table layui-table layui-form">
-        <colgroup>
-            <col>
-            <col>
-            <col>
-            <col>
-            <col>
-            <col width="10%">
-            <col width="12%">
-        </colgroup>
-        <thead>
-        <tr>
-            <th>编号</th>
-            <th>名称</th>
-            <th>类型</th>
-            <th>Key / Secret</th>
-            <th>创建时间</th>
-            <th>发布</th>
-            <th>操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        {% for item in pager.items %}
-            {% set edit_url = url({'for':'admin.app.edit','id':item.id}) %}
-            {% set update_url = url({'for':'admin.app.update','id':item.id}) %}
-            {% set delete_url = url({'for':'admin.app.delete','id':item.id}) %}
-            {% set restore_url = url({'for':'admin.app.restore','id':item.id}) %}
-            <tr>
-                <td>{{ item.id }}</td>
-                <td><a href="{{ edit_url }}" title="{{ item.remark }}">{{ item.name }}</a></td>
-                <td>{{ type_info(item.type) }}</td>
-                <td>{{ item.key }} / {{ item.secret }}</td>
-                <td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
-                <td class="center"><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">
-                    <div class="layui-dropdown">
-                        <button class="layui-btn layui-btn-sm">操作 <i class="layui-icon layui-icon-triangle-d"></i></button>
-                        <ul>
-                            <li><a href="{{ edit_url }}">编辑</a></li>
-                            {% if item.deleted == 0 %}
-                                <li><a href="javascript:" class="kg-delete" data-url="{{ delete_url }}">删除</a></li>
-                            {% else %}
-                                <li><a href="javascript:" class="kg-restore" data-url="{{ restore_url }}">还原</a></li>
-                            {% endif %}
-                        </ul>
-                    </div>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Api/Controllers/Controller.php b/app/Http/Api/Controllers/Controller.php
index 50a6611d..d33b4eeb 100644
--- a/app/Http/Api/Controllers/Controller.php
+++ b/app/Http/Api/Controllers/Controller.php
@@ -15,19 +15,12 @@ class Controller extends \Phalcon\Mvc\Controller
 
     public function beforeExecuteRoute(Dispatcher $dispatcher)
     {
-        /**
-         * 存在Origin头信息才设置跨域
-         */
         if ($this->request->getHeader('Origin')) {
             $this->setCors();
         }
 
-        /**
-         * Options请求不验证签名和限流
-         */
         if (!$this->request->isOptions()) {
-            //$this->checkApiSignature();
-            //$this->checkRateLimit();
+            $this->checkRateLimit();
         }
 
         return true;
diff --git a/app/Http/Api/Controllers/HelpController.php b/app/Http/Api/Controllers/HelpController.php
index 60879eb3..c64e78da 100644
--- a/app/Http/Api/Controllers/HelpController.php
+++ b/app/Http/Api/Controllers/HelpController.php
@@ -24,7 +24,7 @@ class HelpController extends Controller
     }
 
     /**
-     * @Get("/{id:[0-9]+}", name="api.help.info")
+     * @Get("/{id:[0-9]+}/info", name="api.help.info")
      */
     public function infoAction($id)
     {
diff --git a/app/Http/Api/Controllers/PageController.php b/app/Http/Api/Controllers/PageController.php
index b18e31f6..255e82f4 100644
--- a/app/Http/Api/Controllers/PageController.php
+++ b/app/Http/Api/Controllers/PageController.php
@@ -11,7 +11,7 @@ class PageController extends Controller
 {
 
     /**
-     * @Get("/{id:[0-9]+}", name="api.page.info")
+     * @Get("/{id:[0-9]+}/info", name="api.page.info")
      */
     public function infoAction($id)
     {
diff --git a/app/Http/Home/Views/macros/order.volt b/app/Http/Home/Views/macros/order.volt
index 57dd015f..1f963258 100644
--- a/app/Http/Home/Views/macros/order.volt
+++ b/app/Http/Home/Views/macros/order.volt
@@ -1,12 +1,12 @@
 {%- macro item_info(order) %}
-    {% if order.item_type == '1' %}
+    {% if order.item_type == 1 %}
         {% set course = order.item_info.course %}
         <div class="order-item">
             <p>课程名称：<span>{{ course.title }}</span></p>
             <p>市场价格：<span class="price">{{ '￥%0.2f'|format(course.market_price) }}</span>会员价格：<span class="price">{{ '￥%0.2f'|format(course.vip_price) }}</span></p>
             <p>学习期限：<span>{{ date('Y-m-d',course.study_expiry_time) }}</span>退款期限：<span>{{ date('Y-m-d',course.refund_expiry_time) }}</span></p>
         </div>
-    {% elseif order.item_type == '2' %}
+    {% elseif order.item_type == 2 %}
         {% set courses = order.item_info.courses %}
         {% for course in courses %}
             <div class="order-item">
@@ -15,20 +15,20 @@
                 <p>学习期限：<span>{{ date('Y-m-d',course.study_expiry_time) }}</span>退款期限：<span>{{ date('Y-m-d',course.refund_expiry_time) }}</span></p>
             </div>
         {% endfor %}
-    {% elseif order.item_type == '3' %}
+    {% elseif order.item_type == 3 %}
         {% set course = order.item_info.course %}
         {% set reward = order.item_info.reward %}
         <div class="order-item">
             <p>课程名称：<span>{{ course.title }}</span></p>
             <p>赞赏金额：<span class="price">{{ '￥%0.2f'|format(reward.price) }}</span></p>
         </div>
-    {% elseif order.item_type == '4' %}
+    {% elseif order.item_type == 4 %}
         {% set vip = order.item_info.vip %}
         <div class="order-item">
             <p>商品名称：<span>{{ order.subject }}</span></p>
             <p>商品价格：<span class="price">{{ '￥%0.2f'|format(order.amount) }}</span></p>
         </div>
-    {% elseif order.item_type == '99' %}
+    {% elseif order.item_type == 99 %}
         <div class="order-item">
             <p>商品名称：<span>{{ order.subject }}</span></p>
             <p>商品价格：<span class="price">{{ '￥%0.2f'|format(order.amount) }}</span></p>
@@ -38,30 +38,30 @@
 
 {%- macro status_history(items) %}
     {% for item in items %}
-        {% if item.status == '1' %}
+        {% if item.status == 1 %}
             <p>创建时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-        {% elseif item.status == '2' %}
+        {% elseif item.status == 2 %}
             <p>支付时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-        {% elseif item.status == '3' %}
+        {% elseif item.status == 3 %}
             <p>完成时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-        {% elseif item.status == '4' %}
+        {% elseif item.status == 4 %}
             <p>关闭时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-        {% elseif item.status == '5' %}
+        {% elseif item.status == 5 %}
             <p>退款时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
         {% endif %}
     {% endfor %}
 {%- endmacro %}
 
 {%- macro order_status(value) %}
-    {% if value == '1' %}
+    {% if value == 1 %}
         待支付
-    {% elseif value == '2' %}
+    {% elseif value == 2 %}
         发货中
-    {% elseif value == '3' %}
+    {% elseif value == 3 %}
         已完成
-    {% elseif value == '4' %}
+    {% elseif value == 4 %}
         已关闭
-    {% elseif value == '5' %}
+    {% elseif value == 5 %}
         已退款
     {% endif %}
 {%- endmacro %}
diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php
index d2198fa6..569370b3 100644
--- a/app/Library/AppInfo.php
+++ b/app/Library/AppInfo.php
@@ -11,7 +11,7 @@ class AppInfo
 
     protected $link = 'https://gitee.com/koogua';
 
-    protected $version = '1.1.0';
+    protected $version = '1.2.0';
 
     public function __get($name)
     {
diff --git a/app/Models/App.php b/app/Models/App.php
deleted file mode 100644
index 3dd844c1..00000000
--- a/app/Models/App.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Phalcon\Mvc\Model\Behavior\SoftDelete;
-use Phalcon\Text;
-
-class App extends Model
-{
-
-    /**
-     * 应用类型
-     */
-    const TYPE_PC = 'pc';
-    const TYPE_H5 = 'h5';
-    const TYPE_IOS = 'ios';
-    const TYPE_ANDROID = 'android';
-    const TYPE_MP_WEIXIN = 'mp_weixin';
-    const TYPE_MP_ALIPAY = 'mp_alipay';
-
-    /**
-     * 主键编号
-     *
-     * @var int
-     */
-    public $id;
-
-    /**
-     * 名称
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * key
-     *
-     * @var string
-     */
-    public $key;
-
-    /**
-     * secret
-     *
-     * @var string
-     */
-    public $secret;
-
-    /**
-     * 类型
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * 备注
-     *
-     * @var string
-     */
-    public $remark;
-
-    /**
-     * 发布标识
-     *
-     * @var int
-     */
-    public $published;
-
-    /**
-     * 删除标识
-     *
-     * @var int
-     */
-    public $deleted;
-
-    /**
-     * 创建时间
-     *
-     * @var int
-     */
-    public $create_time;
-
-    /**
-     * 更新时间
-     *
-     * @var int
-     */
-    public $update_time;
-
-    public function getSource(): string
-    {
-        return 'kg_app';
-    }
-
-    public function initialize()
-    {
-        parent::initialize();
-
-        $this->addBehavior(
-            new SoftDelete([
-                'field' => 'deleted',
-                'value' => 1,
-            ])
-        );
-    }
-
-    public function beforeCreate()
-    {
-        $this->key = Text::random(Text::RANDOM_ALNUM, 16);
-        $this->secret = Text::random(Text::RANDOM_ALNUM, 16);
-        $this->create_time = time();
-    }
-
-    public function beforeUpdate()
-    {
-        if ($this->deleted == 1) {
-            $this->published = 0;
-        }
-
-        $this->update_time = time();
-    }
-
-    public static function types()
-    {
-        return [
-            self::TYPE_PC => 'PC客户端',
-            self::TYPE_H5 => 'H5客户端',
-            self::TYPE_IOS => 'IOS客户端',
-            self::TYPE_ANDROID => 'Android客户端',
-            self::TYPE_MP_WEIXIN => '微信小程序',
-            self::TYPE_MP_ALIPAY => '支付宝小程序',
-        ];
-    }
-
-}
diff --git a/app/Models/AppVersion.php b/app/Models/AppVersion.php
deleted file mode 100644
index 5dc49c6a..00000000
--- a/app/Models/AppVersion.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Caches\MaxCategoryId as MaxCategoryIdCache;
-use Phalcon\Mvc\Model\Behavior\SoftDelete;
-
-class AppVersion extends Model
-{
-
-    /**
-     * 平台类型
-     */
-    const PLATFORM_IOS = 1;
-    const PLATFORM_ANDROID = 2;
-
-    /**
-     * 主键编号
-     *
-     * @var int
-     */
-    public $id;
-
-    /**
-     * 平台类型
-     *
-     * @var int
-     */
-    public $platform;
-
-    /**
-     * 版本名（例如：v1.0.0）
-     *
-     * @var string
-     */
-    public $version_name;
-
-    /**
-     * 版本号（例如：100）
-     *
-     * @var string
-     */
-    public $version_code;
-
-    /**
-     * 下载地址
-     *
-     * @var string
-     */
-    public $download_url;
-
-    /**
-     * 发布标识
-     *
-     * @var int
-     */
-    public $published;
-
-    /**
-     * 删除标识
-     *
-     * @var int
-     */
-    public $deleted;
-
-    /**
-     * 创建时间
-     *
-     * @var int
-     */
-    public $create_time;
-
-    /**
-     * 更新时间
-     *
-     * @var int
-     */
-    public $update_time;
-
-    public function getSource(): string
-    {
-        return 'kg_category';
-    }
-
-    public function initialize()
-    {
-        parent::initialize();
-
-        $this->addBehavior(
-            new SoftDelete([
-                'field' => 'deleted',
-                'value' => 1,
-            ])
-        );
-    }
-
-    public function beforeCreate()
-    {
-        $this->create_time = time();
-    }
-
-    public function beforeUpdate()
-    {
-        if ($this->deleted == 1) {
-            $this->published = 0;
-        }
-
-        $this->update_time = time();
-    }
-
-    public function afterCreate()
-    {
-        $cache = new MaxCategoryIdCache();
-
-        $cache->rebuild();
-    }
-
-    public static function types()
-    {
-        return [
-            self::TYPE_COURSE => '课程',
-            self::TYPE_HELP => '帮助',
-        ];
-    }
-
-}
diff --git a/app/Repos/App.php b/app/Repos/App.php
deleted file mode 100644
index 028c280a..00000000
--- a/app/Repos/App.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Repos;
-
-use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
-use App\Models\App as AppModel;
-use Phalcon\Mvc\Model;
-
-class App extends Repository
-{
-
-    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
-    {
-        $builder = $this->modelsManager->createBuilder();
-
-        $builder->from(AppModel::class);
-
-        $builder->where('1 = 1');
-
-        if (!empty($where['id'])) {
-            $builder->andWhere('id = :id:', ['id' => $where['id']]);
-        }
-
-        if (!empty($where['key'])) {
-            $builder->andWhere('key = :key:', ['key' => $where['key']]);
-        }
-
-        if (!empty($where['type'])) {
-            $builder->andWhere('type = :type:', ['type' => $where['type']]);
-        }
-
-        if (!empty($where['published'])) {
-            $builder->andWhere('published = :published:', ['published' => $where['published']]);
-        }
-
-        if (isset($where['deleted'])) {
-            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
-        }
-
-        switch ($sort) {
-            default:
-                $orderBy = 'id DESC';
-                break;
-        }
-
-        $builder->orderBy($orderBy);
-
-        $pager = new PagerQueryBuilder([
-            'builder' => $builder,
-            'page' => $page,
-            'limit' => $limit,
-        ]);
-
-        return $pager->paginate();
-    }
-
-    /**
-     * @param int $id
-     * @return AppModel|Model|bool
-     */
-    public function findById($id)
-    {
-        return AppModel::findFirst($id);
-    }
-
-    /**
-     * @param string $appKey
-     * @return AppModel|Model|bool
-     */
-    public function findByAppKey($appKey)
-    {
-        return AppModel::findFirst([
-            'conditions' => 'key = :key:',
-            'bind' => ['key' => $appKey],
-        ]);
-    }
-
-}
diff --git a/app/Repos/Consult.php b/app/Repos/Consult.php
index 78f97eec..548a6569 100644
--- a/app/Repos/Consult.php
+++ b/app/Repos/Consult.php
@@ -95,15 +95,15 @@ class Consult extends Repository
     }
 
     /**
-     * @param int $chapterId
+     * @param int $courseId
      * @param int $userId
      * @return ConsultModel|Model|bool
      */
-    public function findUserLastChapterConsult($chapterId, $userId)
+    public function findUserLastCourseConsult($courseId, $userId)
     {
         return ConsultModel::findFirst([
-            'conditions' => 'chapter_id = ?1 AND owner_id = ?2 AND deleted = 0',
-            'bind' => [1 => $chapterId, 2 => $userId],
+            'conditions' => 'course_id = ?1 AND owner_id = ?2 AND deleted = 0',
+            'bind' => [1 => $courseId, 2 => $userId],
             'order' => 'id DESC',
         ]);
     }
diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php
index 7d9a4002..fe29e49a 100644
--- a/app/Services/Logic/Consult/ConsultCreate.php
+++ b/app/Services/Logic/Consult/ConsultCreate.php
@@ -20,29 +20,83 @@ class ConsultCreate extends Service
 
     public function handle()
     {
-        $post = $this->request->getPost();
+        $chapterId = $this->request->getPost('chapter_id', 'int', 0);
+        $courseId = $this->request->getPost('course_id', 'int', 0);
 
         $user = $this->getLoginUser();
 
-        $chapter = $this->checkChapter($post['chapter_id']);
-
-        $course = $this->checkCourse($chapter->course_id);
-
         $validator = new UserLimitValidator();
 
         $validator->checkDailyConsultLimit($user);
 
+        $validator = new UserLimitValidator();
+
+        $validator->checkDailyConsultLimit($user);
+
+        if ($chapterId > 0) {
+
+            $chapter = $this->checkChapter($chapterId);
+
+            return $this->handleChapterConsult($chapter, $user);
+
+        } else {
+
+            $course = $this->checkCourse($courseId);
+
+            return $this->handleCourseConsult($course, $user);
+        }
+    }
+
+    protected function handleCourseConsult(CourseModel $course, UserModel $user)
+    {
+        $post = $this->request->getPost();
+
         $validator = new ConsultValidator();
 
         $question = $validator->checkQuestion($post['question']);
+        $private = $validator->checkPrivateStatus($post['private']);
 
-        $validator->checkIfDuplicated($question, $chapter->id, $user->id);
+        $validator->checkIfDuplicated($course->id, $user->id, $question);
 
         $priority = $this->getPriority($course, $user);
 
         $consult = new ConsultModel();
 
         $consult->question = $question;
+        $consult->private = $private;
+        $consult->priority = $priority;
+        $consult->course_id = $course->id;
+        $consult->owner_id = $user->id;
+        $consult->published = 1;
+
+        $consult->create();
+
+        $this->incrCourseConsultCount($course);
+
+        $this->incrUserDailyConsultCount($user);
+
+        return $consult;
+    }
+
+    protected function handleChapterConsult(ChapterModel $chapter, UserModel $user)
+    {
+        $course = $this->checkCourse($chapter->course_id);
+
+        $post = $this->request->getPost();
+
+        $validator = new ConsultValidator();
+
+        $question = $validator->checkQuestion($post['question']);
+        $private = $validator->checkPrivateStatus($post['private']);
+
+        $validator->checkIfDuplicated($course->id, $user->id, $question);
+
+        $priority = $this->getPriority($course, $user);
+
+        $consult = new ConsultModel();
+
+        $consult->question = $question;
+        $consult->private = $private;
         $consult->priority = $priority;
         $consult->course_id = $course->id;
         $consult->chapter_id = $chapter->id;
diff --git a/app/Services/Logic/Live/LiveChapter.php b/app/Services/Logic/Live/LiveChapter.php
index be734728..49a0df55 100644
--- a/app/Services/Logic/Live/LiveChapter.php
+++ b/app/Services/Logic/Live/LiveChapter.php
@@ -4,6 +4,7 @@ namespace App\Services\Logic\Live;
 
 use App\Services\Logic\ChapterTrait;
 use App\Services\Logic\Service;
+use App\Validators\Live as LiveValidator;
 use GatewayClient\Gateway;
 
 class LiveChapter extends Service
@@ -97,7 +98,9 @@ class LiveChapter extends Service
 
         $content = $this->request->getPost('content', ['trim', 'striptags']);
 
-        $content = kg_substr($content, 0, 80);
+        $validator = new LiveValidator();
+
+        $validator->checkMessage($content);
 
         Gateway::$registerAddress = $this->getRegisterAddress();
 
diff --git a/app/Services/Logic/Search/Course.php b/app/Services/Logic/Search/Course.php
index 1b37f80c..0749bf1f 100644
--- a/app/Services/Logic/Search/Course.php
+++ b/app/Services/Logic/Search/Course.php
@@ -62,11 +62,11 @@ class Course extends Handler
 
             $items[] = [
                 'id' => (int)$item['id'],
-                'title' => $item['title'],
-                'cover' => $item['cover'],
-                'summary' => $item['summary'],
-                'model' => $item['model'],
-                'level' => $item['level'],
+                'title' => (string)$item['title'],
+                'cover' => (string)$item['cover'],
+                'summary' => (string)$item['summary'],
+                'model' => (int)$item['model'],
+                'level' => (int)$item['level'],
                 'market_price' => (float)$item['market_price'],
                 'vip_price' => (float)$item['vip_price'],
                 'user_count' => (int)$item['user_count'],
diff --git a/app/Services/Logic/Search/Group.php b/app/Services/Logic/Search/Group.php
index bd956015..003520c3 100644
--- a/app/Services/Logic/Search/Group.php
+++ b/app/Services/Logic/Search/Group.php
@@ -62,10 +62,10 @@ class Group extends Handler
 
             $items[] = [
                 'id' => (int)$item['id'],
-                'type' => $item['type'],
-                'name' => $item['name'],
-                'avatar' => $item['avatar'],
-                'about' => $item['about'],
+                'type' => (int)$item['type'],
+                'name' => (string)$item['name'],
+                'avatar' => (string)$item['avatar'],
+                'about' => (string)$item['about'],
                 'user_count' => (int)$item['user_count'],
                 'msg_count' => (int)$item['msg_count'],
                 'owner' => json_decode($item['owner'], true),
diff --git a/app/Services/Logic/Search/User.php b/app/Services/Logic/Search/User.php
index d08ce6a3..05e7be13 100644
--- a/app/Services/Logic/Search/User.php
+++ b/app/Services/Logic/Search/User.php
@@ -62,13 +62,13 @@ class User extends Handler
 
             $items[] = [
                 'id' => (int)$item['id'],
-                'name' => $item['name'],
-                'avatar' => $item['avatar'],
-                'title' => $item['title'],
-                'about' => $item['about'],
+                'name' => (string)$item['name'],
+                'avatar' => (string)$item['avatar'],
+                'title' => (string)$item['title'],
+                'about' => (string)$item['about'],
                 'vip' => (int)$item['vip'],
                 'gender' => (int)$item['gender'],
-                'area' => $item['area'],
+                'area' => (string)$item['area'],
             ];
         }
 
diff --git a/app/Validators/ApiSecurity.php b/app/Validators/ApiSecurity.php
deleted file mode 100644
index 855354bc..00000000
--- a/app/Validators/ApiSecurity.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace App\Validators;
-
-use App\Caches\App as AppCache;
-use App\Exceptions\BadRequest as BadRequestException;
-use App\Models\App as AppModel;
-
-class ApiSecurity extends Validator
-{
-
-    public function check()
-    {
-        $query = $this->request->getQuery();
-
-        if (isset($query['_url'])) {
-            unset($query['_url']);
-        }
-
-        $extra = [
-            '_timestamp' => $this->checkTimestamp(),
-            '_nonce' => $this->checkNonce(),
-        ];
-
-        $appKey = $this->checkAppKey();
-
-        $app = $this->getApp($appKey);
-
-        if (!$app || $app->published == 0) {
-            throw new BadRequestException('api.invalid_app_key');
-        }
-
-        $url = $this->getRequestUrl();
-
-        if ($this->request->getMethod() == 'POST') {
-            $mySignature = $this->httpPostSignature($url, $extra, $app->secret);
-        } else {
-            $params = array_merge($query, $extra);
-            $mySignature = $this->httpGetSignature($url, $params, $app->secret);
-        }
-
-        $signature = $this->request->getHeader('X-Signature');
-
-        if ($signature != $mySignature) {
-            throw new BadRequestException('api.invalid_signature');
-        }
-
-        return $signature;
-    }
-
-    protected function checkTimestamp()
-    {
-        $timestamp = $this->request->getHeader('X-Timestamp');
-
-        $timestamp = $timestamp > 0 ? $timestamp : 0;
-
-        if (abs(time() - $timestamp) > 300) {
-            throw new BadRequestException('api.invalid_timestamp');
-        }
-
-        return $timestamp;
-    }
-
-    protected function checkNonce()
-    {
-        $nonce = $this->request->getHeader('X-Nonce');
-
-        if (!$nonce) {
-            throw new BadRequestException('api.invalid_nonce');
-        }
-
-        return $nonce;
-    }
-
-    protected function checkAppKey()
-    {
-        $appKey = $this->request->getHeader('X-App-Key');
-
-        if (!$appKey) {
-            throw new BadRequestException('api.invalid_app_key');
-        }
-
-        return $appKey;
-    }
-
-    protected function checkPlatform()
-    {
-        $platform = $this->request->getHeader('X-Platform');
-
-        if (!array_key_exists($platform, AppModel::types())) {
-            throw new BadRequestException('api.invalid_platform');
-        }
-
-        return $platform;
-    }
-
-    protected function getRequestUrl()
-    {
-        return sprintf('%s://%s%s',
-            $this->request->getScheme(),
-            $this->request->getHttpHost(),
-            $this->request->getURI()
-        );
-    }
-
-    protected function getApp($appKey)
-    {
-        $cache = new AppCache();
-
-        return $cache->get($appKey);
-    }
-
-    protected function httpGetSignature($url, $params, $appSecret)
-    {
-        ksort($params);
-
-        $query = http_build_query($params);
-
-        return md5($url . $query . $appSecret);
-    }
-
-    protected function httpPostSignature($url, $params, $appSecret)
-    {
-        ksort($params);
-
-        $query = http_build_query($params);
-
-        $body = $this->request->getRawBody();
-
-        return md5($url . $query . $body . $appSecret);
-    }
-
-}
diff --git a/app/Validators/App.php b/app/Validators/App.php
deleted file mode 100644
index 105fe914..00000000
--- a/app/Validators/App.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Validators;
-
-use App\Exceptions\BadRequest as BadRequestException;
-use App\Models\App as AppModel;
-use App\Repos\App as AppRepo;
-
-class App extends Validator
-{
-
-    public function checkApp($id)
-    {
-        $appRepo = new AppRepo();
-
-        $app = $appRepo->findById($id);
-
-        if (!$app) {
-            throw new BadRequestException('app.not_found');
-        }
-
-        return $app;
-    }
-
-    public function checkName($name)
-    {
-        $value = $this->filter->sanitize($name, ['trim', 'string']);
-
-        $length = kg_strlen($value);
-
-        if ($length < 2) {
-            throw new BadRequestException('app.name_too_short');
-        }
-
-        if ($length > 50) {
-            throw new BadRequestException('app.name_too_long');
-        }
-
-        return $value;
-    }
-
-    public function checkType($type)
-    {
-        if (!array_key_exists($type, AppModel::types())) {
-            throw new BadRequestException('app.invalid_type');
-        }
-
-        return $type;
-    }
-
-    public function checkRemark($remark)
-    {
-        $value = $this->filter->sanitize($remark, ['trim', 'striptags']);
-
-        $length = kg_strlen($value);
-
-        if ($length > 255) {
-            throw new BadRequestException('app.remark_too_long');
-        }
-
-        return $value;
-    }
-
-    public function checkPublishStatus($status)
-    {
-        if (!in_array($status, [0, 1])) {
-            throw new BadRequestException('app.invalid_publish_status');
-        }
-
-        return $status;
-    }
-
-}
diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php
index 2bdb67a6..e100cc87 100644
--- a/app/Validators/Consult.php
+++ b/app/Validators/Consult.php
@@ -126,11 +126,11 @@ class Consult extends Validator
         }
     }
 
-    public function checkIfDuplicated($question, $chapterId, $userId)
+    public function checkIfDuplicated($chapterId, $userId, $question)
     {
         $repo = new ConsultRepo();
 
-        $consult = $repo->findUserLastChapterConsult($chapterId, $userId);
+        $consult = $repo->findUserLastCourseConsult($chapterId, $userId);
 
         if (!$consult) return;
 
diff --git a/app/Validators/Live.php b/app/Validators/Live.php
new file mode 100644
index 00000000..d6fbe57d
--- /dev/null
+++ b/app/Validators/Live.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Validators;
+
+use App\Exceptions\BadRequest as BadRequestException;
+
+class Live extends Validator
+{
+
+    public function checkMessage($content)
+    {
+        $value = $this->filter->sanitize($content, ['trim', 'striptags']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 1) {
+            throw new BadRequestException('live.msg_too_short');
+        }
+
+        if ($length > 255) {
+            throw new BadRequestException('live.msg_too_long');
+        }
+
+        return $value;
+    }
+
+}
diff --git a/app/Validators/Security.php b/app/Validators/Security.php
index 534dff3d..24d293fb 100644
--- a/app/Validators/Security.php
+++ b/app/Validators/Security.php
@@ -45,15 +45,4 @@ class Security extends Validator
         }
     }
 
-    public function checkApiSignature()
-    {
-        $validator = new ApiSecurity();
-
-        $result = $validator->check();
-
-        if (!$result) {
-            throw new BadRequestException('security.invalid_api_signature');
-        }
-    }
-
 }
diff --git a/config/config.default.php b/config/config.default.php
index 1b8d0d39..dcdf4097 100644
--- a/config/config.default.php
+++ b/config/config.default.php
@@ -157,6 +157,16 @@ $config['cors']['enabled'] = true;
  */
 $config['cors']['allow_origin'] = '*';
 
+/**
+ * 允许跨域字段（string|array）
+ */
+$config['cors']['allow_headers'] = '*';
+
+/**
+ * 允许跨域方法
+ */
+$config['cors']['allow_methods'] = ['GET', 'POST', 'OPTIONS'];
+
 /**
  * 限流开启
  */

From ac352683dd6a642282ac9f370e8aa914c7d6eea3 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Mon, 23 Nov 2020 21:03:00 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E5=88=A0=E9=99=A4api=E9=AA=8C=E8=AF=81,a?=
 =?UTF-8?q?pp=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                 |   4 +
 app/Builders/ImGroupUserList.php             |   2 +-
 app/Builders/LiveList.php                    |  26 +++-
 app/Http/Admin/Controllers/AppController.php | 127 -----------------
 app/Http/Admin/Services/App.php              | 135 ------------------
 app/Http/Admin/Services/AuthNode.php         |  31 -----
 app/Http/Admin/Views/app/add.volt            |  41 ------
 app/Http/Admin/Views/app/edit.volt           |  49 -------
 app/Http/Admin/Views/app/list.volt           |  83 -----------
 app/Http/Api/Controllers/Controller.php      |   9 +-
 app/Http/Api/Controllers/HelpController.php  |   2 +-
 app/Http/Api/Controllers/PageController.php  |   2 +-
 app/Http/Home/Views/macros/order.volt        |  30 ++--
 app/Library/AppInfo.php                      |   2 +-
 app/Models/App.php                           | 136 -------------------
 app/Models/AppVersion.php                    | 126 -----------------
 app/Repos/App.php                            |  78 -----------
 app/Repos/Consult.php                        |   8 +-
 app/Services/Logic/Consult/ConsultCreate.php |  66 ++++++++-
 app/Services/Logic/Live/LiveChapter.php      |   5 +-
 app/Services/Logic/Search/Course.php         |  10 +-
 app/Services/Logic/Search/Group.php          |   8 +-
 app/Services/Logic/Search/User.php           |  10 +-
 app/Validators/ApiSecurity.php               | 133 ------------------
 app/Validators/App.php                       |  73 ----------
 app/Validators/Consult.php                   |   4 +-
 app/Validators/Live.php                      |  27 ++++
 app/Validators/Security.php                  |  11 --
 config/config.default.php                    |  10 ++
 29 files changed, 168 insertions(+), 1080 deletions(-)
 delete mode 100644 app/Http/Admin/Controllers/AppController.php
 delete mode 100644 app/Http/Admin/Services/App.php
 delete mode 100644 app/Http/Admin/Views/app/add.volt
 delete mode 100644 app/Http/Admin/Views/app/edit.volt
 delete mode 100644 app/Http/Admin/Views/app/list.volt
 delete mode 100644 app/Models/App.php
 delete mode 100644 app/Models/AppVersion.php
 delete mode 100644 app/Repos/App.php
 delete mode 100644 app/Validators/ApiSecurity.php
 delete mode 100644 app/Validators/App.php
 create mode 100644 app/Validators/Live.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95530986..af6041a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### [v1.2.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.2.0)(2020-11-25)
+- 增加客户端api
+- 代码优化以及问题修复
+
 ### [v1.1.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.1.0)(2020-10-08)
 
 - 增加运营统计功能
diff --git a/app/Builders/ImGroupUserList.php b/app/Builders/ImGroupUserList.php
index 917eecd6..467db5a6 100644
--- a/app/Builders/ImGroupUserList.php
+++ b/app/Builders/ImGroupUserList.php
@@ -36,7 +36,7 @@ class ImGroupUserList extends Builder
 
         $userRepo = new UserRepo();
 
-        $columns = ['id', 'name', 'avatar', 'title', 'about', 'vip'];
+        $columns = ['id', 'name', 'avatar', 'title', 'about', 'vip', 'gender', 'area'];
 
         $users = $userRepo->findByIds($ids, $columns);
 
diff --git a/app/Builders/LiveList.php b/app/Builders/LiveList.php
index e010b6eb..a331653e 100644
--- a/app/Builders/LiveList.php
+++ b/app/Builders/LiveList.php
@@ -4,6 +4,7 @@ namespace App\Builders;
 
 use App\Repos\Chapter as ChapterRepo;
 use App\Repos\Course as CourseRepo;
+use App\Repos\User as UserRepo;
 
 class LiveList extends Builder
 {
@@ -32,19 +33,38 @@ class LiveList extends Builder
 
     public function getCourses(array $lives)
     {
-        $ids = kg_array_column($lives, 'course_id');
+        $courseIds = kg_array_column($lives, 'course_id');
 
         $courseRepo = new CourseRepo();
 
-        $courses = $courseRepo->findByIds($ids, ['id', 'title', 'cover']);
+        $courses = $courseRepo->findByIds($courseIds, ['id', 'title', 'cover', 'teacher_id']);
+
+        $teacherIds = kg_array_column($courses->toArray(), 'teacher_id');
+
+        $userRepo = new UserRepo();
+
+        $users = $userRepo->findByIds($teacherIds, ['id', 'name', 'title', 'avatar', 'about']);
 
         $baseUrl = kg_cos_url();
 
+        $teachers = [];
+
+        foreach ($users->toArray() as $user) {
+            $user['avatar'] = $baseUrl . $user['avatar'];
+            $teachers[$user['id']] = $user;
+        }
+
         $result = [];
 
         foreach ($courses->toArray() as $course) {
             $course['cover'] = $baseUrl . $course['cover'];
-            $result[$course['id']] = $course;
+            $course['teacher'] = $teachers[$course['teacher_id']] ?? new \stdClass();
+            $result[$course['id']] = [
+                'id' => $course['id'],
+                'title' => $course['title'],
+                'cover' => $course['cover'],
+                'teacher' => $course['teacher'],
+            ];
         }
 
         return $result;
diff --git a/app/Http/Admin/Controllers/AppController.php b/app/Http/Admin/Controllers/AppController.php
deleted file mode 100644
index 5871cb68..00000000
--- a/app/Http/Admin/Controllers/AppController.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace App\Http\Admin\Controllers;
-
-use App\Http\Admin\Services\App as AppService;
-
-/**
- * @RoutePrefix("/admin/app")
- */
-class AppController extends Controller
-{
-
-    /**
-     * @Get("/list", name="admin.app.list")
-     */
-    public function listAction()
-    {
-        $appService = new AppService();
-
-        $pager = $appService->getApps();
-
-        $this->view->setVar('pager', $pager);
-    }
-
-    /**
-     * @Get("/add", name="admin.app.add")
-     */
-    public function addAction()
-    {
-        $appService = new AppService();
-
-        $types = $appService->getAppTypes();
-
-        $this->view->setVar('types', $types);
-    }
-
-    /**
-     * @Post("/create", name="admin.app.create")
-     */
-    public function createAction()
-    {
-        $appService = new AppService();
-
-        $appService->createApp();
-
-        $location = $this->url->get(['for' => 'admin.app.list']);
-
-        $content = [
-            'location' => $location,
-            'msg' => '创建应用成功',
-        ];
-
-        return $this->jsonSuccess($content);
-    }
-
-    /**
-     * @Get("/{id:[0-9]+}/edit", name="admin.app.edit")
-     */
-    public function editAction($id)
-    {
-        $appService = new AppService;
-
-        $app = $appService->getApp($id);
-        $types = $appService->getAppTypes();
-
-        $this->view->setVar('app', $app);
-        $this->view->setVar('types', $types);
-    }
-
-    /**
-     * @Post("/{id:[0-9]+}/update", name="admin.app.update")
-     */
-    public function updateAction($id)
-    {
-        $appService = new AppService();
-
-        $appService->updateApp($id);
-
-        $location = $this->url->get(['for' => 'admin.app.list']);
-
-        $content = [
-            'location' => $location,
-            'msg' => '更新应用成功',
-        ];
-
-        return $this->jsonSuccess($content);
-    }
-
-    /**
-     * @Post("/{id:[0-9]+}/delete", name="admin.app.delete")
-     */
-    public function deleteAction($id)
-    {
-        $appService = new AppService();
-
-        $appService->deleteApp($id);
-
-        $location = $this->request->getHTTPReferer();
-
-        $content = [
-            'location' => $location,
-            'msg' => '删除应用成功',
-        ];
-
-        return $this->jsonSuccess($content);
-    }
-
-    /**
-     * @Post("/{id:[0-9]+}/restore", name="admin.app.restore")
-     */
-    public function restoreAction($id)
-    {
-        $appService = new AppService();
-
-        $appService->restoreApp($id);
-
-        $location = $this->request->getHTTPReferer();
-
-        $content = [
-            'location' => $location,
-            'msg' => '还原应用成功',
-        ];
-
-        return $this->jsonSuccess($content);
-    }
-
-}
diff --git a/app/Http/Admin/Services/App.php b/app/Http/Admin/Services/App.php
deleted file mode 100644
index 100daf8a..00000000
--- a/app/Http/Admin/Services/App.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-namespace App\Http\Admin\Services;
-
-use App\Caches\App as AppCache;
-use App\Library\Paginator\Query as PagerQuery;
-use App\Models\App as AppModel;
-use App\Repos\App as AppRepo;
-use App\Validators\App as AppValidator;
-
-class App extends Service
-{
-
-    public function getApps()
-    {
-        $pagerQuery = new PagerQuery();
-
-        $params = $pagerQuery->getParams();
-
-        $params['deleted'] = $params['deleted'] ?? 0;
-
-        $sort = $pagerQuery->getSort();
-        $page = $pagerQuery->getPage();
-        $limit = $pagerQuery->getLimit();
-
-        $appRepo = new AppRepo();
-
-        return $appRepo->paginate($params, $sort, $page, $limit);
-    }
-
-    public function getApp($id)
-    {
-        return $this->findOrFail($id);
-    }
-
-    public function createApp()
-    {
-        $post = $this->request->getPost();
-
-        $validator = new AppValidator();
-
-        $data = [];
-
-        $data['type'] = $validator->checkType($post['type']);
-        $data['name'] = $validator->checkName($post['name']);
-        $data['remark'] = $validator->checkRemark($post['remark']);
-
-        $page = new AppModel();
-
-        $page->create($data);
-
-        $this->rebuildAppCache($page);
-
-        return $page;
-    }
-
-    public function updateApp($id)
-    {
-        $app = $this->findOrFail($id);
-
-        $post = $this->request->getPost();
-
-        $validator = new AppValidator();
-
-        $data = [];
-
-        if (isset($post['type'])) {
-            $data['type'] = $validator->checkType($post['type']);
-        }
-
-        if (isset($post['name'])) {
-            $data['name'] = $validator->checkName($post['name']);
-        }
-
-        if (isset($post['remark'])) {
-            $data['remark'] = $validator->checkRemark($post['remark']);
-        }
-
-        if (isset($post['published'])) {
-            $data['published'] = $validator->checkPublishStatus($post['published']);
-        }
-
-        $app->update($data);
-
-        $this->rebuildAppCache($app);
-
-        return $app;
-    }
-
-    public function deleteApp($id)
-    {
-        $app = $this->findOrFail($id);
-
-        $app->deleted = 1;
-
-        $app->update();
-
-        $this->rebuildAppCache($app);
-
-        return $app;
-    }
-
-    public function restoreApp($id)
-    {
-        $app = $this->findOrFail($id);
-
-        $app->deleted = 0;
-
-        $app->update();
-
-        $this->rebuildAppCache($app);
-
-        return $app;
-    }
-
-    public function getAppTypes()
-    {
-        return AppModel::types();
-    }
-
-    protected function rebuildAppCache(AppModel $app)
-    {
-        $cache = new AppCache();
-
-        $cache->rebuild($app->key);
-    }
-
-    protected function findOrFail($id)
-    {
-        $validator = new AppValidator();
-
-        return $validator->checkApp($id);
-    }
-
-}
diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php
index 9f321357..43fb64fd 100644
--- a/app/Http/Admin/Services/AuthNode.php
+++ b/app/Http/Admin/Services/AuthNode.php
@@ -746,37 +746,6 @@ class AuthNode extends Service
                         ],
                     ],
                 ],
-                [
-                    'id' => '5-2',
-                    'title' => '应用管理',
-                    'type' => 'menu',
-                    'children' => [
-                        [
-                            'id' => '5-2-1',
-                            'title' => '应用列表',
-                            'type' => 'menu',
-                            'route' => 'admin.app.list',
-                        ],
-                        [
-                            'id' => '5-2-2',
-                            'title' => '添加应用',
-                            'type' => 'menu',
-                            'route' => 'admin.app.add',
-                        ],
-                        [
-                            'id' => '5-2-3',
-                            'title' => '编辑应用',
-                            'type' => 'button',
-                            'route' => 'admin.app.edit',
-                        ],
-                        [
-                            'id' => '5-2-4',
-                            'title' => '删除应用',
-                            'type' => 'button',
-                            'route' => 'admin.app.delete',
-                        ],
-                    ],
-                ],
             ],
         ];
     }
diff --git a/app/Http/Admin/Views/app/add.volt b/app/Http/Admin/Views/app/add.volt
deleted file mode 100644
index 7ff4f88e..00000000
--- a/app/Http/Admin/Views/app/add.volt
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends 'templates/main.volt' %}
-
-{% block content %}
-
-    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.app.create'}) }}">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>添加应用</legend>
-        </fieldset>
-        <div class="layui-form-item">
-            <label class="layui-form-label">类型</label>
-            <div class="layui-input-block">
-                <select name="type" lay-verify="required">
-                    <option value="">选择类型</option>
-                    {% for key,name in types %}
-                        <option value="{{ key }}">{{ name }}</option>
-                    {% endfor %}
-                </select>
-            </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="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="remark">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"></label>
-            <div class="layui-input-block">
-                <button class="kg-submit layui-btn" lay-submit="true" lay-filter="go">提交</button>
-                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
-            </div>
-        </div>
-    </form>
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/app/edit.volt b/app/Http/Admin/Views/app/edit.volt
deleted file mode 100644
index 921acd3e..00000000
--- a/app/Http/Admin/Views/app/edit.volt
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends 'templates/main.volt' %}
-
-{% block content %}
-
-    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.app.update','id':app.id}) }}">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>编辑应用</legend>
-        </fieldset>
-        <div class="layui-form-item">
-            <label class="layui-form-label">类型</label>
-            <div class="layui-input-block">
-                <select name="type" lay-verify="required">
-                    <option value="">选择类型</option>
-                    {% for key,name in types %}
-                        {% set selected = key == app.type ? 'selected="selected"' : '' %}
-                        <option value="{{ key }}" {{ selected }}>{{ name }}</option>
-                    {% endfor %}
-                </select>
-            </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="name" value="{{ app.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="remark" value="{{ app.remark }}">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">发布</label>
-            <div class="layui-input-block">
-                <input type="radio" name="published" value="1" title="是" {% if app.published == 1 %}checked="checked"{% endif %}>
-                <input type="radio" name="published" value="0" title="否" {% if app.published == 0 %}checked="checked"{% endif %}>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label"></label>
-            <div class="layui-input-block">
-                <button class="kg-submit layui-btn" lay-submit="true" lay-filter="go">提交</button>
-                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
-            </div>
-        </div>
-    </form>
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/app/list.volt b/app/Http/Admin/Views/app/list.volt
deleted file mode 100644
index 3c3a5394..00000000
--- a/app/Http/Admin/Views/app/list.volt
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends 'templates/main.volt' %}
-
-{% block content %}
-
-    {%- macro type_info(value) %}
-        {% if value == 'pc' %}
-            PC客户端
-        {% elseif value == 'h5' %}
-            H5客户端
-        {% elseif value == 'ios' %}
-            IOS客户端
-        {% elseif value == 'android' %}
-            Android客户端
-        {% elseif value == 'mp_weixin' %}
-            微信小程序
-        {% elseif value == 'mp_alipay' %}
-            支付宝小程序
-        {% else %}
-            未知
-        {% endif %}
-    {%- endmacro %}
-
-    <div class="kg-nav">
-        <div class="kg-nav-left">
-            <span class="layui-breadcrumb">
-                <a><cite>应用管理</cite></a>
-            </span>
-        </div>
-    </div>
-
-    <table class="kg-table layui-table layui-form">
-        <colgroup>
-            <col>
-            <col>
-            <col>
-            <col>
-            <col>
-            <col width="10%">
-            <col width="12%">
-        </colgroup>
-        <thead>
-        <tr>
-            <th>编号</th>
-            <th>名称</th>
-            <th>类型</th>
-            <th>Key / Secret</th>
-            <th>创建时间</th>
-            <th>发布</th>
-            <th>操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        {% for item in pager.items %}
-            {% set edit_url = url({'for':'admin.app.edit','id':item.id}) %}
-            {% set update_url = url({'for':'admin.app.update','id':item.id}) %}
-            {% set delete_url = url({'for':'admin.app.delete','id':item.id}) %}
-            {% set restore_url = url({'for':'admin.app.restore','id':item.id}) %}
-            <tr>
-                <td>{{ item.id }}</td>
-                <td><a href="{{ edit_url }}" title="{{ item.remark }}">{{ item.name }}</a></td>
-                <td>{{ type_info(item.type) }}</td>
-                <td>{{ item.key }} / {{ item.secret }}</td>
-                <td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
-                <td class="center"><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">
-                    <div class="layui-dropdown">
-                        <button class="layui-btn layui-btn-sm">操作 <i class="layui-icon layui-icon-triangle-d"></i></button>
-                        <ul>
-                            <li><a href="{{ edit_url }}">编辑</a></li>
-                            {% if item.deleted == 0 %}
-                                <li><a href="javascript:" class="kg-delete" data-url="{{ delete_url }}">删除</a></li>
-                            {% else %}
-                                <li><a href="javascript:" class="kg-restore" data-url="{{ restore_url }}">还原</a></li>
-                            {% endif %}
-                        </ul>
-                    </div>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Api/Controllers/Controller.php b/app/Http/Api/Controllers/Controller.php
index 50a6611d..d33b4eeb 100644
--- a/app/Http/Api/Controllers/Controller.php
+++ b/app/Http/Api/Controllers/Controller.php
@@ -15,19 +15,12 @@ class Controller extends \Phalcon\Mvc\Controller
 
     public function beforeExecuteRoute(Dispatcher $dispatcher)
     {
-        /**
-         * 存在Origin头信息才设置跨域
-         */
         if ($this->request->getHeader('Origin')) {
             $this->setCors();
         }
 
-        /**
-         * Options请求不验证签名和限流
-         */
         if (!$this->request->isOptions()) {
-            //$this->checkApiSignature();
-            //$this->checkRateLimit();
+            $this->checkRateLimit();
         }
 
         return true;
diff --git a/app/Http/Api/Controllers/HelpController.php b/app/Http/Api/Controllers/HelpController.php
index 60879eb3..c64e78da 100644
--- a/app/Http/Api/Controllers/HelpController.php
+++ b/app/Http/Api/Controllers/HelpController.php
@@ -24,7 +24,7 @@ class HelpController extends Controller
     }
 
     /**
-     * @Get("/{id:[0-9]+}", name="api.help.info")
+     * @Get("/{id:[0-9]+}/info", name="api.help.info")
      */
     public function infoAction($id)
     {
diff --git a/app/Http/Api/Controllers/PageController.php b/app/Http/Api/Controllers/PageController.php
index b18e31f6..255e82f4 100644
--- a/app/Http/Api/Controllers/PageController.php
+++ b/app/Http/Api/Controllers/PageController.php
@@ -11,7 +11,7 @@ class PageController extends Controller
 {
 
     /**
-     * @Get("/{id:[0-9]+}", name="api.page.info")
+     * @Get("/{id:[0-9]+}/info", name="api.page.info")
      */
     public function infoAction($id)
     {
diff --git a/app/Http/Home/Views/macros/order.volt b/app/Http/Home/Views/macros/order.volt
index 57dd015f..1f963258 100644
--- a/app/Http/Home/Views/macros/order.volt
+++ b/app/Http/Home/Views/macros/order.volt
@@ -1,12 +1,12 @@
 {%- macro item_info(order) %}
-    {% if order.item_type == '1' %}
+    {% if order.item_type == 1 %}
         {% set course = order.item_info.course %}
         <div class="order-item">
             <p>课程名称：<span>{{ course.title }}</span></p>
             <p>市场价格：<span class="price">{{ '￥%0.2f'|format(course.market_price) }}</span>会员价格：<span class="price">{{ '￥%0.2f'|format(course.vip_price) }}</span></p>
             <p>学习期限：<span>{{ date('Y-m-d',course.study_expiry_time) }}</span>退款期限：<span>{{ date('Y-m-d',course.refund_expiry_time) }}</span></p>
         </div>
-    {% elseif order.item_type == '2' %}
+    {% elseif order.item_type == 2 %}
         {% set courses = order.item_info.courses %}
         {% for course in courses %}
             <div class="order-item">
@@ -15,20 +15,20 @@
                 <p>学习期限：<span>{{ date('Y-m-d',course.study_expiry_time) }}</span>退款期限：<span>{{ date('Y-m-d',course.refund_expiry_time) }}</span></p>
             </div>
         {% endfor %}
-    {% elseif order.item_type == '3' %}
+    {% elseif order.item_type == 3 %}
         {% set course = order.item_info.course %}
         {% set reward = order.item_info.reward %}
         <div class="order-item">
             <p>课程名称：<span>{{ course.title }}</span></p>
             <p>赞赏金额：<span class="price">{{ '￥%0.2f'|format(reward.price) }}</span></p>
         </div>
-    {% elseif order.item_type == '4' %}
+    {% elseif order.item_type == 4 %}
         {% set vip = order.item_info.vip %}
         <div class="order-item">
             <p>商品名称：<span>{{ order.subject }}</span></p>
             <p>商品价格：<span class="price">{{ '￥%0.2f'|format(order.amount) }}</span></p>
         </div>
-    {% elseif order.item_type == '99' %}
+    {% elseif order.item_type == 99 %}
         <div class="order-item">
             <p>商品名称：<span>{{ order.subject }}</span></p>
             <p>商品价格：<span class="price">{{ '￥%0.2f'|format(order.amount) }}</span></p>
@@ -38,30 +38,30 @@
 
 {%- macro status_history(items) %}
     {% for item in items %}
-        {% if item.status == '1' %}
+        {% if item.status == 1 %}
             <p>创建时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-        {% elseif item.status == '2' %}
+        {% elseif item.status == 2 %}
             <p>支付时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-        {% elseif item.status == '3' %}
+        {% elseif item.status == 3 %}
             <p>完成时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-        {% elseif item.status == '4' %}
+        {% elseif item.status == 4 %}
             <p>关闭时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-        {% elseif item.status == '5' %}
+        {% elseif item.status == 5 %}
             <p>退款时间：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
         {% endif %}
     {% endfor %}
 {%- endmacro %}
 
 {%- macro order_status(value) %}
-    {% if value == '1' %}
+    {% if value == 1 %}
         待支付
-    {% elseif value == '2' %}
+    {% elseif value == 2 %}
         发货中
-    {% elseif value == '3' %}
+    {% elseif value == 3 %}
         已完成
-    {% elseif value == '4' %}
+    {% elseif value == 4 %}
         已关闭
-    {% elseif value == '5' %}
+    {% elseif value == 5 %}
         已退款
     {% endif %}
 {%- endmacro %}
diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php
index d2198fa6..569370b3 100644
--- a/app/Library/AppInfo.php
+++ b/app/Library/AppInfo.php
@@ -11,7 +11,7 @@ class AppInfo
 
     protected $link = 'https://gitee.com/koogua';
 
-    protected $version = '1.1.0';
+    protected $version = '1.2.0';
 
     public function __get($name)
     {
diff --git a/app/Models/App.php b/app/Models/App.php
deleted file mode 100644
index 3dd844c1..00000000
--- a/app/Models/App.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Phalcon\Mvc\Model\Behavior\SoftDelete;
-use Phalcon\Text;
-
-class App extends Model
-{
-
-    /**
-     * 应用类型
-     */
-    const TYPE_PC = 'pc';
-    const TYPE_H5 = 'h5';
-    const TYPE_IOS = 'ios';
-    const TYPE_ANDROID = 'android';
-    const TYPE_MP_WEIXIN = 'mp_weixin';
-    const TYPE_MP_ALIPAY = 'mp_alipay';
-
-    /**
-     * 主键编号
-     *
-     * @var int
-     */
-    public $id;
-
-    /**
-     * 名称
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * key
-     *
-     * @var string
-     */
-    public $key;
-
-    /**
-     * secret
-     *
-     * @var string
-     */
-    public $secret;
-
-    /**
-     * 类型
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * 备注
-     *
-     * @var string
-     */
-    public $remark;
-
-    /**
-     * 发布标识
-     *
-     * @var int
-     */
-    public $published;
-
-    /**
-     * 删除标识
-     *
-     * @var int
-     */
-    public $deleted;
-
-    /**
-     * 创建时间
-     *
-     * @var int
-     */
-    public $create_time;
-
-    /**
-     * 更新时间
-     *
-     * @var int
-     */
-    public $update_time;
-
-    public function getSource(): string
-    {
-        return 'kg_app';
-    }
-
-    public function initialize()
-    {
-        parent::initialize();
-
-        $this->addBehavior(
-            new SoftDelete([
-                'field' => 'deleted',
-                'value' => 1,
-            ])
-        );
-    }
-
-    public function beforeCreate()
-    {
-        $this->key = Text::random(Text::RANDOM_ALNUM, 16);
-        $this->secret = Text::random(Text::RANDOM_ALNUM, 16);
-        $this->create_time = time();
-    }
-
-    public function beforeUpdate()
-    {
-        if ($this->deleted == 1) {
-            $this->published = 0;
-        }
-
-        $this->update_time = time();
-    }
-
-    public static function types()
-    {
-        return [
-            self::TYPE_PC => 'PC客户端',
-            self::TYPE_H5 => 'H5客户端',
-            self::TYPE_IOS => 'IOS客户端',
-            self::TYPE_ANDROID => 'Android客户端',
-            self::TYPE_MP_WEIXIN => '微信小程序',
-            self::TYPE_MP_ALIPAY => '支付宝小程序',
-        ];
-    }
-
-}
diff --git a/app/Models/AppVersion.php b/app/Models/AppVersion.php
deleted file mode 100644
index 5dc49c6a..00000000
--- a/app/Models/AppVersion.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Caches\MaxCategoryId as MaxCategoryIdCache;
-use Phalcon\Mvc\Model\Behavior\SoftDelete;
-
-class AppVersion extends Model
-{
-
-    /**
-     * 平台类型
-     */
-    const PLATFORM_IOS = 1;
-    const PLATFORM_ANDROID = 2;
-
-    /**
-     * 主键编号
-     *
-     * @var int
-     */
-    public $id;
-
-    /**
-     * 平台类型
-     *
-     * @var int
-     */
-    public $platform;
-
-    /**
-     * 版本名（例如：v1.0.0）
-     *
-     * @var string
-     */
-    public $version_name;
-
-    /**
-     * 版本号（例如：100）
-     *
-     * @var string
-     */
-    public $version_code;
-
-    /**
-     * 下载地址
-     *
-     * @var string
-     */
-    public $download_url;
-
-    /**
-     * 发布标识
-     *
-     * @var int
-     */
-    public $published;
-
-    /**
-     * 删除标识
-     *
-     * @var int
-     */
-    public $deleted;
-
-    /**
-     * 创建时间
-     *
-     * @var int
-     */
-    public $create_time;
-
-    /**
-     * 更新时间
-     *
-     * @var int
-     */
-    public $update_time;
-
-    public function getSource(): string
-    {
-        return 'kg_category';
-    }
-
-    public function initialize()
-    {
-        parent::initialize();
-
-        $this->addBehavior(
-            new SoftDelete([
-                'field' => 'deleted',
-                'value' => 1,
-            ])
-        );
-    }
-
-    public function beforeCreate()
-    {
-        $this->create_time = time();
-    }
-
-    public function beforeUpdate()
-    {
-        if ($this->deleted == 1) {
-            $this->published = 0;
-        }
-
-        $this->update_time = time();
-    }
-
-    public function afterCreate()
-    {
-        $cache = new MaxCategoryIdCache();
-
-        $cache->rebuild();
-    }
-
-    public static function types()
-    {
-        return [
-            self::TYPE_COURSE => '课程',
-            self::TYPE_HELP => '帮助',
-        ];
-    }
-
-}
diff --git a/app/Repos/App.php b/app/Repos/App.php
deleted file mode 100644
index 028c280a..00000000
--- a/app/Repos/App.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Repos;
-
-use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
-use App\Models\App as AppModel;
-use Phalcon\Mvc\Model;
-
-class App extends Repository
-{
-
-    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
-    {
-        $builder = $this->modelsManager->createBuilder();
-
-        $builder->from(AppModel::class);
-
-        $builder->where('1 = 1');
-
-        if (!empty($where['id'])) {
-            $builder->andWhere('id = :id:', ['id' => $where['id']]);
-        }
-
-        if (!empty($where['key'])) {
-            $builder->andWhere('key = :key:', ['key' => $where['key']]);
-        }
-
-        if (!empty($where['type'])) {
-            $builder->andWhere('type = :type:', ['type' => $where['type']]);
-        }
-
-        if (!empty($where['published'])) {
-            $builder->andWhere('published = :published:', ['published' => $where['published']]);
-        }
-
-        if (isset($where['deleted'])) {
-            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
-        }
-
-        switch ($sort) {
-            default:
-                $orderBy = 'id DESC';
-                break;
-        }
-
-        $builder->orderBy($orderBy);
-
-        $pager = new PagerQueryBuilder([
-            'builder' => $builder,
-            'page' => $page,
-            'limit' => $limit,
-        ]);
-
-        return $pager->paginate();
-    }
-
-    /**
-     * @param int $id
-     * @return AppModel|Model|bool
-     */
-    public function findById($id)
-    {
-        return AppModel::findFirst($id);
-    }
-
-    /**
-     * @param string $appKey
-     * @return AppModel|Model|bool
-     */
-    public function findByAppKey($appKey)
-    {
-        return AppModel::findFirst([
-            'conditions' => 'key = :key:',
-            'bind' => ['key' => $appKey],
-        ]);
-    }
-
-}
diff --git a/app/Repos/Consult.php b/app/Repos/Consult.php
index 78f97eec..548a6569 100644
--- a/app/Repos/Consult.php
+++ b/app/Repos/Consult.php
@@ -95,15 +95,15 @@ class Consult extends Repository
     }
 
     /**
-     * @param int $chapterId
+     * @param int $courseId
      * @param int $userId
      * @return ConsultModel|Model|bool
      */
-    public function findUserLastChapterConsult($chapterId, $userId)
+    public function findUserLastCourseConsult($courseId, $userId)
     {
         return ConsultModel::findFirst([
-            'conditions' => 'chapter_id = ?1 AND owner_id = ?2 AND deleted = 0',
-            'bind' => [1 => $chapterId, 2 => $userId],
+            'conditions' => 'course_id = ?1 AND owner_id = ?2 AND deleted = 0',
+            'bind' => [1 => $courseId, 2 => $userId],
             'order' => 'id DESC',
         ]);
     }
diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php
index 7d9a4002..fe29e49a 100644
--- a/app/Services/Logic/Consult/ConsultCreate.php
+++ b/app/Services/Logic/Consult/ConsultCreate.php
@@ -20,29 +20,83 @@ class ConsultCreate extends Service
 
     public function handle()
     {
-        $post = $this->request->getPost();
+        $chapterId = $this->request->getPost('chapter_id', 'int', 0);
+        $courseId = $this->request->getPost('course_id', 'int', 0);
 
         $user = $this->getLoginUser();
 
-        $chapter = $this->checkChapter($post['chapter_id']);
-
-        $course = $this->checkCourse($chapter->course_id);
-
         $validator = new UserLimitValidator();
 
         $validator->checkDailyConsultLimit($user);
 
+        $validator = new UserLimitValidator();
+
+        $validator->checkDailyConsultLimit($user);
+
+        if ($chapterId > 0) {
+
+            $chapter = $this->checkChapter($chapterId);
+
+            return $this->handleChapterConsult($chapter, $user);
+
+        } else {
+
+            $course = $this->checkCourse($courseId);
+
+            return $this->handleCourseConsult($course, $user);
+        }
+    }
+
+    protected function handleCourseConsult(CourseModel $course, UserModel $user)
+    {
+        $post = $this->request->getPost();
+
         $validator = new ConsultValidator();
 
         $question = $validator->checkQuestion($post['question']);
+        $private = $validator->checkPrivateStatus($post['private']);
 
-        $validator->checkIfDuplicated($question, $chapter->id, $user->id);
+        $validator->checkIfDuplicated($course->id, $user->id, $question);
 
         $priority = $this->getPriority($course, $user);
 
         $consult = new ConsultModel();
 
         $consult->question = $question;
+        $consult->private = $private;
+        $consult->priority = $priority;
+        $consult->course_id = $course->id;
+        $consult->owner_id = $user->id;
+        $consult->published = 1;
+
+        $consult->create();
+
+        $this->incrCourseConsultCount($course);
+
+        $this->incrUserDailyConsultCount($user);
+
+        return $consult;
+    }
+
+    protected function handleChapterConsult(ChapterModel $chapter, UserModel $user)
+    {
+        $course = $this->checkCourse($chapter->course_id);
+
+        $post = $this->request->getPost();
+
+        $validator = new ConsultValidator();
+
+        $question = $validator->checkQuestion($post['question']);
+        $private = $validator->checkPrivateStatus($post['private']);
+
+        $validator->checkIfDuplicated($course->id, $user->id, $question);
+
+        $priority = $this->getPriority($course, $user);
+
+        $consult = new ConsultModel();
+
+        $consult->question = $question;
+        $consult->private = $private;
         $consult->priority = $priority;
         $consult->course_id = $course->id;
         $consult->chapter_id = $chapter->id;
diff --git a/app/Services/Logic/Live/LiveChapter.php b/app/Services/Logic/Live/LiveChapter.php
index be734728..49a0df55 100644
--- a/app/Services/Logic/Live/LiveChapter.php
+++ b/app/Services/Logic/Live/LiveChapter.php
@@ -4,6 +4,7 @@ namespace App\Services\Logic\Live;
 
 use App\Services\Logic\ChapterTrait;
 use App\Services\Logic\Service;
+use App\Validators\Live as LiveValidator;
 use GatewayClient\Gateway;
 
 class LiveChapter extends Service
@@ -97,7 +98,9 @@ class LiveChapter extends Service
 
         $content = $this->request->getPost('content', ['trim', 'striptags']);
 
-        $content = kg_substr($content, 0, 80);
+        $validator = new LiveValidator();
+
+        $validator->checkMessage($content);
 
         Gateway::$registerAddress = $this->getRegisterAddress();
 
diff --git a/app/Services/Logic/Search/Course.php b/app/Services/Logic/Search/Course.php
index 1b37f80c..0749bf1f 100644
--- a/app/Services/Logic/Search/Course.php
+++ b/app/Services/Logic/Search/Course.php
@@ -62,11 +62,11 @@ class Course extends Handler
 
             $items[] = [
                 'id' => (int)$item['id'],
-                'title' => $item['title'],
-                'cover' => $item['cover'],
-                'summary' => $item['summary'],
-                'model' => $item['model'],
-                'level' => $item['level'],
+                'title' => (string)$item['title'],
+                'cover' => (string)$item['cover'],
+                'summary' => (string)$item['summary'],
+                'model' => (int)$item['model'],
+                'level' => (int)$item['level'],
                 'market_price' => (float)$item['market_price'],
                 'vip_price' => (float)$item['vip_price'],
                 'user_count' => (int)$item['user_count'],
diff --git a/app/Services/Logic/Search/Group.php b/app/Services/Logic/Search/Group.php
index bd956015..003520c3 100644
--- a/app/Services/Logic/Search/Group.php
+++ b/app/Services/Logic/Search/Group.php
@@ -62,10 +62,10 @@ class Group extends Handler
 
             $items[] = [
                 'id' => (int)$item['id'],
-                'type' => $item['type'],
-                'name' => $item['name'],
-                'avatar' => $item['avatar'],
-                'about' => $item['about'],
+                'type' => (int)$item['type'],
+                'name' => (string)$item['name'],
+                'avatar' => (string)$item['avatar'],
+                'about' => (string)$item['about'],
                 'user_count' => (int)$item['user_count'],
                 'msg_count' => (int)$item['msg_count'],
                 'owner' => json_decode($item['owner'], true),
diff --git a/app/Services/Logic/Search/User.php b/app/Services/Logic/Search/User.php
index d08ce6a3..05e7be13 100644
--- a/app/Services/Logic/Search/User.php
+++ b/app/Services/Logic/Search/User.php
@@ -62,13 +62,13 @@ class User extends Handler
 
             $items[] = [
                 'id' => (int)$item['id'],
-                'name' => $item['name'],
-                'avatar' => $item['avatar'],
-                'title' => $item['title'],
-                'about' => $item['about'],
+                'name' => (string)$item['name'],
+                'avatar' => (string)$item['avatar'],
+                'title' => (string)$item['title'],
+                'about' => (string)$item['about'],
                 'vip' => (int)$item['vip'],
                 'gender' => (int)$item['gender'],
-                'area' => $item['area'],
+                'area' => (string)$item['area'],
             ];
         }
 
diff --git a/app/Validators/ApiSecurity.php b/app/Validators/ApiSecurity.php
deleted file mode 100644
index 855354bc..00000000
--- a/app/Validators/ApiSecurity.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace App\Validators;
-
-use App\Caches\App as AppCache;
-use App\Exceptions\BadRequest as BadRequestException;
-use App\Models\App as AppModel;
-
-class ApiSecurity extends Validator
-{
-
-    public function check()
-    {
-        $query = $this->request->getQuery();
-
-        if (isset($query['_url'])) {
-            unset($query['_url']);
-        }
-
-        $extra = [
-            '_timestamp' => $this->checkTimestamp(),
-            '_nonce' => $this->checkNonce(),
-        ];
-
-        $appKey = $this->checkAppKey();
-
-        $app = $this->getApp($appKey);
-
-        if (!$app || $app->published == 0) {
-            throw new BadRequestException('api.invalid_app_key');
-        }
-
-        $url = $this->getRequestUrl();
-
-        if ($this->request->getMethod() == 'POST') {
-            $mySignature = $this->httpPostSignature($url, $extra, $app->secret);
-        } else {
-            $params = array_merge($query, $extra);
-            $mySignature = $this->httpGetSignature($url, $params, $app->secret);
-        }
-
-        $signature = $this->request->getHeader('X-Signature');
-
-        if ($signature != $mySignature) {
-            throw new BadRequestException('api.invalid_signature');
-        }
-
-        return $signature;
-    }
-
-    protected function checkTimestamp()
-    {
-        $timestamp = $this->request->getHeader('X-Timestamp');
-
-        $timestamp = $timestamp > 0 ? $timestamp : 0;
-
-        if (abs(time() - $timestamp) > 300) {
-            throw new BadRequestException('api.invalid_timestamp');
-        }
-
-        return $timestamp;
-    }
-
-    protected function checkNonce()
-    {
-        $nonce = $this->request->getHeader('X-Nonce');
-
-        if (!$nonce) {
-            throw new BadRequestException('api.invalid_nonce');
-        }
-
-        return $nonce;
-    }
-
-    protected function checkAppKey()
-    {
-        $appKey = $this->request->getHeader('X-App-Key');
-
-        if (!$appKey) {
-            throw new BadRequestException('api.invalid_app_key');
-        }
-
-        return $appKey;
-    }
-
-    protected function checkPlatform()
-    {
-        $platform = $this->request->getHeader('X-Platform');
-
-        if (!array_key_exists($platform, AppModel::types())) {
-            throw new BadRequestException('api.invalid_platform');
-        }
-
-        return $platform;
-    }
-
-    protected function getRequestUrl()
-    {
-        return sprintf('%s://%s%s',
-            $this->request->getScheme(),
-            $this->request->getHttpHost(),
-            $this->request->getURI()
-        );
-    }
-
-    protected function getApp($appKey)
-    {
-        $cache = new AppCache();
-
-        return $cache->get($appKey);
-    }
-
-    protected function httpGetSignature($url, $params, $appSecret)
-    {
-        ksort($params);
-
-        $query = http_build_query($params);
-
-        return md5($url . $query . $appSecret);
-    }
-
-    protected function httpPostSignature($url, $params, $appSecret)
-    {
-        ksort($params);
-
-        $query = http_build_query($params);
-
-        $body = $this->request->getRawBody();
-
-        return md5($url . $query . $body . $appSecret);
-    }
-
-}
diff --git a/app/Validators/App.php b/app/Validators/App.php
deleted file mode 100644
index 105fe914..00000000
--- a/app/Validators/App.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Validators;
-
-use App\Exceptions\BadRequest as BadRequestException;
-use App\Models\App as AppModel;
-use App\Repos\App as AppRepo;
-
-class App extends Validator
-{
-
-    public function checkApp($id)
-    {
-        $appRepo = new AppRepo();
-
-        $app = $appRepo->findById($id);
-
-        if (!$app) {
-            throw new BadRequestException('app.not_found');
-        }
-
-        return $app;
-    }
-
-    public function checkName($name)
-    {
-        $value = $this->filter->sanitize($name, ['trim', 'string']);
-
-        $length = kg_strlen($value);
-
-        if ($length < 2) {
-            throw new BadRequestException('app.name_too_short');
-        }
-
-        if ($length > 50) {
-            throw new BadRequestException('app.name_too_long');
-        }
-
-        return $value;
-    }
-
-    public function checkType($type)
-    {
-        if (!array_key_exists($type, AppModel::types())) {
-            throw new BadRequestException('app.invalid_type');
-        }
-
-        return $type;
-    }
-
-    public function checkRemark($remark)
-    {
-        $value = $this->filter->sanitize($remark, ['trim', 'striptags']);
-
-        $length = kg_strlen($value);
-
-        if ($length > 255) {
-            throw new BadRequestException('app.remark_too_long');
-        }
-
-        return $value;
-    }
-
-    public function checkPublishStatus($status)
-    {
-        if (!in_array($status, [0, 1])) {
-            throw new BadRequestException('app.invalid_publish_status');
-        }
-
-        return $status;
-    }
-
-}
diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php
index 2bdb67a6..e100cc87 100644
--- a/app/Validators/Consult.php
+++ b/app/Validators/Consult.php
@@ -126,11 +126,11 @@ class Consult extends Validator
         }
     }
 
-    public function checkIfDuplicated($question, $chapterId, $userId)
+    public function checkIfDuplicated($chapterId, $userId, $question)
     {
         $repo = new ConsultRepo();
 
-        $consult = $repo->findUserLastChapterConsult($chapterId, $userId);
+        $consult = $repo->findUserLastCourseConsult($chapterId, $userId);
 
         if (!$consult) return;
 
diff --git a/app/Validators/Live.php b/app/Validators/Live.php
new file mode 100644
index 00000000..d6fbe57d
--- /dev/null
+++ b/app/Validators/Live.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Validators;
+
+use App\Exceptions\BadRequest as BadRequestException;
+
+class Live extends Validator
+{
+
+    public function checkMessage($content)
+    {
+        $value = $this->filter->sanitize($content, ['trim', 'striptags']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 1) {
+            throw new BadRequestException('live.msg_too_short');
+        }
+
+        if ($length > 255) {
+            throw new BadRequestException('live.msg_too_long');
+        }
+
+        return $value;
+    }
+
+}
diff --git a/app/Validators/Security.php b/app/Validators/Security.php
index 534dff3d..24d293fb 100644
--- a/app/Validators/Security.php
+++ b/app/Validators/Security.php
@@ -45,15 +45,4 @@ class Security extends Validator
         }
     }
 
-    public function checkApiSignature()
-    {
-        $validator = new ApiSecurity();
-
-        $result = $validator->check();
-
-        if (!$result) {
-            throw new BadRequestException('security.invalid_api_signature');
-        }
-    }
-
 }
diff --git a/config/config.default.php b/config/config.default.php
index 1b8d0d39..dcdf4097 100644
--- a/config/config.default.php
+++ b/config/config.default.php
@@ -157,6 +157,16 @@ $config['cors']['enabled'] = true;
  */
 $config['cors']['allow_origin'] = '*';
 
+/**
+ * 允许跨域字段（string|array）
+ */
+$config['cors']['allow_headers'] = '*';
+
+/**
+ * 允许跨域方法
+ */
+$config['cors']['allow_methods'] = ['GET', 'POST', 'OPTIONS'];
+
 /**
  * 限流开启
  */

From c8b96ec4acd51918fdc6c4e886eada93386cebc1 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Tue, 24 Nov 2020 20:44:53 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E7=A7=BB=E9=99=A4Mobile=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E4=BF=AE=E5=A4=8DAPI=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=AB=A0=E8=8A=82=E4=BF=A1=E6=81=AF=E6=9D=83=E9=99=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LICENSE                                       |  5 ---
 README.md                                     | 32 +++++----------
 .../Api/Controllers/ChapterController.php     |  6 +++
 app/Http/Home/Controllers/IndexController.php |  2 -
 app/Http/Home/Views/chapter/catalog.volt      |  3 +-
 app/Http/Home/Views/chapter/live/active.volt  |  1 -
 app/Http/Home/Views/chapter/live/forbid.volt  |  1 -
 .../Home/Views/chapter/live/inactive.volt     |  1 -
 app/Http/Home/Views/chapter/read.volt         |  1 -
 app/Http/Home/Views/chapter/vod.volt          |  1 -
 app/Http/Mobile/Controllers/Controller.php    | 20 ----------
 .../Mobile/Controllers/IndexController.php    | 40 -------------------
 .../Mobile/Controllers/PublicController.php   | 14 -------
 app/Http/Mobile/Module.php                    | 31 --------------
 app/Http/Mobile/Services/Login.php            | 29 --------------
 app/Http/Mobile/Services/Logout.php           | 18 ---------
 app/Http/Mobile/Services/Service.php          |  8 ----
 app/Services/Logic/Consult/ConsultCreate.php  |  1 +
 app/Services/Logic/Consult/ConsultDelete.php  | 18 ++++++---
 app/Services/Logic/Review/ReviewCreate.php    |  6 +--
 app/Services/Logic/Review/ReviewDelete.php    |  6 +--
 app/Services/Logic/Review/ReviewUpdate.php    |  7 ++--
 bootstrap/HttpKernel.php                      |  4 --
 23 files changed, 41 insertions(+), 214 deletions(-)
 delete mode 100644 LICENSE
 delete mode 100644 app/Http/Mobile/Controllers/Controller.php
 delete mode 100644 app/Http/Mobile/Controllers/IndexController.php
 delete mode 100644 app/Http/Mobile/Controllers/PublicController.php
 delete mode 100644 app/Http/Mobile/Module.php
 delete mode 100644 app/Http/Mobile/Services/Login.php
 delete mode 100644 app/Http/Mobile/Services/Logout.php
 delete mode 100644 app/Http/Mobile/Services/Service.php

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 1afa4e89..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,5 +0,0 @@
-使用协议
-
-1. 本系统属于强业务类型，非通用类库框架，不适合再次衍生发布。
-2. 在保留我们版权标识的前提下，用户可以修改以满足自己的需求，可以用于商业用途。
-3. 有限社区支持，用户对自己的行为负责。
\ No newline at end of file
diff --git a/README.md b/README.md
index abfadbd8..8e45f66a 100644
--- a/README.md
+++ b/README.md
@@ -2,23 +2,27 @@
 
 #### 项目介绍
 
-酷瓜云课堂，依托腾讯云基础服务架构，采用 C 扩展框架 Phalcon 开发，致力网络教育软件。
+酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展PHP框架Phalcon开发，致力开源网课系统，开源网校系统，开源在线教育系统。
 
 #### 系统功能
 
 实现了点播、直播、专栏、会员、微聊等，是一个完整的产品，具体功能我也不想写一大堆，自己体验吧！
 
-- [前台演示](https://ctc.koogua.com)
-- [后台演示](https://ctc.koogua.com/admin)
-
-帐号：100015@163.com / 123456 (前后台通用)
-
 友情提示：
 
 - 系统配置低（1核 1G 1M 跑多个容器），切莫压测
 - 课程数据来源于网络（无实质内容），切莫购买
 - 管理后台已禁止数据提交，私密配置已过滤
 
+演示帐号：100015@163.com / 123456 (前后台通用)
+
+- [前台演示](https://ctc.koogua.com)
+- [后台演示](https://ctc.koogua.com/admin)
+
+移动端演示：
+
+![移动端扫码演示](https://upload-images.jianshu.io/upload_images/326350-83444e0bbe14db9f.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
+
 #### 项目组件
 
 - 后台框架：[phalcon 3.4.5](https://phalcon.io)
@@ -27,14 +31,6 @@
 - 即时通讯：[workerman 3.5.22](https://workerman.net)
 - 基础依赖：[php7.3](https://php.net)， [mysql5.7](https://mysql.com)， [redis5.0](https://redis.io)
 
-#### 使用协议
-
-虽然尝试了解过开源协议，但是理解的模棱两可，干脆用自己的协议吧。
-
-1. 本系统属于强业务类型，非通用类库框架，不适合再次衍生发布。
-2. 在保留我们版权标识的前提下，用户可以修改以满足自己的需求，可以用于商业用途。
-3. 有限社区支持，用户对自己的行为负责。
-
 #### 安装指南
 
 - [运行环境搭建](https://gitee.com/koogua/course-tencent-cloud-docker)
@@ -43,7 +39,7 @@
 #### 开发计划
 
 - 桌面端：进行中
-- 移动端：待启动
+- 移动端：进行中
 - 小程序：待启动
 
 #### 意见反馈
@@ -52,12 +48,6 @@
 - QQ邮箱: 76632555@qq.com
 - QQ群组: 787363898
 
-#### 加入我们
-
-这是一个创业项目，个人能力和精力有限，要兼顾产品规划以及开发，还要处理很多琐碎事情。目前在南山科技园某个众创空间，希望有 **深圳前端同学** 加入我们。
-
-联系邮箱：76632555@qq.com
-
 #### 通过这个项目能学到什么？
 
 - 项目规划，phalcon，缓存，JWT，即时通讯，全文检索
diff --git a/app/Http/Api/Controllers/ChapterController.php b/app/Http/Api/Controllers/ChapterController.php
index 1897b9d1..d990ac62 100644
--- a/app/Http/Api/Controllers/ChapterController.php
+++ b/app/Http/Api/Controllers/ChapterController.php
@@ -47,6 +47,12 @@ class ChapterController extends Controller
 
         $chapter = $service->handle($id);
 
+        $owned = $chapter['me']['owned'] ?? false;
+
+        if (!$owned) {
+            return $this->jsonError(['msg' => '没有访问章节权限']);
+        }
+
         return $this->jsonSuccess(['chapter' => $chapter]);
     }
 
diff --git a/app/Http/Home/Controllers/IndexController.php b/app/Http/Home/Controllers/IndexController.php
index 82430cfd..ea099b71 100644
--- a/app/Http/Home/Controllers/IndexController.php
+++ b/app/Http/Home/Controllers/IndexController.php
@@ -44,8 +44,6 @@ class IndexController extends Controller
     {
         $service = new IndexService();
 
-        dd($service->getLives());
-
         $this->view->pick('index/full');
         $this->view->setVar('lives', $service->getLives());
         $this->view->setVar('slides', $service->getSlides());
diff --git a/app/Http/Home/Views/chapter/catalog.volt b/app/Http/Home/Views/chapter/catalog.volt
index 71105da9..9625d784 100644
--- a/app/Http/Home/Views/chapter/catalog.volt
+++ b/app/Http/Home/Views/chapter/catalog.volt
@@ -7,11 +7,10 @@
                 <ul class="sidebar-lesson-list">
                     {% for lesson in item.children %}
                         {% set url = url({'for':'home.chapter.show','id':lesson.id}) %}
-                        {% set free_flag = lesson.free == 1 ? '<span class="layui-badge">免费</span>' : '' %}
                         {% set active = (chapter.id == lesson.id) ? 'active' : 'normal' %}
                         <li class="lesson-title layui-elip">
                             {% if lesson.me.owned == 1 %}
-                                <a class="{{ active }}" href="{{ url }}" title="{{ lesson.title }}">{{ lesson.title }} {{ free_flag }}</a>
+                                <a class="{{ active }}" href="{{ url }}" title="{{ lesson.title }}">{{ lesson.title }}</a>
                             {% else %}
                                 <span class="deny" title="{{ lesson.title }}">{{ lesson.title }}</span>
                             {% endif %}
diff --git a/app/Http/Home/Views/chapter/live/active.volt b/app/Http/Home/Views/chapter/live/active.volt
index 5e6b0f86..26a8f398 100644
--- a/app/Http/Home/Views/chapter/live/active.volt
+++ b/app/Http/Home/Views/chapter/live/active.volt
@@ -16,7 +16,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
         <span class="share">
diff --git a/app/Http/Home/Views/chapter/live/forbid.volt b/app/Http/Home/Views/chapter/live/forbid.volt
index ecf9f326..e41255aa 100644
--- a/app/Http/Home/Views/chapter/live/forbid.volt
+++ b/app/Http/Home/Views/chapter/live/forbid.volt
@@ -7,7 +7,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
     </div>
diff --git a/app/Http/Home/Views/chapter/live/inactive.volt b/app/Http/Home/Views/chapter/live/inactive.volt
index db0e5667..5efcda9b 100644
--- a/app/Http/Home/Views/chapter/live/inactive.volt
+++ b/app/Http/Home/Views/chapter/live/inactive.volt
@@ -8,7 +8,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
     </div>
diff --git a/app/Http/Home/Views/chapter/read.volt b/app/Http/Home/Views/chapter/read.volt
index 53146eeb..b40eebb8 100644
--- a/app/Http/Home/Views/chapter/read.volt
+++ b/app/Http/Home/Views/chapter/read.volt
@@ -13,7 +13,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
         <span class="share">
diff --git a/app/Http/Home/Views/chapter/vod.volt b/app/Http/Home/Views/chapter/vod.volt
index 6075ab10..ae448a92 100644
--- a/app/Http/Home/Views/chapter/vod.volt
+++ b/app/Http/Home/Views/chapter/vod.volt
@@ -14,7 +14,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
         <span class="share">
diff --git a/app/Http/Mobile/Controllers/Controller.php b/app/Http/Mobile/Controllers/Controller.php
deleted file mode 100644
index 0cdb1520..00000000
--- a/app/Http/Mobile/Controllers/Controller.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Controllers;
-
-use App\Traits\Response as ResponseTrait;
-use App\Traits\Security as SecurityTrait;
-use Phalcon\Mvc\Dispatcher;
-
-class Controller extends \Phalcon\Mvc\Controller
-{
-
-    use ResponseTrait;
-    use SecurityTrait;
-
-    public function beforeExecuteRoute(Dispatcher $dispatcher)
-    {
-        $this->checkRateLimit();
-    }
-
-}
diff --git a/app/Http/Mobile/Controllers/IndexController.php b/app/Http/Mobile/Controllers/IndexController.php
deleted file mode 100644
index 92671115..00000000
--- a/app/Http/Mobile/Controllers/IndexController.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Controllers;
-
-/**
- * @RoutePrefix("/mobile")
- */
-class IndexController extends Controller
-{
-
-    /**
-     * @Get("/", name="mobile.index")
-     */
-    public function indexAction()
-    {
-
-    }
-
-    /**
-     * @Get("/routes", name="mobile.routes")
-     */
-    public function routesAction()
-    {
-        $definitions = [];
-
-        $routes = $this->router->getRoutes();
-
-        foreach ($routes as $route) {
-            if (strpos($route->getPattern(), '/api') !== false) {
-                $definitions[] = [
-                    'pattern' => $route->getPattern(),
-                    'methods' => $route->getHttpMethods(),
-                ];
-            }
-        }
-
-        return $this->jsonSuccess(['routes' => $definitions]);
-    }
-
-}
diff --git a/app/Http/Mobile/Controllers/PublicController.php b/app/Http/Mobile/Controllers/PublicController.php
deleted file mode 100644
index f80bad67..00000000
--- a/app/Http/Mobile/Controllers/PublicController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Controllers;
-
-use App\Traits\Response as ResponseTrait;
-
-/**
- * @RoutePrefix("/mobile")
- */
-class PublicController extends \Phalcon\Mvc\Controller
-{
-
-    use ResponseTrait;
-}
diff --git a/app/Http/Mobile/Module.php b/app/Http/Mobile/Module.php
deleted file mode 100644
index cbc3e6d4..00000000
--- a/app/Http/Mobile/Module.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Mobile;
-
-use App\Library\Mvc\View as MyView;
-use App\Services\Auth\Mobile as MobileAuth;
-use Phalcon\DiInterface;
-use Phalcon\Mvc\ModuleDefinitionInterface;
-
-class Module implements ModuleDefinitionInterface
-{
-
-    public function registerAutoLoaders(DiInterface $di = null)
-    {
-
-    }
-
-    public function registerServices(DiInterface $di)
-    {
-        $di->setShared('view', function () {
-            $view = new MyView();
-            $view->disable();
-            return $view;
-        });
-
-        $di->setShared('auth', function () {
-            return new MobileAuth();
-        });
-    }
-
-}
diff --git a/app/Http/Mobile/Services/Login.php b/app/Http/Mobile/Services/Login.php
deleted file mode 100644
index 16efe40b..00000000
--- a/app/Http/Mobile/Services/Login.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Services;
-
-use App\Validators\Account as AccountValidator;
-
-class Login extends Service
-{
-
-    public function loginByPassword($account, $password)
-    {
-        $validator = new AccountValidator();
-
-        $user = $validator->checkUserLogin($account, $password);
-    }
-
-    public function loginByVerify($account, $code)
-    {
-        $validator = new AccountValidator();
-
-        $user = $validator->checkVerifyLogin($account, $code);
-    }
-
-    protected function grantAuthToken()
-    {
-
-    }
-
-}
diff --git a/app/Http/Mobile/Services/Logout.php b/app/Http/Mobile/Services/Logout.php
deleted file mode 100644
index 05a7ad49..00000000
--- a/app/Http/Mobile/Services/Logout.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Services;
-
-class Logout extends Service
-{
-
-    public function logoutBySession()
-    {
-
-    }
-
-    public function logoutByToken()
-    {
-
-    }
-
-}
diff --git a/app/Http/Mobile/Services/Service.php b/app/Http/Mobile/Services/Service.php
deleted file mode 100644
index 05b3e850..00000000
--- a/app/Http/Mobile/Services/Service.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Services;
-
-class Service extends \App\Services\Service
-{
-
-}
diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php
index fe29e49a..7f21287d 100644
--- a/app/Services/Logic/Consult/ConsultCreate.php
+++ b/app/Services/Logic/Consult/ConsultCreate.php
@@ -117,6 +117,7 @@ class ConsultCreate extends Service
     protected function getPriority(CourseModel $course, UserModel $user)
     {
         $charge = $course->market_price > 0;
+
         $vip = $user->vip == 1;
 
         if ($vip && $charge) {
diff --git a/app/Services/Logic/Consult/ConsultDelete.php b/app/Services/Logic/Consult/ConsultDelete.php
index 72e0f760..95395d60 100644
--- a/app/Services/Logic/Consult/ConsultDelete.php
+++ b/app/Services/Logic/Consult/ConsultDelete.php
@@ -21,10 +21,6 @@ class ConsultDelete extends Service
     {
         $consult = $this->checkConsult($id);
 
-        $course = $this->checkCourse($consult->course_id);
-
-        $chapter = $this->checkChapter($consult->chapter_id);
-
         $user = $this->getLoginUser();
 
         $validator = new ConsultValidator();
@@ -33,9 +29,19 @@ class ConsultDelete extends Service
 
         $consult->update(['deleted' => 1]);
 
-        $this->decrCourseConsultCount($course);
+        if ($consult->course_id > 0) {
 
-        $this->decrChapterConsultCount($chapter);
+            $course = $this->checkCourse($consult->course_id);
+
+            $this->decrCourseConsultCount($course);
+        }
+
+        if ($consult->chapter_id > 0) {
+
+            $chapter = $this->checkChapter($consult->chapter_id);
+
+            $this->decrChapterConsultCount($chapter);
+        }
     }
 
     protected function decrCourseConsultCount(CourseModel $course)
diff --git a/app/Services/Logic/Review/ReviewCreate.php b/app/Services/Logic/Review/ReviewCreate.php
index deb208a1..b56d38fe 100644
--- a/app/Services/Logic/Review/ReviewCreate.php
+++ b/app/Services/Logic/Review/ReviewCreate.php
@@ -52,7 +52,7 @@ class ReviewCreate extends Service
 
         $this->incrCourseReviewCount($course);
 
-        $this->updateCourseRating($course->id);
+        $this->updateCourseRating($course);
 
         return $review;
     }
@@ -71,11 +71,11 @@ class ReviewCreate extends Service
         $course->update();
     }
 
-    public function updateCourseRating($courseId)
+    public function updateCourseRating(CourseModel $course)
     {
         $service = new CourseStatService();
 
-        $service->updateRating($courseId);
+        $service->updateRating($course->id);
     }
 
 }
diff --git a/app/Services/Logic/Review/ReviewDelete.php b/app/Services/Logic/Review/ReviewDelete.php
index f6086f18..16040e82 100644
--- a/app/Services/Logic/Review/ReviewDelete.php
+++ b/app/Services/Logic/Review/ReviewDelete.php
@@ -31,7 +31,7 @@ class ReviewDelete extends Service
 
         $this->decrCourseReviewCount($course);
 
-        $this->updateCourseRating($course->id);
+        $this->updateCourseRating($course);
     }
 
     protected function decrCourseReviewCount(CourseModel $course)
@@ -42,11 +42,11 @@ class ReviewDelete extends Service
         }
     }
 
-    protected function updateCourseRating($courseId)
+    protected function updateCourseRating(CourseModel $course)
     {
         $service = new CourseStatService();
 
-        $service->updateRating($courseId);
+        $service->updateRating($course->id);
     }
 
 }
diff --git a/app/Services/Logic/Review/ReviewUpdate.php b/app/Services/Logic/Review/ReviewUpdate.php
index dac4d046..0d942a6b 100644
--- a/app/Services/Logic/Review/ReviewUpdate.php
+++ b/app/Services/Logic/Review/ReviewUpdate.php
@@ -2,6 +2,7 @@
 
 namespace App\Services\Logic\Review;
 
+use App\Models\Course as CourseModel;
 use App\Services\CourseStat as CourseStatService;
 use App\Services\Logic\CourseTrait;
 use App\Services\Logic\ReviewTrait;
@@ -39,14 +40,14 @@ class ReviewUpdate extends Service
 
         $review->update($data);
 
-        $this->updateCourseRating($course->id);
+        $this->updateCourseRating($course);
     }
 
-    protected function updateCourseRating($courseId)
+    protected function updateCourseRating(CourseModel $course)
     {
         $service = new CourseStatService();
 
-        $service->updateRating($courseId);
+        $service->updateRating($course->id);
     }
 
 }
diff --git a/bootstrap/HttpKernel.php b/bootstrap/HttpKernel.php
index 648c905b..8e0ea783 100644
--- a/bootstrap/HttpKernel.php
+++ b/bootstrap/HttpKernel.php
@@ -113,10 +113,6 @@ class HttpKernel extends Kernel
                 'className' => 'App\Http\Home\Module',
                 'path' => app_path('Http/Home/Module.php'),
             ],
-            'mobile' => [
-                'className' => 'App\Http\Mobile\Module',
-                'path' => app_path('Http/Mobile/Module.php'),
-            ],
         ];
 
         $this->app->registerModules($modules);

From c2abc741ed795a6652bc1013ed3b47ad5f5e869e Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Tue, 24 Nov 2020 20:44:53 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E7=A7=BB=E9=99=A4Mobile=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E4=BF=AE=E5=A4=8DAPI=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=AB=A0=E8=8A=82=E4=BF=A1=E6=81=AF=E6=9D=83=E9=99=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LICENSE                                       |  5 ---
 README.md                                     | 32 +++++----------
 .../Api/Controllers/ChapterController.php     |  6 +++
 app/Http/Home/Controllers/IndexController.php |  2 -
 app/Http/Home/Views/chapter/catalog.volt      |  3 +-
 app/Http/Home/Views/chapter/live/active.volt  |  1 -
 app/Http/Home/Views/chapter/live/forbid.volt  |  1 -
 .../Home/Views/chapter/live/inactive.volt     |  1 -
 app/Http/Home/Views/chapter/read.volt         |  1 -
 app/Http/Home/Views/chapter/vod.volt          |  1 -
 app/Http/Mobile/Controllers/Controller.php    | 20 ----------
 .../Mobile/Controllers/IndexController.php    | 40 -------------------
 .../Mobile/Controllers/PublicController.php   | 14 -------
 app/Http/Mobile/Module.php                    | 31 --------------
 app/Http/Mobile/Services/Login.php            | 29 --------------
 app/Http/Mobile/Services/Logout.php           | 18 ---------
 app/Http/Mobile/Services/Service.php          |  8 ----
 app/Services/Logic/Consult/ConsultCreate.php  |  1 +
 app/Services/Logic/Consult/ConsultDelete.php  | 18 ++++++---
 app/Services/Logic/Review/ReviewCreate.php    |  6 +--
 app/Services/Logic/Review/ReviewDelete.php    |  6 +--
 app/Services/Logic/Review/ReviewUpdate.php    |  7 ++--
 bootstrap/HttpKernel.php                      |  4 --
 config/routes.php                             |  9 -----
 24 files changed, 41 insertions(+), 223 deletions(-)
 delete mode 100644 LICENSE
 delete mode 100644 app/Http/Mobile/Controllers/Controller.php
 delete mode 100644 app/Http/Mobile/Controllers/IndexController.php
 delete mode 100644 app/Http/Mobile/Controllers/PublicController.php
 delete mode 100644 app/Http/Mobile/Module.php
 delete mode 100644 app/Http/Mobile/Services/Login.php
 delete mode 100644 app/Http/Mobile/Services/Logout.php
 delete mode 100644 app/Http/Mobile/Services/Service.php

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 1afa4e89..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,5 +0,0 @@
-使用协议
-
-1. 本系统属于强业务类型，非通用类库框架，不适合再次衍生发布。
-2. 在保留我们版权标识的前提下，用户可以修改以满足自己的需求，可以用于商业用途。
-3. 有限社区支持，用户对自己的行为负责。
\ No newline at end of file
diff --git a/README.md b/README.md
index abfadbd8..8e45f66a 100644
--- a/README.md
+++ b/README.md
@@ -2,23 +2,27 @@
 
 #### 项目介绍
 
-酷瓜云课堂，依托腾讯云基础服务架构，采用 C 扩展框架 Phalcon 开发，致力网络教育软件。
+酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展PHP框架Phalcon开发，致力开源网课系统，开源网校系统，开源在线教育系统。
 
 #### 系统功能
 
 实现了点播、直播、专栏、会员、微聊等，是一个完整的产品，具体功能我也不想写一大堆，自己体验吧！
 
-- [前台演示](https://ctc.koogua.com)
-- [后台演示](https://ctc.koogua.com/admin)
-
-帐号：100015@163.com / 123456 (前后台通用)
-
 友情提示：
 
 - 系统配置低（1核 1G 1M 跑多个容器），切莫压测
 - 课程数据来源于网络（无实质内容），切莫购买
 - 管理后台已禁止数据提交，私密配置已过滤
 
+演示帐号：100015@163.com / 123456 (前后台通用)
+
+- [前台演示](https://ctc.koogua.com)
+- [后台演示](https://ctc.koogua.com/admin)
+
+移动端演示：
+
+![移动端扫码演示](https://upload-images.jianshu.io/upload_images/326350-83444e0bbe14db9f.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
+
 #### 项目组件
 
 - 后台框架：[phalcon 3.4.5](https://phalcon.io)
@@ -27,14 +31,6 @@
 - 即时通讯：[workerman 3.5.22](https://workerman.net)
 - 基础依赖：[php7.3](https://php.net)， [mysql5.7](https://mysql.com)， [redis5.0](https://redis.io)
 
-#### 使用协议
-
-虽然尝试了解过开源协议，但是理解的模棱两可，干脆用自己的协议吧。
-
-1. 本系统属于强业务类型，非通用类库框架，不适合再次衍生发布。
-2. 在保留我们版权标识的前提下，用户可以修改以满足自己的需求，可以用于商业用途。
-3. 有限社区支持，用户对自己的行为负责。
-
 #### 安装指南
 
 - [运行环境搭建](https://gitee.com/koogua/course-tencent-cloud-docker)
@@ -43,7 +39,7 @@
 #### 开发计划
 
 - 桌面端：进行中
-- 移动端：待启动
+- 移动端：进行中
 - 小程序：待启动
 
 #### 意见反馈
@@ -52,12 +48,6 @@
 - QQ邮箱: 76632555@qq.com
 - QQ群组: 787363898
 
-#### 加入我们
-
-这是一个创业项目，个人能力和精力有限，要兼顾产品规划以及开发，还要处理很多琐碎事情。目前在南山科技园某个众创空间，希望有 **深圳前端同学** 加入我们。
-
-联系邮箱：76632555@qq.com
-
 #### 通过这个项目能学到什么？
 
 - 项目规划，phalcon，缓存，JWT，即时通讯，全文检索
diff --git a/app/Http/Api/Controllers/ChapterController.php b/app/Http/Api/Controllers/ChapterController.php
index 1897b9d1..d990ac62 100644
--- a/app/Http/Api/Controllers/ChapterController.php
+++ b/app/Http/Api/Controllers/ChapterController.php
@@ -47,6 +47,12 @@ class ChapterController extends Controller
 
         $chapter = $service->handle($id);
 
+        $owned = $chapter['me']['owned'] ?? false;
+
+        if (!$owned) {
+            return $this->jsonError(['msg' => '没有访问章节权限']);
+        }
+
         return $this->jsonSuccess(['chapter' => $chapter]);
     }
 
diff --git a/app/Http/Home/Controllers/IndexController.php b/app/Http/Home/Controllers/IndexController.php
index 82430cfd..ea099b71 100644
--- a/app/Http/Home/Controllers/IndexController.php
+++ b/app/Http/Home/Controllers/IndexController.php
@@ -44,8 +44,6 @@ class IndexController extends Controller
     {
         $service = new IndexService();
 
-        dd($service->getLives());
-
         $this->view->pick('index/full');
         $this->view->setVar('lives', $service->getLives());
         $this->view->setVar('slides', $service->getSlides());
diff --git a/app/Http/Home/Views/chapter/catalog.volt b/app/Http/Home/Views/chapter/catalog.volt
index 71105da9..9625d784 100644
--- a/app/Http/Home/Views/chapter/catalog.volt
+++ b/app/Http/Home/Views/chapter/catalog.volt
@@ -7,11 +7,10 @@
                 <ul class="sidebar-lesson-list">
                     {% for lesson in item.children %}
                         {% set url = url({'for':'home.chapter.show','id':lesson.id}) %}
-                        {% set free_flag = lesson.free == 1 ? '<span class="layui-badge">免费</span>' : '' %}
                         {% set active = (chapter.id == lesson.id) ? 'active' : 'normal' %}
                         <li class="lesson-title layui-elip">
                             {% if lesson.me.owned == 1 %}
-                                <a class="{{ active }}" href="{{ url }}" title="{{ lesson.title }}">{{ lesson.title }} {{ free_flag }}</a>
+                                <a class="{{ active }}" href="{{ url }}" title="{{ lesson.title }}">{{ lesson.title }}</a>
                             {% else %}
                                 <span class="deny" title="{{ lesson.title }}">{{ lesson.title }}</span>
                             {% endif %}
diff --git a/app/Http/Home/Views/chapter/live/active.volt b/app/Http/Home/Views/chapter/live/active.volt
index 5e6b0f86..26a8f398 100644
--- a/app/Http/Home/Views/chapter/live/active.volt
+++ b/app/Http/Home/Views/chapter/live/active.volt
@@ -16,7 +16,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
         <span class="share">
diff --git a/app/Http/Home/Views/chapter/live/forbid.volt b/app/Http/Home/Views/chapter/live/forbid.volt
index ecf9f326..e41255aa 100644
--- a/app/Http/Home/Views/chapter/live/forbid.volt
+++ b/app/Http/Home/Views/chapter/live/forbid.volt
@@ -7,7 +7,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
     </div>
diff --git a/app/Http/Home/Views/chapter/live/inactive.volt b/app/Http/Home/Views/chapter/live/inactive.volt
index db0e5667..5efcda9b 100644
--- a/app/Http/Home/Views/chapter/live/inactive.volt
+++ b/app/Http/Home/Views/chapter/live/inactive.volt
@@ -8,7 +8,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
     </div>
diff --git a/app/Http/Home/Views/chapter/read.volt b/app/Http/Home/Views/chapter/read.volt
index 53146eeb..b40eebb8 100644
--- a/app/Http/Home/Views/chapter/read.volt
+++ b/app/Http/Home/Views/chapter/read.volt
@@ -13,7 +13,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
         <span class="share">
diff --git a/app/Http/Home/Views/chapter/vod.volt b/app/Http/Home/Views/chapter/vod.volt
index 6075ab10..ae448a92 100644
--- a/app/Http/Home/Views/chapter/vod.volt
+++ b/app/Http/Home/Views/chapter/vod.volt
@@ -14,7 +14,6 @@
     <div class="breadcrumb">
         <span class="layui-breadcrumb">
             <a href="{{ course_url }}"><i class="layui-icon layui-icon-return"></i> 返回课程</a>
-            <a><cite>{{ chapter.course.title }}</cite></a>
             <a><cite>{{ chapter.title }}</cite></a>
         </span>
         <span class="share">
diff --git a/app/Http/Mobile/Controllers/Controller.php b/app/Http/Mobile/Controllers/Controller.php
deleted file mode 100644
index 0cdb1520..00000000
--- a/app/Http/Mobile/Controllers/Controller.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Controllers;
-
-use App\Traits\Response as ResponseTrait;
-use App\Traits\Security as SecurityTrait;
-use Phalcon\Mvc\Dispatcher;
-
-class Controller extends \Phalcon\Mvc\Controller
-{
-
-    use ResponseTrait;
-    use SecurityTrait;
-
-    public function beforeExecuteRoute(Dispatcher $dispatcher)
-    {
-        $this->checkRateLimit();
-    }
-
-}
diff --git a/app/Http/Mobile/Controllers/IndexController.php b/app/Http/Mobile/Controllers/IndexController.php
deleted file mode 100644
index 92671115..00000000
--- a/app/Http/Mobile/Controllers/IndexController.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Controllers;
-
-/**
- * @RoutePrefix("/mobile")
- */
-class IndexController extends Controller
-{
-
-    /**
-     * @Get("/", name="mobile.index")
-     */
-    public function indexAction()
-    {
-
-    }
-
-    /**
-     * @Get("/routes", name="mobile.routes")
-     */
-    public function routesAction()
-    {
-        $definitions = [];
-
-        $routes = $this->router->getRoutes();
-
-        foreach ($routes as $route) {
-            if (strpos($route->getPattern(), '/api') !== false) {
-                $definitions[] = [
-                    'pattern' => $route->getPattern(),
-                    'methods' => $route->getHttpMethods(),
-                ];
-            }
-        }
-
-        return $this->jsonSuccess(['routes' => $definitions]);
-    }
-
-}
diff --git a/app/Http/Mobile/Controllers/PublicController.php b/app/Http/Mobile/Controllers/PublicController.php
deleted file mode 100644
index f80bad67..00000000
--- a/app/Http/Mobile/Controllers/PublicController.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Controllers;
-
-use App\Traits\Response as ResponseTrait;
-
-/**
- * @RoutePrefix("/mobile")
- */
-class PublicController extends \Phalcon\Mvc\Controller
-{
-
-    use ResponseTrait;
-}
diff --git a/app/Http/Mobile/Module.php b/app/Http/Mobile/Module.php
deleted file mode 100644
index cbc3e6d4..00000000
--- a/app/Http/Mobile/Module.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Mobile;
-
-use App\Library\Mvc\View as MyView;
-use App\Services\Auth\Mobile as MobileAuth;
-use Phalcon\DiInterface;
-use Phalcon\Mvc\ModuleDefinitionInterface;
-
-class Module implements ModuleDefinitionInterface
-{
-
-    public function registerAutoLoaders(DiInterface $di = null)
-    {
-
-    }
-
-    public function registerServices(DiInterface $di)
-    {
-        $di->setShared('view', function () {
-            $view = new MyView();
-            $view->disable();
-            return $view;
-        });
-
-        $di->setShared('auth', function () {
-            return new MobileAuth();
-        });
-    }
-
-}
diff --git a/app/Http/Mobile/Services/Login.php b/app/Http/Mobile/Services/Login.php
deleted file mode 100644
index 16efe40b..00000000
--- a/app/Http/Mobile/Services/Login.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Services;
-
-use App\Validators\Account as AccountValidator;
-
-class Login extends Service
-{
-
-    public function loginByPassword($account, $password)
-    {
-        $validator = new AccountValidator();
-
-        $user = $validator->checkUserLogin($account, $password);
-    }
-
-    public function loginByVerify($account, $code)
-    {
-        $validator = new AccountValidator();
-
-        $user = $validator->checkVerifyLogin($account, $code);
-    }
-
-    protected function grantAuthToken()
-    {
-
-    }
-
-}
diff --git a/app/Http/Mobile/Services/Logout.php b/app/Http/Mobile/Services/Logout.php
deleted file mode 100644
index 05a7ad49..00000000
--- a/app/Http/Mobile/Services/Logout.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Services;
-
-class Logout extends Service
-{
-
-    public function logoutBySession()
-    {
-
-    }
-
-    public function logoutByToken()
-    {
-
-    }
-
-}
diff --git a/app/Http/Mobile/Services/Service.php b/app/Http/Mobile/Services/Service.php
deleted file mode 100644
index 05b3e850..00000000
--- a/app/Http/Mobile/Services/Service.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Http\Mobile\Services;
-
-class Service extends \App\Services\Service
-{
-
-}
diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php
index fe29e49a..7f21287d 100644
--- a/app/Services/Logic/Consult/ConsultCreate.php
+++ b/app/Services/Logic/Consult/ConsultCreate.php
@@ -117,6 +117,7 @@ class ConsultCreate extends Service
     protected function getPriority(CourseModel $course, UserModel $user)
     {
         $charge = $course->market_price > 0;
+
         $vip = $user->vip == 1;
 
         if ($vip && $charge) {
diff --git a/app/Services/Logic/Consult/ConsultDelete.php b/app/Services/Logic/Consult/ConsultDelete.php
index 72e0f760..95395d60 100644
--- a/app/Services/Logic/Consult/ConsultDelete.php
+++ b/app/Services/Logic/Consult/ConsultDelete.php
@@ -21,10 +21,6 @@ class ConsultDelete extends Service
     {
         $consult = $this->checkConsult($id);
 
-        $course = $this->checkCourse($consult->course_id);
-
-        $chapter = $this->checkChapter($consult->chapter_id);
-
         $user = $this->getLoginUser();
 
         $validator = new ConsultValidator();
@@ -33,9 +29,19 @@ class ConsultDelete extends Service
 
         $consult->update(['deleted' => 1]);
 
-        $this->decrCourseConsultCount($course);
+        if ($consult->course_id > 0) {
 
-        $this->decrChapterConsultCount($chapter);
+            $course = $this->checkCourse($consult->course_id);
+
+            $this->decrCourseConsultCount($course);
+        }
+
+        if ($consult->chapter_id > 0) {
+
+            $chapter = $this->checkChapter($consult->chapter_id);
+
+            $this->decrChapterConsultCount($chapter);
+        }
     }
 
     protected function decrCourseConsultCount(CourseModel $course)
diff --git a/app/Services/Logic/Review/ReviewCreate.php b/app/Services/Logic/Review/ReviewCreate.php
index deb208a1..b56d38fe 100644
--- a/app/Services/Logic/Review/ReviewCreate.php
+++ b/app/Services/Logic/Review/ReviewCreate.php
@@ -52,7 +52,7 @@ class ReviewCreate extends Service
 
         $this->incrCourseReviewCount($course);
 
-        $this->updateCourseRating($course->id);
+        $this->updateCourseRating($course);
 
         return $review;
     }
@@ -71,11 +71,11 @@ class ReviewCreate extends Service
         $course->update();
     }
 
-    public function updateCourseRating($courseId)
+    public function updateCourseRating(CourseModel $course)
     {
         $service = new CourseStatService();
 
-        $service->updateRating($courseId);
+        $service->updateRating($course->id);
     }
 
 }
diff --git a/app/Services/Logic/Review/ReviewDelete.php b/app/Services/Logic/Review/ReviewDelete.php
index f6086f18..16040e82 100644
--- a/app/Services/Logic/Review/ReviewDelete.php
+++ b/app/Services/Logic/Review/ReviewDelete.php
@@ -31,7 +31,7 @@ class ReviewDelete extends Service
 
         $this->decrCourseReviewCount($course);
 
-        $this->updateCourseRating($course->id);
+        $this->updateCourseRating($course);
     }
 
     protected function decrCourseReviewCount(CourseModel $course)
@@ -42,11 +42,11 @@ class ReviewDelete extends Service
         }
     }
 
-    protected function updateCourseRating($courseId)
+    protected function updateCourseRating(CourseModel $course)
     {
         $service = new CourseStatService();
 
-        $service->updateRating($courseId);
+        $service->updateRating($course->id);
     }
 
 }
diff --git a/app/Services/Logic/Review/ReviewUpdate.php b/app/Services/Logic/Review/ReviewUpdate.php
index dac4d046..0d942a6b 100644
--- a/app/Services/Logic/Review/ReviewUpdate.php
+++ b/app/Services/Logic/Review/ReviewUpdate.php
@@ -2,6 +2,7 @@
 
 namespace App\Services\Logic\Review;
 
+use App\Models\Course as CourseModel;
 use App\Services\CourseStat as CourseStatService;
 use App\Services\Logic\CourseTrait;
 use App\Services\Logic\ReviewTrait;
@@ -39,14 +40,14 @@ class ReviewUpdate extends Service
 
         $review->update($data);
 
-        $this->updateCourseRating($course->id);
+        $this->updateCourseRating($course);
     }
 
-    protected function updateCourseRating($courseId)
+    protected function updateCourseRating(CourseModel $course)
     {
         $service = new CourseStatService();
 
-        $service->updateRating($courseId);
+        $service->updateRating($course->id);
     }
 
 }
diff --git a/bootstrap/HttpKernel.php b/bootstrap/HttpKernel.php
index 648c905b..8e0ea783 100644
--- a/bootstrap/HttpKernel.php
+++ b/bootstrap/HttpKernel.php
@@ -113,10 +113,6 @@ class HttpKernel extends Kernel
                 'className' => 'App\Http\Home\Module',
                 'path' => app_path('Http/Home/Module.php'),
             ],
-            'mobile' => [
-                'className' => 'App\Http\Mobile\Module',
-                'path' => app_path('Http/Mobile/Module.php'),
-            ],
         ];
 
         $this->app->registerModules($modules);
diff --git a/config/routes.php b/config/routes.php
index c8308d4c..ea91b66c 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -23,15 +23,6 @@ foreach ($webFiles as $file) {
     }
 }
 
-$mobileFiles = scandir(app_path('Http/Mobile/Controllers'));
-
-foreach ($mobileFiles as $file) {
-    if (strpos($file, 'Controller.php')) {
-        $className = str_replace('Controller.php', '', $file);
-        $router->addModuleResource('mobile', 'App\Http\Mobile\Controllers\\' . $className);
-    }
-}
-
 $apiFiles = scandir(app_path('Http/Api/Controllers'));
 
 foreach ($apiFiles as $file) {

From f980964ba8bfcdca6e3f2747095abda1b260e8d7 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Thu, 26 Nov 2020 21:45:52 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=EF=BC=8Cmarkdown=E5=86=85=E5=AE=B9=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 24 ++++++++++---
 app/Http/Admin/Views/setting/storage.volt     |  4 +++
 app/Http/Api/Services/Account.php             |  4 ---
 .../Home/Controllers/PublicController.php     | 26 --------------
 .../Home/Controllers/UploadController.php     | 11 +++++-
 app/Http/Home/Views/course/show_teacher.volt  |  2 +-
 app/Http/Home/Views/user/show.volt            |  2 +-
 app/Library/Helper.php                        | 36 +++++++++++++++++++
 app/Models/Slide.php                          |  2 +-
 app/Services/Logic/Course/BasicInfo.php       |  2 ++
 app/Services/Logic/Help/HelpInfo.php          |  4 +++
 app/Services/Logic/Page/PageInfo.php          |  2 ++
 app/Traits/Auth.php                           |  2 +-
 app/Validators/Course.php                     |  2 +-
 app/Validators/ImGroup.php                    |  2 +-
 app/Validators/Slide.php                      | 13 +------
 app/Validators/User.php                       |  2 +-
 app/Validators/Validator.php                  |  4 +--
 public/static/admin/js/vditor.js              |  2 +-
 19 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/README.md b/README.md
index 8e45f66a..fc674653 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,15 @@
 ## 酷瓜云课堂
 
+![酷瓜云课堂](https://upload-images.jianshu.io/upload_images/326350-dd52d4e6ad576989.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
+
 #### 项目介绍
 
-酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展PHP框架Phalcon开发，致力开源网课系统，开源网校系统，开源在线教育系统。
+酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展框架Phalcon开发，GPL-2.0开源协议，致力开源网课系统，开源网校系统，开源在线教育系统。
+
+![](https://img.shields.io/static/v1?label=release&message=1.2.0&color=blue)
+![](https://img.shields.io/static/v1?label=stars&message=101&color=blue)
+![](https://img.shields.io/static/v1?label=forks&message=40&color=blue)
+![](https://img.shields.io/static/v1?label=license&message=GPL-2.0&color=blue)
 
 #### 系统功能
 
@@ -14,7 +21,9 @@
 - 课程数据来源于网络（无实质内容），切莫购买
 - 管理后台已禁止数据提交，私密配置已过滤
 
-演示帐号：100015@163.com / 123456 (前后台通用)
+演示帐号：**13507083515 / 123456** （前后台通用）
+
+桌面端演示：
 
 - [前台演示](https://ctc.koogua.com)
 - [后台演示](https://ctc.koogua.com/admin)
@@ -23,6 +32,14 @@
 
 ![移动端扫码演示](https://upload-images.jianshu.io/upload_images/326350-83444e0bbe14db9f.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
 
+支付流程演示：
+
+- [MySQL提升课程全面讲解MySQL架构设计（0.01元）](https://ctc.koogua.com/order/confirm?item_id=1390&item_type=1)
+- [Nginx入门到实践Nginx中间件（0.01元）](https://ctc.koogua.com/order/confirm?item_id=1286&item_type=1)
+- [数据库与中间件的基础必修课（0.02元）](https://ctc.koogua.com/order/confirm?item_id=80&item_type=2)
+
+Tips: 测试支付请用手机号注册一个新账户，以便接收订单通知，以及避免课程无法购买
+ 
 #### 项目组件
 
 - 后台框架：[phalcon 3.4.5](https://phalcon.io)
@@ -45,8 +62,7 @@
 #### 意见反馈
 
 - [在线反馈](https://gitee.com/koogua/course-tencent-cloud/issues)（推荐）
-- QQ邮箱: 76632555@qq.com
-- QQ群组: 787363898
+- QQ交流群: 787363898
 
 #### 通过这个项目能学到什么？
 
diff --git a/app/Http/Admin/Views/setting/storage.volt b/app/Http/Admin/Views/setting/storage.volt
index 34ab1e62..9b1d2d6e 100644
--- a/app/Http/Admin/Views/setting/storage.volt
+++ b/app/Http/Admin/Views/setting/storage.volt
@@ -55,6 +55,10 @@
                     <td>cover_270</td>
                     <td>mageMogr2/thumbnail/270x/interlace/0</td>
                 </tr>
+                <tr>
+                    <td>content_800</td>
+                    <td>mageMogr2/thumbnail/800x/interlace/0</td>
+                </tr>
                 <tr>
                     <td>slide_1100</td>
                     <td>imageMogr2/thumbnail/1100x/interlace/0</td>
diff --git a/app/Http/Api/Services/Account.php b/app/Http/Api/Services/Account.php
index 96d09ce6..baf537f8 100644
--- a/app/Http/Api/Services/Account.php
+++ b/app/Http/Api/Services/Account.php
@@ -50,10 +50,6 @@ class Account extends Service
 
         $user = $validator->checkUserLogin($post['account'], $post['password']);
 
-        //$validator = new CaptchaValidator();
-
-        //$validator->checkCode($post['ticket'], $post['rand']);
-
         return $this->auth->saveAuthInfo($user);
     }
 
diff --git a/app/Http/Home/Controllers/PublicController.php b/app/Http/Home/Controllers/PublicController.php
index 63eb1e37..21e28b1e 100644
--- a/app/Http/Home/Controllers/PublicController.php
+++ b/app/Http/Home/Controllers/PublicController.php
@@ -10,7 +10,6 @@ use App\Services\Pay\Wxpay as WxpayService;
 use App\Services\Storage as StorageService;
 use App\Traits\Response as ResponseTrait;
 use App\Traits\Security as SecurityTrait;
-use Phalcon\Text;
 use PHPQRCode\QRcode;
 
 class PublicController extends \Phalcon\Mvc\Controller
@@ -44,31 +43,6 @@ class PublicController extends \Phalcon\Mvc\Controller
         }
     }
 
-    /**
-     * @Get("/img/{id:[0-9]+}", name="home.img")
-     */
-    public function imageAction($id)
-    {
-        $repo = new UploadRepo();
-
-        $file = $repo->findById($id);
-
-        if ($file && Text::startsWith($file->mime, 'image')) {
-
-            $service = new StorageService();
-
-            $location = $service->getImageUrl($file->path);
-
-            $this->response->redirect($location);
-
-        } else {
-
-            $this->response->setStatusCode(404);
-
-            return $this->response;
-        }
-    }
-
     /**
      * @Get("/qrcode", name="home.qrcode")
      */
diff --git a/app/Http/Home/Controllers/UploadController.php b/app/Http/Home/Controllers/UploadController.php
index e7877cf0..351f25cb 100644
--- a/app/Http/Home/Controllers/UploadController.php
+++ b/app/Http/Home/Controllers/UploadController.php
@@ -1,9 +1,9 @@
 <?php
 
-
 namespace App\Http\Home\Controllers;
 
 use App\Services\MyStorage as StorageService;
+use App\Validators\Validator as AppValidator;
 
 /**
  * @RoutePrefix("/upload")
@@ -11,6 +11,15 @@ use App\Services\MyStorage as StorageService;
 class UploadController extends Controller
 {
 
+    public function initialize()
+    {
+        $authUser = $this->getAuthUser();
+
+        $validator = new AppValidator();
+
+        $validator->checkAuthUser($authUser->id);
+    }
+
     /**
      * @Post("/avatar/img", name="home.upload.avatar_img")
      */
diff --git a/app/Http/Home/Views/course/show_teacher.volt b/app/Http/Home/Views/course/show_teacher.volt
index 9a6ed5cd..e6e7a5b3 100644
--- a/app/Http/Home/Views/course/show_teacher.volt
+++ b/app/Http/Home/Views/course/show_teacher.volt
@@ -8,7 +8,7 @@
                     {% set teacher.title = teacher.title ? teacher.title : '小小教书匠' %}
                     <div class="sidebar-teacher-card clearfix">
                         <div class="avatar">
-                            <img src="{{ teacher.avatar }}" alt="{{ teacher.name }}">
+                            <img src="{{ teacher.avatar }}!avatar_160" alt="{{ teacher.name }}">
                         </div>
                         <div class="info">
                             <div class="name layui-elip">
diff --git a/app/Http/Home/Views/user/show.volt b/app/Http/Home/Views/user/show.volt
index e10da454..80f762f0 100644
--- a/app/Http/Home/Views/user/show.volt
+++ b/app/Http/Home/Views/user/show.volt
@@ -25,7 +25,7 @@
     <div class="user-profile wrap clearfix">
         {{ vip_info(user.vip) }}
         <div class="avatar">
-            <img src="{{ user.avatar }}" alt="{{ user.name }}">
+            <img src="{{ user.avatar }}!avatar_160" alt="{{ user.name }}">
         </div>
         <div class="info">
             <p><span class="name">{{ user.name }}</span><span>{{ gender_icon(user.gender) }}</span></p>
diff --git a/app/Library/Helper.php b/app/Library/Helper.php
index 9377e4b1..e7af42e4 100644
--- a/app/Library/Helper.php
+++ b/app/Library/Helper.php
@@ -246,6 +246,42 @@ function kg_cos_cover_url($path, $style = null)
     return kg_cos_img_url($path, $style);
 }
 
+/**
+ * 获取幻灯片URL
+ *
+ * @param string $path
+ * @param string $style
+ * @return string
+ */
+function kg_cos_slide_url($path, $style = null)
+{
+    return kg_cos_img_url($path, $style);
+}
+
+/**
+ * 清除存储图片处理样式
+ *
+ * @param $path
+ * @return string
+ */
+function kg_cos_img_style_trim($path)
+{
+    return preg_replace('/!\w+/', '', $path);
+}
+
+/**
+ * 解析markdown内容
+ *
+ * @param $content
+ * @return string
+ */
+function kg_parse_markdown($content)
+{
+    return preg_replace_callback('/\/img\/content\/(.*?)\)/', function ($matches) {
+        return '/img/content/' . trim($matches[1]) . '!content_800';
+    }, $content);
+}
+
 /**
  * 隐藏部分字符
  *
diff --git a/app/Models/Slide.php b/app/Models/Slide.php
index f99200fe..d5675fff 100644
--- a/app/Models/Slide.php
+++ b/app/Models/Slide.php
@@ -143,7 +143,7 @@ class Slide extends Model
     public function afterFetch()
     {
         if (!Text::startsWith($this->cover, 'http')) {
-            $this->cover = kg_cos_cover_url($this->cover);
+            $this->cover = kg_cos_slide_url($this->cover);
         }
     }
 
diff --git a/app/Services/Logic/Course/BasicInfo.php b/app/Services/Logic/Course/BasicInfo.php
index ad16bb4d..8630c637 100644
--- a/app/Services/Logic/Course/BasicInfo.php
+++ b/app/Services/Logic/Course/BasicInfo.php
@@ -22,6 +22,8 @@ class BasicInfo extends Service
 
     public function handleBasicInfo(CourseModel $course)
     {
+        $course->details = kg_parse_markdown($course->details);
+
         $teachers = $this->handleTeachers($course);
         $ratings = $this->handleRatings($course);
 
diff --git a/app/Services/Logic/Help/HelpInfo.php b/app/Services/Logic/Help/HelpInfo.php
index 3ca3bafd..75b5a8ee 100644
--- a/app/Services/Logic/Help/HelpInfo.php
+++ b/app/Services/Logic/Help/HelpInfo.php
@@ -20,10 +20,14 @@ class HelpInfo extends Service
 
     protected function handleHelp(HelpModel $help)
     {
+        $help->content = kg_parse_markdown($help->content);
+
         return [
             'id' => $help->id,
             'title' => $help->title,
             'content' => $help->content,
+            'create_time' => $help->create_time,
+            'update_time' => $help->update_time,
         ];
     }
 
diff --git a/app/Services/Logic/Page/PageInfo.php b/app/Services/Logic/Page/PageInfo.php
index 80f3b879..9b960599 100644
--- a/app/Services/Logic/Page/PageInfo.php
+++ b/app/Services/Logic/Page/PageInfo.php
@@ -20,6 +20,8 @@ class PageInfo extends Service
 
     protected function handlePage(PageModel $page)
     {
+        $page->content = kg_parse_markdown($page->content);
+
         return [
             'id' => $page->id,
             'title' => $page->title,
diff --git a/app/Traits/Auth.php b/app/Traits/Auth.php
index 1524fa90..6cde45db 100644
--- a/app/Traits/Auth.php
+++ b/app/Traits/Auth.php
@@ -46,7 +46,7 @@ trait Auth
 
         $validator = new AppValidator();
 
-        $validator->checkAuthUser($authUser);
+        $validator->checkAuthUser($authUser['id']);
 
         $userRepo = new UserRepo();
 
diff --git a/app/Validators/Course.php b/app/Validators/Course.php
index 3bafb387..65b157a7 100644
--- a/app/Validators/Course.php
+++ b/app/Validators/Course.php
@@ -90,7 +90,7 @@ class Course extends Validator
             throw new BadRequestException('course.invalid_cover');
         }
 
-        return $value;
+        return kg_cos_img_style_trim($value);
     }
 
     public function checkTitle($title)
diff --git a/app/Validators/ImGroup.php b/app/Validators/ImGroup.php
index 80c042f5..d2118a43 100644
--- a/app/Validators/ImGroup.php
+++ b/app/Validators/ImGroup.php
@@ -98,7 +98,7 @@ class ImGroup extends Validator
             throw new BadRequestException('im_group.invalid_avatar');
         }
 
-        return $value;
+        return kg_cos_img_style_trim($value);
     }
 
     public function checkType($type)
diff --git a/app/Validators/Slide.php b/app/Validators/Slide.php
index df354a26..86892ce3 100644
--- a/app/Validators/Slide.php
+++ b/app/Validators/Slide.php
@@ -64,18 +64,7 @@ class Slide extends Validator
             throw new BadRequestException('slide.invalid_cover');
         }
 
-        return $value;
-    }
-
-    public function checkBgColor($bgColor)
-    {
-        $value = $this->filter->sanitize($bgColor, ['trim', 'string']);
-
-        if (!preg_match('/^#[0-9a-fA-F]{6}$/', $bgColor)) {
-            throw new BadRequestException('slide.invalid_bg_color');
-        }
-
-        return $value;
+        return kg_cos_img_style_trim($value);
     }
 
     public function checkPlatform($platform)
diff --git a/app/Validators/User.php b/app/Validators/User.php
index ac45c08b..36c4c1db 100644
--- a/app/Validators/User.php
+++ b/app/Validators/User.php
@@ -137,7 +137,7 @@ class User extends Validator
             throw new BadRequestException('user.invalid_avatar');
         }
 
-        return $value;
+        return kg_cos_img_style_trim($value);
     }
 
     public function checkEduRole($value)
diff --git a/app/Validators/Validator.php b/app/Validators/Validator.php
index 2f3a8091..3d6352c9 100644
--- a/app/Validators/Validator.php
+++ b/app/Validators/Validator.php
@@ -9,9 +9,9 @@ use Phalcon\Mvc\User\Component;
 class Validator extends Component
 {
 
-    public function checkAuthUser($authInfo)
+    public function checkAuthUser($userId)
     {
-        if (empty($authInfo['id'])) {
+        if (empty($userId)) {
             throw new UnauthorizedException('sys.unauthorized');
         }
     }
diff --git a/public/static/admin/js/vditor.js b/public/static/admin/js/vditor.js
index d04245fe..15339fcd 100644
--- a/public/static/admin/js/vditor.js
+++ b/public/static/admin/js/vditor.js
@@ -24,7 +24,7 @@ layui.use(['jquery'], function () {
             max: 30000
         },
         upload: {
-            url: '/admin/upload/img/editor',
+            url: '/admin/upload/content/img',
             max: 10 * 1024 * 1024,
             accept: 'image/*',
             headers: {

From a6a6475f8532dc8f35cbb028b9058c555375e4e0 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Fri, 27 Nov 2020 09:34:56 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E6=9B=B4=E6=8D=A2README.md=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E7=AE=80=E4=B9=A6=E5=9B=BE=E5=BA=8A=E4=B8=BAgitee?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fc674653..1d264fff 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## 酷瓜云课堂
 
-![酷瓜云课堂](https://upload-images.jianshu.io/upload_images/326350-dd52d4e6ad576989.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
+![酷瓜云网课GPL协议开源](https://images.gitee.com/uploads/images/2020/1127/092621_3805cf8f_23592.png)
 
 #### 项目介绍
 
@@ -30,7 +30,7 @@
 
 移动端演示：
 
-![移动端扫码演示](https://upload-images.jianshu.io/upload_images/326350-83444e0bbe14db9f.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
+![移动端二维码](https://images.gitee.com/uploads/images/2020/1127/093203_265221a2_23592.png)
 
 支付流程演示：