diff --git a/app/Caches/MaxPointGiftId.php b/app/Caches/MaxPointGiftId.php
new file mode 100644
index 00000000..6c85c10a
--- /dev/null
+++ b/app/Caches/MaxPointGiftId.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Caches;
+
+use App\Models\PointGift as PointGiftModel;
+
+class MaxPointGiftId extends Cache
+{
+
+    protected $lifetime = 365 * 86400;
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return 'max_point_gift_id';
+    }
+
+    public function getContent($id = null)
+    {
+        $gift = PointGiftModel::findFirst(['order' => 'id DESC']);
+
+        return $gift->id ?? 0;
+    }
+
+}
diff --git a/app/Caches/PointGift.php b/app/Caches/PointGift.php
new file mode 100644
index 00000000..6a027a71
--- /dev/null
+++ b/app/Caches/PointGift.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Caches;
+
+use App\Repos\PointGift as PointGiftRepo;
+
+class PointGift extends Cache
+{
+
+    protected $lifetime = 365 * 86400;
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return "point_gift:{$id}";
+    }
+
+    public function getContent($id = null)
+    {
+        $giftRepo = new PointGiftRepo();
+
+        $gift = $giftRepo->findById($id);
+
+        return $gift ?: null;
+    }
+
+}
diff --git a/app/Caches/PointHotGiftList.php b/app/Caches/PointHotGiftList.php
new file mode 100644
index 00000000..30ae8aa6
--- /dev/null
+++ b/app/Caches/PointHotGiftList.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Caches;
+
+use App\Models\PointGift as PointGiftModel;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class PointHotGiftList extends Cache
+{
+
+    /**
+     * 过期时间
+     *
+     * @var int
+     */
+    protected $lifetime = 1 * 86400;
+
+    /**
+     * 显示个数
+     *
+     * @var int
+     */
+    protected $limit = 5;
+
+    public function setLimit($limit)
+    {
+        $this->limit = $limit;
+    }
+
+    public function getLifetime()
+    {
+        return $this->lifetime;
+    }
+
+    public function getKey($id = null)
+    {
+        return 'point_hot_gift_list';
+    }
+
+    public function getContent($id = null)
+    {
+        $gifts = $this->findGifts($this->limit);
+
+        if (count($gifts) == 0) {
+            return [];
+        }
+
+        $result = [];
+
+        foreach ($gifts as $gift) {
+            $result[] = [
+                'id' => $gift->id,
+                'name' => $gift->name,
+                'cover' => $gift->cover,
+                'details' => $gift->details,
+                'type' => $gift->type,
+                'point' => $gift->point,
+                'redeem_count' => $gift->redeem_count,
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param int $limit
+     * @return ResultsetInterface|Resultset|PointGiftModel[]
+     */
+    protected function findGifts($limit = 5)
+    {
+        return PointGiftModel::query()
+            ->where('published = 1')
+            ->orderBy('redeem_count DESC')
+            ->limit($limit)
+            ->execute();
+    }
+
+}
diff --git a/app/Console/Tasks/CleanLogTask.php b/app/Console/Tasks/CleanLogTask.php
index 725dfa6c..e198d702 100644
--- a/app/Console/Tasks/CleanLogTask.php
+++ b/app/Console/Tasks/CleanLogTask.php
@@ -25,6 +25,7 @@ class CleanLogTask extends Task
         $this->cleanWxpayLog();
         $this->cleanOrderLog();
         $this->cleanRefundLog();
+        $this->cleanPointLog();
         $this->cleanNoticeLog();
         $this->cleanOtherLog();
     }
@@ -221,6 +222,18 @@ class CleanLogTask extends Task
         $this->whitelist[] = $type;
     }
 
+    /**
+     * 清理积分日志
+     */
+    protected function cleanPointLog()
+    {
+        $type = 'point';
+
+        $this->cleanLog($type, 7);
+
+        $this->whitelist[] = $type;
+    }
+
     /**
      * 清理通知日志
      */
diff --git a/app/Console/Tasks/CloseTradeTask.php b/app/Console/Tasks/CloseTradeTask.php
index 3918d40c..efe84b3a 100644
--- a/app/Console/Tasks/CloseTradeTask.php
+++ b/app/Console/Tasks/CloseTradeTask.php
@@ -48,7 +48,7 @@ class CloseTradeTask extends Task
              */
             if ($alipayTrade->trade_status == 'TRADE_SUCCESS') {
 
-                $this->eventsManager->fire('pay:afterPay', $this, $trade);
+                $this->eventsManager->fire('Trade:afterPay', $this, $trade);
 
                 $allowClosed = false;
 
@@ -85,7 +85,7 @@ class CloseTradeTask extends Task
              */
             if ($wxpayTrade->trade_state == 'SUCCESS') {
 
-                $this->eventsManager->fire('pay:afterPay', $this, $trade);
+                $this->eventsManager->fire('Trade:afterPay', $this, $trade);
 
                 $allowClosed = false;
 
diff --git a/app/Console/Tasks/DeliverTask.php b/app/Console/Tasks/DeliverTask.php
index 874401a4..d41a22b7 100644
--- a/app/Console/Tasks/DeliverTask.php
+++ b/app/Console/Tasks/DeliverTask.php
@@ -13,6 +13,7 @@ use App\Repos\ImGroupUser as ImGroupUserRepo;
 use App\Repos\Order as OrderRepo;
 use App\Repos\User as UserRepo;
 use App\Services\Logic\Notice\OrderFinish as OrderFinishNotice;
+use App\Services\Logic\Point\PointHistory as PointHistoryService;
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
@@ -36,17 +37,20 @@ class DeliverTask extends Task
 
         foreach ($tasks as $task) {
 
-            /**
-             * @var array $itemInfo
-             */
-            $itemInfo = $task->item_info;
+            $orderId = $task->item_info['order']['id'] ?? 0;
 
-            $order = $orderRepo->findById($itemInfo['order']['id']);
+            $order = $orderRepo->findById($orderId);
 
-            if (!$order) continue;
+            if (!$order) {
+                $task->status = TaskModel::STATUS_FAILED;
+                $task->update();
+                continue;
+            }
 
             try {
 
+                $this->db->begin();
+
                 switch ($order->item_type) {
                     case OrderModel::ITEM_COURSE:
                         $this->handleCourseOrder($order);
@@ -59,14 +63,24 @@ class DeliverTask extends Task
                         break;
                 }
 
-                $this->finishOrder($order);
+                $order->status = OrderModel::STATUS_FINISHED;
+
+                if ($order->update() === false) {
+                    throw new \RuntimeException('Update Order Status Failed');
+                }
 
                 $task->status = TaskModel::STATUS_FINISHED;
 
-                $task->update();
+                if ($task->update() === false) {
+                    throw new \RuntimeException('Update Task Status Failed');
+                }
+
+                $this->db->commit();
 
             } catch (\Exception $e) {
 
+                $this->db->rollback();
+
                 $task->try_count += 1;
                 $task->priority += 1;
 
@@ -76,14 +90,16 @@ class DeliverTask extends Task
 
                 $task->update();
 
-                $logger->info('Order Process Exception ' . kg_json_encode([
-                        'code' => $e->getCode(),
+                $logger->error('Order Process Exception ' . kg_json_encode([
+                        'file' => $e->getFile(),
+                        'line' => $e->getLine(),
                         'message' => $e->getMessage(),
                         'task' => $task->toArray(),
                     ]));
             }
 
             if ($task->status == TaskModel::STATUS_FINISHED) {
+                $this->handleOrderConsumePoint($order);
                 $this->handleOrderFinishNotice($order);
             } elseif ($task->status == TaskModel::STATUS_FAILED) {
                 $this->handleOrderRefund($order);
@@ -91,20 +107,8 @@ class DeliverTask extends Task
         }
     }
 
-    protected function finishOrder(OrderModel $order)
-    {
-        $order->status = OrderModel::STATUS_FINISHED;
-
-        if ($order->update() === false) {
-            throw new \RuntimeException('Finish Order Failed');
-        }
-    }
-
     protected function handleCourseOrder(OrderModel $order)
     {
-        /**
-         * @var array $itemInfo
-         */
         $itemInfo = $order->item_info;
 
         $courseUser = new CourseUserModel();
@@ -127,23 +131,21 @@ class DeliverTask extends Task
 
         $groupUser = $groupUserRepo->findGroupUser($group->id, $order->owner_id);
 
-        if ($groupUser) return;
+        if (!$groupUser) {
 
-        $groupUser = new ImGroupUserModel();
+            $groupUser = new ImGroupUserModel();
 
-        $groupUser->group_id = $group->id;
-        $groupUser->user_id = $order->owner_id;
+            $groupUser->group_id = $group->id;
+            $groupUser->user_id = $order->owner_id;
 
-        if ($groupUser->create() === false) {
-            throw new \RuntimeException('Create Group User Failed');
+            if ($groupUser->create() === false) {
+                throw new \RuntimeException('Create Group User Failed');
+            }
         }
     }
 
     protected function handlePackageOrder(OrderModel $order)
     {
-        /**
-         * @var array $itemInfo
-         */
         $itemInfo = $order->item_info;
 
         foreach ($itemInfo['courses'] as $course) {
@@ -168,24 +170,24 @@ class DeliverTask extends Task
 
             $groupUser = $groupUserRepo->findGroupUser($group->id, $order->owner_id);
 
-            if ($groupUser) continue;
+            if (!$groupUser) {
 
-            $groupUser = new ImGroupUserModel();
+                $groupUser = new ImGroupUserModel();
 
-            $groupUser->group_id = $group->id;
-            $groupUser->user_id = $order->owner_id;
+                $groupUser->group_id = $group->id;
+                $groupUser->user_id = $order->owner_id;
 
-            if ($groupUser->create() === false) {
-                throw new \RuntimeException('Create Group User Failed');
+                if ($groupUser->create() === false) {
+                    throw new \RuntimeException('Create Group User Failed');
+                }
+
+                continue;
             }
         }
     }
 
     protected function handleVipOrder(OrderModel $order)
     {
-        /**
-         * @var array $itemInfo
-         */
         $itemInfo = $order->item_info;
 
         $userRepo = new UserRepo();
@@ -199,6 +201,13 @@ class DeliverTask extends Task
         }
     }
 
+    protected function handleOrderConsumePoint(OrderModel $order)
+    {
+        $service = new PointHistoryService();
+
+        $service->handleOrderConsume($order);
+    }
+
     protected function handleOrderFinishNotice(OrderModel $order)
     {
         $notice = new OrderFinishNotice();
diff --git a/app/Console/Tasks/NoticeTask.php b/app/Console/Tasks/NoticeTask.php
index b736b80c..7d17318d 100644
--- a/app/Console/Tasks/NoticeTask.php
+++ b/app/Console/Tasks/NoticeTask.php
@@ -66,7 +66,6 @@ class NoticeTask extends Task
                 $logger->info('Notice Process Exception ' . kg_json_encode([
                         'file' => $e->getFile(),
                         'line' => $e->getLine(),
-                        'code' => $e->getCode(),
                         'message' => $e->getMessage(),
                         'task' => $task->toArray(),
                     ]));
diff --git a/app/Console/Tasks/PointGiftDeliverTask.php b/app/Console/Tasks/PointGiftDeliverTask.php
new file mode 100644
index 00000000..0f8baac9
--- /dev/null
+++ b/app/Console/Tasks/PointGiftDeliverTask.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace App\Console\Tasks;
+
+use App\Models\CourseUser as CourseUserModel;
+use App\Models\ImGroupUser as ImGroupUserModel;
+use App\Models\PointGift as PointGiftModel;
+use App\Models\PointRedeem as PointRedeemModel;
+use App\Models\Task as TaskModel;
+use App\Repos\Course as CourseRepo;
+use App\Repos\CourseUser as CourseUserRepo;
+use App\Repos\ImGroup as ImGroupRepo;
+use App\Repos\ImGroupUser as ImGroupUserRepo;
+use App\Repos\PointGift as PointGiftRepo;
+use App\Repos\PointRedeem as PointRedeemRepo;
+use App\Services\Logic\Point\PointHistory as PointHistoryService;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class PointGiftDeliverTask extends Task
+{
+
+    const TRY_COUNT = 3;
+
+    public function mainAction()
+    {
+        $logger = $this->getLogger('point');
+
+        $tasks = $this->findTasks(30);
+
+        if ($tasks->count() == 0) {
+            return;
+        }
+
+        $redeemRepo = new PointRedeemRepo();
+
+        foreach ($tasks as $task) {
+
+            $redeemId = $task->item_info['point_redeem']['id'] ?? 0;
+
+            $redeem = $redeemRepo->findById($redeemId);
+
+            if (!$redeem) {
+                $task->status = TaskModel::STATUS_FAILED;
+                $task->update();
+                break;
+            }
+
+            try {
+
+                $this->db->begin();
+
+                switch ($redeem->gift_type) {
+                    case PointGiftModel::TYPE_COURSE:
+                        $this->handleCourseRedeem($redeem);
+                        break;
+                    case PointGiftModel::TYPE_GOODS:
+                        $this->handleGoodsRedeem($redeem);
+                        break;
+                    case PointGiftModel::TYPE_CASH:
+                        $this->handleCashRedeem($redeem);
+                        break;
+                }
+
+                $task->status = TaskModel::STATUS_FINISHED;
+
+                if ($task->update() === false) {
+                    throw new \RuntimeException('Update Task Status Failed');
+                }
+
+                $this->db->commit();
+
+            } catch (\Exception $e) {
+
+                $this->db->rollback();
+
+                $task->try_count += 1;
+                $task->priority += 1;
+
+                if ($task->try_count > self::TRY_COUNT) {
+                    $task->status = TaskModel::STATUS_FAILED;
+                }
+
+                $task->update();
+
+                $logger->error('Point Gift Deliver Exception ' . kg_json_encode([
+                        'file' => $e->getFile(),
+                        'line' => $e->getLine(),
+                        'message' => $e->getMessage(),
+                        'task' => $task->toArray(),
+                    ]));
+            }
+
+            if ($task->status == TaskModel::STATUS_FAILED) {
+                $this->handlePointRefund($redeem);
+            }
+        }
+    }
+
+    protected function handleCourseRedeem(PointRedeemModel $redeem)
+    {
+        $giftRepo = new PointGiftRepo();
+
+        $gift = $giftRepo->findById($redeem->gift_id);
+
+        if (!$gift) {
+            throw new \RuntimeException('Gift Not Found');
+        }
+
+        $courseRepo = new CourseRepo();
+
+        $course = $courseRepo->findById($gift->attrs['id']);
+
+        if (!$course) {
+            throw new \RuntimeException('Course Not Found');
+        }
+
+        $groupRepo = new ImGroupRepo();
+
+        $group = $groupRepo->findByCourseId($course->id);
+
+        if (!$group) {
+            throw new \RuntimeException('Im Group Not Found');
+        }
+
+        $courseUserRepo = new CourseUserRepo();
+
+        $courseUser = $courseUserRepo->findCourseUser($course->id, $redeem->user_id);
+
+        if (!$courseUser) {
+
+            $courseUser = new CourseUserModel();
+
+            $courseUser->user_id = $redeem->user_id;
+            $courseUser->course_id = $course->id;
+            $courseUser->expiry_time = strtotime("+{$course->study_expiry} months");
+            $courseUser->role_type = CourseUserModel::ROLE_STUDENT;
+            $courseUser->source_type = CourseUserModel::SOURCE_POINT_REDEEM;
+
+            if ($courseUser->create() === false) {
+                throw new \RuntimeException('Create Course User Failed');
+            }
+        }
+
+        $groupUserRepo = new ImGroupUserRepo();
+
+        $groupUser = $groupUserRepo->findGroupUser($group->id, $redeem->user_id);
+
+        if (!$groupUser) {
+
+            $groupUser = new ImGroupUserModel();
+
+            $groupUser->group_id = $group->id;
+            $groupUser->user_id = $redeem->user_id;
+
+            if ($groupUser->create() === false) {
+                throw new \RuntimeException('Create Group User Failed');
+            }
+        }
+
+        $redeem->status = PointRedeemModel::STATUS_FINISHED;
+
+        if ($redeem->update() === false) {
+            throw new \RuntimeException('Update Redeem Status Failed');
+        }
+    }
+
+    protected function handleGoodsRedeem(PointRedeemModel $redeem)
+    {
+
+    }
+
+    protected function handleCashRedeem(PointRedeemModel $redeem)
+    {
+
+    }
+
+    protected function handlePointRefund(PointRedeemModel $redeem)
+    {
+        $service = new PointHistoryService();
+
+        $service->handlePointRefund($redeem);
+    }
+
+    protected function handleRedeemFinishNotice(PointRedeemModel $redeem)
+    {
+
+    }
+
+    /**
+     * @param int $limit
+     * @return ResultsetInterface|Resultset|TaskModel[]
+     */
+    protected function findTasks($limit = 30)
+    {
+        $itemType = TaskModel::TYPE_POINT_GIFT_DELIVER;
+        $status = TaskModel::STATUS_PENDING;
+        $createTime = strtotime('-3 days');
+
+        return TaskModel::query()
+            ->where('item_type = :item_type:', ['item_type' => $itemType])
+            ->andWhere('status = :status:', ['status' => $status])
+            ->andWhere('create_time > :create_time:', ['create_time' => $createTime])
+            ->orderBy('priority ASC')
+            ->limit($limit)
+            ->execute();
+    }
+
+}
diff --git a/app/Console/Tasks/RefundTask.php b/app/Console/Tasks/RefundTask.php
index 7529c242..4abc568e 100644
--- a/app/Console/Tasks/RefundTask.php
+++ b/app/Console/Tasks/RefundTask.php
@@ -41,9 +41,6 @@ class RefundTask extends Task
 
         foreach ($tasks as $task) {
 
-            /**
-             * @var array $itemInfo
-             */
             $itemInfo = $task->item_info;
 
             $refund = $refundRepo->findById($itemInfo['refund']['id']);
@@ -51,6 +48,8 @@ class RefundTask extends Task
             $order = $orderRepo->findById($itemInfo['refund']['order_id']);
 
             if (!$refund || !$trade || !$order) {
+                $task->status = TaskModel::STATUS_FAILED;
+                $task->update();
                 continue;
             }
 
@@ -111,7 +110,8 @@ class RefundTask extends Task
                 $task->update();
 
                 $logger->info('Refund Task Exception ' . kg_json_encode([
-                        'code' => $e->getCode(),
+                        'file' => $e->getFile(),
+                        'line' => $e->getLine(),
                         'message' => $e->getMessage(),
                         'task' => $task->toArray(),
                     ]));
@@ -148,7 +148,7 @@ class RefundTask extends Task
         }
 
         if (!$response) {
-            throw new \RuntimeException('Pay Refund Failed');
+            throw new \RuntimeException('Trade Refund Failed');
         }
     }
 
@@ -208,9 +208,6 @@ class RefundTask extends Task
     {
         $courseUserRepo = new CourseUserRepo();
 
-        /**
-         * @var array $itemInfo
-         */
         $itemInfo = $order->item_info;
 
         foreach ($itemInfo['courses'] as $course) {
@@ -239,9 +236,6 @@ class RefundTask extends Task
 
         $user = $userRepo->findById($order->owner_id);
 
-        /**
-         * @var array $itemInfo
-         */
         $itemInfo = $order->item_info;
 
         $diffTime = "-{$itemInfo['vip']['expiry']} months";
diff --git a/app/Console/Tasks/SyncLearningTask.php b/app/Console/Tasks/SyncLearningTask.php
index af1f41aa..2ba7a0e8 100644
--- a/app/Console/Tasks/SyncLearningTask.php
+++ b/app/Console/Tasks/SyncLearningTask.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Tasks;
 
+use App\Models\ChapterUser as ChapterUserModel;
 use App\Models\Course as CourseModel;
 use App\Models\Learning as LearningModel;
 use App\Repos\Chapter as ChapterRepo;
@@ -9,7 +10,8 @@ use App\Repos\ChapterUser as ChapterUserRepo;
 use App\Repos\Course as CourseRepo;
 use App\Repos\CourseUser as CourseUserRepo;
 use App\Repos\Learning as LearningRepo;
-use App\Services\Sync\Learning as LearningSync;
+use App\Services\Logic\Point\PointHistory as PointHistoryService;
+use App\Services\Sync\Learning as LearningSyncService;
 
 class SyncLearningTask extends Task
 {
@@ -18,7 +20,7 @@ class SyncLearningTask extends Task
     {
         $redis = $this->getRedis();
 
-        $sync = new LearningSync();
+        $sync = new LearningSyncService();
 
         $syncKey = $sync->getSyncKey();
 
@@ -120,7 +122,10 @@ class SyncLearningTask extends Task
         $chapterUser->update();
 
         if ($chapterUser->consumed == 1) {
+
             $this->updateCourseUser($learning);
+
+            $this->handleStudyPoint($chapterUser);
         }
     }
 
@@ -174,4 +179,14 @@ class SyncLearningTask extends Task
         $courseUser->update();
     }
 
+    /**
+     * @param ChapterUserModel $chapterUser
+     */
+    protected function handleStudyPoint(ChapterUserModel $chapterUser)
+    {
+        $service = new PointHistoryService();
+
+        $service->handleChapterStudy($chapterUser);
+    }
+
 }
diff --git a/app/Http/Admin/Controllers/Controller.php b/app/Http/Admin/Controllers/Controller.php
index 25899d50..9cfeb456 100644
--- a/app/Http/Admin/Controllers/Controller.php
+++ b/app/Http/Admin/Controllers/Controller.php
@@ -37,8 +37,6 @@ class Controller extends \Phalcon\Mvc\Controller
             $this->checkCsrfToken();
         }
 
-        $this->checkRateLimit();
-
         $this->authInfo = $this->getAuthInfo();
 
         if (!$this->authInfo) {
diff --git a/app/Http/Admin/Controllers/PointGiftController.php b/app/Http/Admin/Controllers/PointGiftController.php
new file mode 100644
index 00000000..fafda241
--- /dev/null
+++ b/app/Http/Admin/Controllers/PointGiftController.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace App\Http\Admin\Controllers;
+
+use App\Http\Admin\Services\PointGift as PointGiftService;
+
+/**
+ * @RoutePrefix("/admin/point/gift")
+ */
+class PointGiftController extends Controller
+{
+
+    /**
+     * @Get("/list", name="admin.point_gift.list")
+     */
+    public function listAction()
+    {
+        $giftService = new PointGiftService();
+
+        $pager = $giftService->getGifts();
+
+        $this->view->pick('point/gift/list');
+
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/add", name="admin.point_gift.add")
+     */
+    public function addAction()
+    {
+        $this->view->pick('point/gift/add');
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}/edit", name="admin.point_gift.edit")
+     */
+    public function editAction($id)
+    {
+        $giftService = new PointGiftService();
+
+        $gift = $giftService->getGift($id);
+
+        $this->view->pick('point/gift/edit');
+
+        $this->view->setVar('gift', $gift);
+    }
+
+    /**
+     * @Post("/create", name="admin.point_gift.create")
+     */
+    public function createAction()
+    {
+        $giftService = new PointGiftService();
+
+        $gift = $giftService->createGift();
+
+        $location = $this->url->get([
+            'for' => 'admin.point_gift.edit',
+            'id' => $gift->id,
+        ]);
+
+        $content = [
+            'location' => $location,
+            'msg' => '添加礼品成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/update", name="admin.point_gift.update")
+     */
+    public function updateAction($id)
+    {
+        $giftService = new PointGiftService();
+
+        $giftService->updateGift($id);
+
+        $location = $this->url->get(['for' => 'admin.point_gift.list']);
+
+        $content = [
+            'location' => $location,
+            'msg' => '更新礼品成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/delete", name="admin.point_gift.delete")
+     */
+    public function deleteAction($id)
+    {
+        $giftService = new PointGiftService();
+
+        $giftService->deleteGift($id);
+
+        $location = $this->request->getHTTPReferer();
+
+        $content = [
+            'location' => $location,
+            'msg' => '删除礼品成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/restore", name="admin.point_gift.restore")
+     */
+    public function restoreAction($id)
+    {
+        $giftService = new PointGiftService();
+
+        $giftService->restoreGift($id);
+
+        $location = $this->request->getHTTPReferer();
+
+        $content = [
+            'location' => $location,
+            'msg' => '还原礼品成功',
+        ];
+
+        return $this->jsonSuccess($content);
+    }
+
+}
diff --git a/app/Http/Admin/Controllers/PointRedeemController.php b/app/Http/Admin/Controllers/PointRedeemController.php
new file mode 100644
index 00000000..707403d3
--- /dev/null
+++ b/app/Http/Admin/Controllers/PointRedeemController.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Admin\Controllers;
+
+use App\Http\Admin\Services\PointRedeem as PointRedeemService;
+
+/**
+ * @RoutePrefix("/admin/point/redeem")
+ */
+class PointRedeemController extends Controller
+{
+
+    /**
+     * @Get("/search", name="admin.point_redeem.search")
+     */
+    public function searchAction()
+    {
+        $this->view->pick('point/redeem/search');
+    }
+
+    /**
+     * @Get("/list", name="admin.point_redeem.list")
+     */
+    public function listAction()
+    {
+        $redeemService = new PointRedeemService();
+
+        $pager = $redeemService->getRedeems();
+
+        $this->view->pick('point/redeem/list');
+
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Post("/{id:[0-9]+}/deliver", name="admin.point_redeem.deliver")
+     */
+    public function deliverAction($id)
+    {
+        $redeemService = new PointRedeemService();
+
+        $redeemService->deliver($id);
+
+        return $this->jsonSuccess(['msg' => '发货成功']);
+    }
+
+}
diff --git a/app/Http/Admin/Controllers/SettingController.php b/app/Http/Admin/Controllers/SettingController.php
index 7d949a67..76cff636 100644
--- a/app/Http/Admin/Controllers/SettingController.php
+++ b/app/Http/Admin/Controllers/SettingController.php
@@ -50,7 +50,7 @@ class SettingController extends Controller
 
             $data = $this->request->getPost();
 
-            $settingService->updateStorageSettings($section, $data);
+            $settingService->updateSettings($section, $data);
 
             return $this->jsonSuccess(['msg' => '更新配置成功']);
 
@@ -248,6 +248,31 @@ class SettingController extends Controller
         }
     }
 
+    /**
+     * @Route("/point", name="admin.setting.point")
+     */
+    public function pointAction()
+    {
+        $section = 'point';
+
+        $settingService = new SettingService();
+
+        if ($this->request->isPost()) {
+
+            $data = $this->request->getPost();
+
+            $settingService->updatePointSettings($section, $data);
+
+            return $this->jsonSuccess(['msg' => '更新配置成功']);
+
+        } else {
+
+            $point = $settingService->getSettings($section);
+
+            $this->view->setVar('point', $point);
+        }
+    }
+
     /**
      * @Route("/vip", name="admin.setting.vip")
      */
diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php
index 77104b1d..f29c29dc 100644
--- a/app/Http/Admin/Services/AuthNode.php
+++ b/app/Http/Admin/Services/AuthNode.php
@@ -476,6 +476,43 @@ class AuthNode extends Service
                         ],
                     ],
                 ],
+                [
+                    'id' => '2-8',
+                    'title' => '积分商城',
+                    'type' => 'menu',
+                    'children' => [
+                        [
+                            'id' => '2-8-1',
+                            'title' => '兑换记录',
+                            'type' => 'menu',
+                            'route' => 'admin.point_redeem.list',
+                        ],
+                        [
+                            'id' => '2-8-2',
+                            'title' => '礼品列表',
+                            'type' => 'menu',
+                            'route' => 'admin.point_gift.list',
+                        ],
+                        [
+                            'id' => '2-8-3',
+                            'title' => '添加礼品',
+                            'type' => 'menu',
+                            'route' => 'admin.point_gift.add',
+                        ],
+                        [
+                            'id' => '2-8-4',
+                            'title' => '编辑礼品',
+                            'type' => 'button',
+                            'route' => 'admin.point_gift.edit',
+                        ],
+                        [
+                            'id' => '2-8-5',
+                            'title' => '删除礼品',
+                            'type' => 'button',
+                            'route' => 'admin.point_gift.delete',
+                        ],
+                    ],
+                ],
             ],
         ];
     }
@@ -763,6 +800,12 @@ class AuthNode extends Service
                             'type' => 'menu',
                             'route' => 'admin.setting.wechat_oa',
                         ],
+                        [
+                            'id' => '5-1-14',
+                            'title' => '积分设置',
+                            'type' => 'menu',
+                            'route' => 'admin.setting.point',
+                        ],
                     ],
                 ],
             ],
diff --git a/app/Http/Admin/Services/PointGift.php b/app/Http/Admin/Services/PointGift.php
new file mode 100644
index 00000000..4a78efc0
--- /dev/null
+++ b/app/Http/Admin/Services/PointGift.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace App\Http\Admin\Services;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\PointGift as PointGiftModel;
+use App\Repos\PointGift as PointGiftRepo;
+use App\Validators\PointGift as PointGiftValidator;
+
+class PointGift extends Service
+{
+
+    public function getGifts()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['deleted'] = $params['deleted'] ?? 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $giftRepo = new PointGiftRepo();
+
+        return $giftRepo->paginate($params, $sort, $page, $limit);
+    }
+
+    public function getGift($id)
+    {
+        return $this->findOrFail($id);
+    }
+
+    public function createGift()
+    {
+        $post = $this->request->getPost();
+
+        $validator = new PointGiftValidator();
+
+        $post['type'] = $validator->checkType($post['type']);
+
+        $gift = new PointGiftModel();
+
+        switch ($post['type']) {
+            case PointGiftModel::TYPE_COURSE:
+                $gift = $this->createCourseGift($post);
+                break;
+            case PointGiftModel::TYPE_GOODS:
+                $gift = $this->createCommodityGift($post);
+                break;
+        }
+
+        return $gift;
+    }
+
+    public function updateGift($id)
+    {
+        $gift = $this->findOrFail($id);
+
+        $post = $this->request->getPost();
+
+        $validator = new PointGiftValidator();
+
+        $data = [];
+
+        if (isset($post['cover'])) {
+            $data['cover'] = $validator->checkCover($post['cover']);
+        }
+
+        if (isset($post['name'])) {
+            $data['name'] = $validator->checkName($post['name']);
+        }
+
+        if (isset($post['details'])) {
+            $data['details'] = $validator->checkDetails($post['details']);
+        }
+
+        if (isset($post['point'])) {
+            $data['point'] = $validator->checkPoint($post['point']);
+        }
+
+        if (isset($post['stock'])) {
+            $data['stock'] = $validator->checkStock($post['stock']);
+        }
+
+        if (isset($post['redeem_limit'])) {
+            $data['redeem_limit'] = $validator->checkRedeemLimit($post['redeem_limit']);
+        }
+
+        if (isset($post['published'])) {
+            $data['published'] = $validator->checkPublishStatus($post['published']);
+        }
+
+        $gift->update($data);
+
+        return $gift;
+    }
+
+    public function deleteGift($id)
+    {
+        $gift = $this->findOrFail($id);
+
+        $gift->deleted = 1;
+
+        $gift->update();
+
+        return $gift;
+    }
+
+    public function restoreGift($id)
+    {
+        $gift = $this->findOrFail($id);
+
+        $gift->deleted = 0;
+
+        $gift->update();
+
+        return $gift;
+    }
+
+    protected function createCourseGift($post)
+    {
+        $validator = new PointGiftValidator();
+
+        $course = $validator->checkCourse($post['course_id']);
+
+        $gift = new PointGiftModel();
+
+        $gift->type = PointGiftModel::TYPE_COURSE;
+        $gift->name = $course->title;
+
+        $gift->create();
+
+        return $gift;
+    }
+
+    protected function createCommodityGift($post)
+    {
+        $validator = new PointGiftValidator();
+
+        $gift = new PointGiftModel();
+
+        $gift->type = PointGiftModel::TYPE_GOODS;
+        $gift->name = $validator->checkName($post['name']);
+
+        $gift->create();
+
+        return $gift;
+    }
+
+    protected function findOrFail($id)
+    {
+        $validator = new PointGiftValidator();
+
+        return $validator->checkGift($id);
+    }
+
+}
diff --git a/app/Http/Admin/Services/PointRedeem.php b/app/Http/Admin/Services/PointRedeem.php
new file mode 100644
index 00000000..f3812807
--- /dev/null
+++ b/app/Http/Admin/Services/PointRedeem.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Admin\Services;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\PointGift as PointGiftModel;
+use App\Models\PointRedeem as PointRedeemModel;
+use App\Repos\PointRedeem as PointRedeemRepo;
+use App\Validators\PointRedeem as PointRedeemValidator;
+
+class PointRedeem extends Service
+{
+
+    public function getRedeems()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['deleted'] = $params['deleted'] ?? 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $redeemRepo = new PointRedeemRepo();
+
+        return $redeemRepo->paginate($params, $sort, $page, $limit);
+    }
+
+    public function getRedeem($id)
+    {
+        return $this->findOrFail($id);
+    }
+
+    public function deliver($id)
+    {
+        $redeem = $this->findOrFail($id);
+
+        if ($redeem->gift_type != PointGiftModel::TYPE_GOODS) {
+            return $redeem;
+        }
+
+        $redeem->status = PointRedeemModel::STATUS_FINISHED;
+
+        $redeem->update();
+
+        return $redeem;
+    }
+
+    protected function findOrFail($id)
+    {
+        $validator = new PointRedeemValidator();
+
+        return $validator->checkRedeem($id);
+    }
+
+}
diff --git a/app/Http/Admin/Services/Session.php b/app/Http/Admin/Services/Session.php
index fae5222b..b89a1499 100644
--- a/app/Http/Admin/Services/Session.php
+++ b/app/Http/Admin/Services/Session.php
@@ -50,11 +50,17 @@ class Session extends Service
         $this->handleLoginNotice($user);
 
         $this->auth->saveAuthInfo($user);
+
+        $this->eventsManager->fire('Account:afterLogin', $this, $user);
     }
 
     public function logout()
     {
+        $user = $this->getLoginUser();
+
         $this->auth->clearAuthInfo();
+
+        $this->eventsManager->fire('Account:afterLogout', $this, $user);
     }
 
     protected function handleLoginNotice(UserModel $user)
diff --git a/app/Http/Admin/Services/Setting.php b/app/Http/Admin/Services/Setting.php
index 3ce3f6ac..35ff796c 100644
--- a/app/Http/Admin/Services/Setting.php
+++ b/app/Http/Admin/Services/Setting.php
@@ -189,6 +189,19 @@ class Setting extends Service
         $this->updateSettings($section, $settings);
     }
 
+    public function updatePointSettings($section, $settings)
+    {
+        if (isset($settings['event_rule'])) {
+            $settings['event_rule'] = kg_json_encode($settings['event_rule']);
+        }
+
+        if (isset($settings['consume_rule'])) {
+            $settings['consume_rule'] = kg_json_encode($settings['consume_rule']);
+        }
+
+        $this->updateSettings($section, $settings);
+    }
+
     public function updateVipSettings($items)
     {
         $vipRepo = new VipRepo();
diff --git a/app/Http/Admin/Services/Topic.php b/app/Http/Admin/Services/Topic.php
index ac8289bf..7b0f2544 100644
--- a/app/Http/Admin/Services/Topic.php
+++ b/app/Http/Admin/Services/Topic.php
@@ -3,7 +3,6 @@
 namespace App\Http\Admin\Services;
 
 use App\Caches\Topic as TopicCache;
-use App\Caches\TopicCourseList as TopicCourseListCache;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Models\CourseTopic as CourseTopicModel;
 use App\Models\Topic as TopicModel;
@@ -66,8 +65,8 @@ class Topic extends Service
 
         $data = [];
 
-        if (isset($post['name'])) {
-            $data['name'] = $validator->checkName($post['name']);
+        if (isset($post['title'])) {
+            $data['title'] = $validator->checkTitle($post['title']);
         }
 
         if (isset($post['summary'])) {
@@ -194,10 +193,6 @@ class Topic extends Service
         $cache = new TopicCache();
 
         $cache->rebuild($topic->id);
-
-        $cache = new TopicCourseListCache();
-
-        $cache->rebuild($topic->id);
     }
 
     protected function findOrFail($id)
diff --git a/app/Http/Admin/Views/macros/point.volt b/app/Http/Admin/Views/macros/point.volt
new file mode 100644
index 00000000..8b2d6093
--- /dev/null
+++ b/app/Http/Admin/Views/macros/point.volt
@@ -0,0 +1,61 @@
+{%- macro redeem_status_info(value) %}
+    {% if value == 1 %}
+        <span class="status">处理中</span>
+    {% elseif value == 2 %}
+        <span class="status">已完成</span>
+    {% elseif value == 3 %}
+        <span class="status">已失败</span>
+    {% endif %}
+{%- endmacro %}
+
+{%- macro gift_type_info(value) %}
+    {% if value == 1 %}
+        <span class="layui-badge layui-bg-green type">课程</span>
+    {% elseif value == 2 %}
+        <span class="layui-badge layui-bg-blue type">商品</span>
+    {% elseif value == 3 %}
+        <span class="layui-badge layui-bg-cyan type">现金</span>
+    {% endif %}
+{%- endmacro %}
+
+{%- macro event_type_info(value) %}
+    {% if value == 1 %}
+        <span class="type">订单消费</span>
+    {% elseif value == 2 %}
+        <span class="type">积分兑换</span>
+    {% elseif value == 3 %}
+        <span class="type">积分退款</span>
+    {% elseif value == 4 %}
+        <span class="type">帐号注册</span>
+    {% elseif value == 5 %}
+        <span class="type">站点访问</span>
+    {% elseif value == 6 %}
+        <span class="type">课时学习</span>
+    {% elseif value == 7 %}
+        <span class="type">课程评价</span>
+    {% elseif value == 8 %}
+        <span class="type">微聊讨论</span>
+    {% endif %}
+{%- endmacro %}
+
+{%- macro event_detail_info(history) %}
+    {% set event_info = history.event_info %}
+    {% if history.event_type == 1 %}
+        <p class="order">{{ event_info.order.subject }}</p>
+    {% elseif history.event_type == 2 %}
+        <p class="gift">{{ event_info.point_redeem.gift_name }}</p>
+    {% elseif history.event_type == 3 %}
+        <span class="none">{{ event_info.point_redeem.gift_name }}</span>
+    {% elseif history.event_type == 4 %}
+        <span class="none">N/A</span>
+    {% elseif history.event_type == 5 %}
+        <span class="none">N/A</span>
+    {% elseif history.event_type == 6 %}
+        <p class="course">课程：{{ event_info.course.title }}</p>
+        <p class="chapter">章节：{{ event_info.chapter.title }}</p>
+    {% elseif history.event_type == 7 %}
+        <p class="course">{{ event_info.course.title }}</p>
+    {% elseif history.event_type == 8 %}
+        <span class="none">N/A</span>
+    {% endif %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/point/gift/add.volt b/app/Http/Admin/Views/point/gift/add.volt
new file mode 100644
index 00000000..f4ea046a
--- /dev/null
+++ b/app/Http/Admin/Views/point/gift/add.volt
@@ -0,0 +1,62 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form id="form-1" class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.point_gift.create'}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>添加礼品</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">礼品类型</label>
+            <div class="layui-input-block">
+                <input type="radio" name="type" value="1" title="课程" lay-filter="type">
+                <input type="radio" name="type" value="2" title="商品" lay-filter="type">
+            </div>
+        </div>
+        <div id="block-1" class="block" style="display:none;">
+            <div class="layui-form-item">
+                <label class="layui-form-label">课程编号</label>
+                <div class="layui-input-block">
+                    <input class="layui-input" type="text" name="item_id" value="">
+                </div>
+            </div>
+        </div>
+        <div id="block-2" class="block" style="display:none;">
+            <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="">
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        layui.use(['jquery', 'form'], function () {
+
+            var $ = layui.jquery;
+            var form = layui.form;
+
+            form.on('radio(type)', function (data) {
+                var block = $('#block-' + data.value);
+                $('.block').hide();
+                block.show();
+            });
+
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/point/gift/edit.volt b/app/Http/Admin/Views/point/gift/edit.volt
new file mode 100644
index 00000000..a2560c51
--- /dev/null
+++ b/app/Http/Admin/Views/point/gift/edit.volt
@@ -0,0 +1,114 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {% set update_url = url({'for':'admin.point_gift.update','id':gift.id}) %}
+
+    {% if gift.type == 1 %}
+        <form class="layui-form kg-form" method="POST" action="{{ update_url }}">
+            <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-inline">
+                    <img id="img-cover" class="kg-cover" src="{{ gift.cover }}">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">课程名称</label>
+                <div class="layui-form-mid layui-word-aux">{{ gift.name }}</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="point" value="{{ gift.point }}" lay-verify="number">
+                </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="stock" value="{{ gift.stock }}" lay-verify="number">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label"></label>
+                <div class="layui-input-block">
+                    <button class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                    <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+                </div>
+            </div>
+        </form>
+    {% endif %}
+
+    {% if gift.type == 2 %}
+        <form class="layui-form kg-form" method="POST" action="{{ update_url }}">
+            <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-inline">
+                    <img id="img-cover" class="kg-cover" src="{{ gift.cover }}">
+                    <input type="hidden" name="cover" value="{{ gift.cover }}">
+                </div>
+                <div class="layui-input-inline" style="padding-top:35px;">
+                    <button id="change-cover" class="layui-btn layui-btn-sm" type="button">更换</button>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">商品名称</label>
+                <div class="layui-input-block">
+                    <input class="layui-input" type="text" name="name" value="{{ gift.name }}" lay-verify="required">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">商品详情</label>
+                <div class="layui-input-block">
+                    <div id="vditor"></div>
+                    <textarea name="details" class="layui-hide" id="vditor-textarea">{{ gift.details }}</textarea>
+                </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="point" value="{{ gift.point }}" lay-verify="number">
+                </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="stock" value="{{ gift.stock }}" lay-verify="number">
+                </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="redeem_limit" value="{{ gift.redeem_limit }}" lay-verify="number">
+                </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>
+    {% endif %}
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('https://cdn.jsdelivr.net/npm/vditor/dist/index.css', false) }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/index.min.js', false) }}
+    {{ js_include('admin/js/cover.upload.js') }}
+    {{ js_include('admin/js/vditor.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/point/gift/list.volt b/app/Http/Admin/Views/point/gift/list.volt
new file mode 100644
index 00000000..2089f1bc
--- /dev/null
+++ b/app/Http/Admin/Views/point/gift/list.volt
@@ -0,0 +1,83 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/point') }}
+
+    {% set add_url = url({'for':'admin.point_gift.add'}) %}
+
+    <div class="kg-nav">
+        <div class="kg-nav-left">
+            <span class="layui-breadcrumb">
+                <a><cite>礼品管理</cite></a>
+            </span>
+        </div>
+        <div class="kg-nav-right">
+            <a class="layui-btn layui-btn-sm" href="{{ add_url }}">
+                <i class="layui-icon layui-icon-add-1"></i>添加礼品
+            </a>
+        </div>
+    </div>
+
+    <table class="kg-table layui-table layui-form">
+        <group>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col width="12%">
+        </group>
+        <thead>
+        <tr>
+            <th>编号</th>
+            <th>物品名称</th>
+            <th>所需积分</th>
+            <th>库存数量</th>
+            <th>兑换限额</th>
+            <th>兑换人次</th>
+            <th>发布</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            {% set redeem_url = url({'for':'admin.point_redeem.list'},{'gift_id':item.id}) %}
+            {% set preview_url = url({'for':'home.point_gift.show','id':item.id}) %}
+            {% set edit_url = url({'for':'admin.point_gift.edit','id':item.id}) %}
+            {% set update_url = url({'for':'admin.point_gift.update','id':item.id}) %}
+            {% set delete_url = url({'for':'admin.point_gift.delete','id':item.id}) %}
+            {% set restore_url = url({'for':'admin.point_gift.restore','id':item.id}) %}
+            <tr>
+                <td>{{ item.id }}</td>
+                <td><a href="{{ edit_url }}">{{ item.name }}</a> {{ gift_type_info(item.type) }}</td>
+                <td>{{ item.point }}</td>
+                <td>{{ item.stock }}</td>
+                <td>{{ item.redeem_limit }}</td>
+                <td><a class="layui-badge layui-bg-green" href="{{ redeem_url }}">{{ item.redeem_count }}</a></td>
+                <td><input type="checkbox" name="published" value="1" lay-filter="published" lay-skin="switch" lay-text="是|否" 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="{{ preview_url }}" target="_blank">前台预览</a></li>
+                            <li><a href="{{ redeem_url }}">兑换记录</a></li>
+                            <li><a href="{{ edit_url }}">编辑</a></li>
+                            {% if item.deleted == 0 %}
+                                <li><a href="javascript:" class="kg-delete" data-url="{{ delete_url }}">删除</a></li>
+                            {% else %}
+                                <li><a href="javascript:" class="kg-restore" data-url="{{ restore_url }}">还原</a></li>
+                            {% endif %}
+                        </ul>
+                    </div>
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    {{ partial('partials/pager') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/point/gift/search.volt b/app/Http/Admin/Views/point/gift/search.volt
new file mode 100644
index 00000000..9ce882e2
--- /dev/null
+++ b/app/Http/Admin/Views/point/gift/search.volt
@@ -0,0 +1,64 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.group.list'}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>搜索群组</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">群组编号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="id" placeholder="群组编号精确匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">群组名称</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="name" placeholder="群组名称模糊匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">群主编号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="user_id" placeholder="群主编号精确匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">课程编号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="course_id" placeholder="课程编号精确匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">类型</label>
+            <div class="layui-input-block">
+                <input type="radio" name="type" value="1" title="课程">
+                <input type="radio" name="type" value="2" title="聊天">
+                <input type="radio" name="type" value="3" title="职工">
+            </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="是">
+                <input type="radio" name="published" value="0" title="否">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">删除</label>
+            <div class="layui-input-block">
+                <input type="radio" name="deleted" value="1" title="是">
+                <input type="radio" name="deleted" value="0" title="否">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit="true">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/point/redeem/list.volt b/app/Http/Admin/Views/point/redeem/list.volt
new file mode 100644
index 00000000..c86b4b1b
--- /dev/null
+++ b/app/Http/Admin/Views/point/redeem/list.volt
@@ -0,0 +1,100 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/point') }}
+
+    {% set search_url = url({'for':'admin.point_redeem.search'}) %}
+
+    <div class="kg-nav">
+        <div class="kg-nav-left">
+            <span class="layui-breadcrumb">
+                <a><cite>兑换记录</cite></a>
+            </span>
+        </div>
+        <div class="kg-nav-right">
+            <a class="layui-btn layui-btn-sm" href="{{ search_url }}">
+                <i class="layui-icon layui-icon-search"></i>搜索兑换
+            </a>
+        </div>
+    </div>
+
+    <table class="kg-table layui-table">
+        <colgroup>
+            <col>
+            <col>
+            <col>
+            <col>
+            <col width="12%">
+        </colgroup>
+        <thead>
+        <tr>
+            <th>物品名称</th>
+            <th>消耗积分</th>
+            <th>兑换状态</th>
+            <th>兑换时间</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in pager.items %}
+            {% set user_filter_url = url({'for':'admin.point_redeem.list'},{'user_id':item.user_id}) %}
+            {% set deliver_url = url({'for':'admin.point_redeem.deliver','id':item.id}) %}
+            {% set gift_url = url({'for':'home.point_gift.show','id':item.gift_id}) %}
+            <tr>
+                <td>
+                    <p><a href="{{ gift_url }}" target="_blank">{{ item.gift_name }}（{{ item.gift_id }}）</a>{{ gift_type_info(item.gift_type) }}</p>
+                    <p>用户名称：<a href="{{ user_filter_url }}">{{ item.user_name }}</a> （{{ item.user_id }}） 联系方式：
+                        <button class="layui-btn layui-btn-xs kg-contact" data-name="{{ item.contact_name }}" data-phone="{{ item.contact_phone }}" data-address="{{ item.contact_address }}">查看</button>
+                    </p>
+                </td>
+                <td>{{ item.gift_point }}</td>
+                <td>{{ redeem_status_info(item.status) }}</td>
+                <td>{{ date('Y-m-d H:i',item.create_time) }}</td>
+                <td class="center">
+                    {% if item.gift_type == 2 %}
+                        <button class="layui-btn layui-btn-sm kg-deliver" data-url="{{ deliver_url }}">发货</button>
+                    {% else %}
+                        N/A
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    {{ partial('partials/pager') }}
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+
+        layui.use(['jquery', 'layer'], function () {
+
+            var $ = layui.jquery;
+            var layer = layui.layer;
+
+            $('.kg-deliver').on('click', function () {
+                var url = $(this).data('url');
+                layer.confirm('确定要发货吗？', function () {
+                    $.post(url, function (res) {
+                        layer.msg(res.msg, {icon: 1});
+                        setTimeout(function () {
+                            window.location.reload();
+                        }, 1500);
+                    });
+                });
+            });
+        });
+
+    </script>
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('admin/js/contact.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/point/redeem/search.volt b/app/Http/Admin/Views/point/redeem/search.volt
new file mode 100644
index 00000000..49a91340
--- /dev/null
+++ b/app/Http/Admin/Views/point/redeem/search.volt
@@ -0,0 +1,46 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    <form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.point_redeem.list'}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>搜索兑换</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">用户编号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="user_id" placeholder="用户编号精确匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">礼物编号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" type="text" name="gift_id" placeholder="礼物编号精确匹配">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">礼物类型</label>
+            <div class="layui-input-block">
+                <input type="radio" name="gift_type" value="1" title="课程">
+                <input type="radio" name="gift_type" value="2" title="商品">
+                <input type="radio" name="gift_type" value="3" title="现金">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">兑换状态</label>
+            <div class="layui-input-block">
+                <input type="radio" name="status" value="1" title="处理中">
+                <input type="radio" name="status" value="2" title="已完成">
+                <input type="radio" name="status" value="3" title="已失败">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit="true">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/setting/point.volt b/app/Http/Admin/Views/setting/point.volt
new file mode 100644
index 00000000..e3fd8ed8
--- /dev/null
+++ b/app/Http/Admin/Views/setting/point.volt
@@ -0,0 +1,112 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {% set consume_rule = point.consume_rule|json_decode %}
+    {% set event_rule = point.event_rule|json_decode %}
+
+    <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.point'}) }}">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>积分设置</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">启用积分</label>
+            <div class="layui-input-block">
+                <input type="radio" name="enabled" value="1" title="是" {% if point.enabled == "1" %}checked="checked"{% endif %}>
+                <input type="radio" name="enabled" value="0" title="否" {% if point.enabled == "0" %}checked="checked"{% endif %}>
+            </div>
+        </div>
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>消费奖励规则</legend>
+        </fieldset>
+        <div class="layui-form-item">
+            <label class="layui-form-label">启用规则</label>
+            <div class="layui-input-block">
+                <input type="radio" name="consume_rule[enabled]" value="1" title="是" {% if consume_rule.enabled == "1" %}checked="checked"{% endif %}>
+                <input type="radio" name="consume_rule[enabled]" value="0" title="否" {% if consume_rule.enabled == "0" %}checked="checked"{% endif %}>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">奖励倍率</label>
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="consume_rule[rate]" value="{{ consume_rule.rate }}" lay-verify="number">
+            </div>
+            <div class="layui-form-mid layui-word-aux">奖励积分 ＝ 消费金额 X 奖励倍率</div>
+        </div>
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>行为奖励规则</legend>
+        </fieldset>
+        <table class="layui-table kg-table layui-form" style="width:60%;">
+            <colgroup>
+                <col width="15%">
+                <col>
+                <col>
+                <col>
+            </colgroup>
+            <thead>
+            <tr>
+                <th>行为类型</th>
+                <th>奖励积分</th>
+                <th>每日上限</th>
+                <th>启用规则</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>帐号注册</td>
+                <td><input class="layui-input" type="text" name="event_rule[account_register][point]" value="{{ event_rule.account_register.point }}" lay-verify="required"></td>
+                <td>N/A</td>
+                <td>
+                    <input type="radio" name="event_rule[account_register][enabled]" value="1" title="是" {% if event_rule.account_register.enabled == "1" %}checked="checked"{% endif %}>
+                    <input type="radio" name="event_rule[account_register][enabled]" value="0" title="否" {% if event_rule.account_register.enabled == "0" %}checked="checked"{% endif %}>
+                </td>
+            </tr>
+            <tr>
+                <td>站点访问</td>
+                <td><input class="layui-input" type="text" name="event_rule[site_visit][point]" value="{{ event_rule.site_visit.point }}" lay-verify="required"></td>
+                <td>N/A</td>
+                <td>
+                    <input type="radio" name="event_rule[site_visit][enabled]" value="1" title="是" {% if event_rule.site_visit.enabled == "1" %}checked="checked"{% endif %}>
+                    <input type="radio" name="event_rule[site_visit][enabled]" value="0" title="否" {% if event_rule.site_visit.enabled == "0" %}checked="checked"{% endif %}>
+                </td>
+            </tr>
+            <tr>
+                <td>课程评价</td>
+                <td><input class="layui-input" type="text" name="event_rule[course_review][point]" value="{{ event_rule.course_review.point }}" lay-verify="required"></td>
+                <td>N/A</td>
+                <td>
+                    <input type="radio" name="event_rule[course_review][enabled]" value="1" title="是" {% if event_rule.course_review.enabled == "1" %}checked="checked"{% endif %}>
+                    <input type="radio" name="event_rule[course_review][enabled]" value="0" title="否" {% if event_rule.course_review.enabled == "0" %}checked="checked"{% endif %}>
+                </td>
+            </tr>
+            <tr>
+                <td>课时学习</td>
+                <td><input class="layui-input" type="text" name="event_rule[chapter_study][point]" value="{{ event_rule.chapter_study.point }}" lay-verify="required"></td>
+                <td>N/A</td>
+                <td>
+                    <input type="radio" name="event_rule[chapter_study][enabled]" value="1" title="是" {% if event_rule.chapter_study.enabled == "1" %}checked="checked"{% endif %}>
+                    <input type="radio" name="event_rule[chapter_study][enabled]" value="0" title="否" {% if event_rule.chapter_study.enabled == "0" %}checked="checked"{% endif %}>
+                </td>
+            </tr>
+            <tr>
+                <td>微聊讨论</td>
+                <td><input class="layui-input" type="text" name="event_rule[im_discuss][point]" value="{{ event_rule.im_discuss.point }}" lay-verify="required"></td>
+                <td>N/A</td>
+                <td>
+                    <input type="radio" name="event_rule[im_discuss][enabled]" value="1" title="是" {% if event_rule.im_discuss.enabled == "1" %}checked="checked"{% endif %}>
+                    <input type="radio" name="event_rule[im_discuss][enabled]" value="0" title="否" {% if event_rule.im_discuss.enabled == "0" %}checked="checked"{% endif %}>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+        <br>
+        <div class="layui-form-item">
+            <label class="layui-form-label"></label>
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
+            </div>
+        </div>
+    </form>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/student/list.volt b/app/Http/Admin/Views/student/list.volt
index bc673b7b..16d92f20 100644
--- a/app/Http/Admin/Views/student/list.volt
+++ b/app/Http/Admin/Views/student/list.volt
@@ -6,9 +6,15 @@
         {% if value == 1 %}
             免费
         {% elseif value == 2 %}
-            <span class="layui-badge layui-bg-orange">付费</span>
+            付费
         {% elseif value == 3 %}
             导入
+        {% elseif value == 4 %}
+            会员
+        {% elseif value == 5 %}
+            积分
+        {% elseif value == 6 %}
+            抽奖
         {% endif %}
     {%- endmacro %}
 
@@ -58,8 +64,8 @@
                 </td>
                 <td>{{ source_type_info(item.source_type) }}</td>
                 <td>
-                    <p>开始：{{ date('Y-m-d H:i:s',item.create_time) }}</p>
-                    <p>结束：{{ date('Y-m-d H:i:s',item.expiry_time) }}</p>
+                    <p>开始：{{ date('Y-m-d H:i',item.create_time) }}</p>
+                    <p>结束：{{ date('Y-m-d H:i',item.expiry_time) }}</p>
                 </td>
                 <td class="center">
                     <div class="layui-dropdown">
diff --git a/app/Http/Api/Controllers/Controller.php b/app/Http/Api/Controllers/Controller.php
index d33b4eeb..12d00f18 100644
--- a/app/Http/Api/Controllers/Controller.php
+++ b/app/Http/Api/Controllers/Controller.php
@@ -2,7 +2,8 @@
 
 namespace App\Http\Api\Controllers;
 
-use App\Services\Auth\Api as AppAuth;
+use App\Models\User as UserModel;
+use App\Services\Auth\Api as ApiAuth;
 use App\Traits\Response as ResponseTrait;
 use App\Traits\Security as SecurityTrait;
 use Phalcon\Mvc\Dispatcher;
@@ -10,6 +11,11 @@ use Phalcon\Mvc\Dispatcher;
 class Controller extends \Phalcon\Mvc\Controller
 {
 
+    /**
+     * @var UserModel
+     */
+    protected $authUser;
+
     use ResponseTrait;
     use SecurityTrait;
 
@@ -19,17 +25,22 @@ class Controller extends \Phalcon\Mvc\Controller
             $this->setCors();
         }
 
-        if (!$this->request->isOptions()) {
-            $this->checkRateLimit();
-        }
+        $this->checkRateLimit();
 
         return true;
     }
 
+    public function initialize()
+    {
+        $this->authUser = $this->getAuthUser();
+
+        $this->eventsManager->fire('Site:afterView', $this, $this->authUser);
+    }
+
     protected function getAuthUser()
     {
         /**
-         * @var AppAuth $auth
+         * @var ApiAuth $auth
          */
         $auth = $this->getDI()->get('auth');
 
diff --git a/app/Http/Api/Services/Account.php b/app/Http/Api/Services/Account.php
index 9ce43137..b10af251 100644
--- a/app/Http/Api/Services/Account.php
+++ b/app/Http/Api/Services/Account.php
@@ -6,8 +6,9 @@ use App\Models\User as UserModel;
 use App\Repos\User as UserRepo;
 use App\Services\Auth\Api as AuthService;
 use App\Services\Logic\Account\Register as RegisterService;
-use App\Services\Logic\Notice\AccountLogin as AccountLoginNoticeService;
 use App\Validators\Account as AccountValidator;
+use Phalcon\Di as Di;
+use Phalcon\Events\Manager as EventsManager;
 
 class Account extends Service
 {
@@ -32,7 +33,11 @@ class Account extends Service
 
         $user = $userRepo->findById($account->id);
 
-        return $this->auth->saveAuthInfo($user);
+        $token = $this->auth->saveAuthInfo($user);
+
+        $this->fireAfterRegisterEvent($user);
+
+        return $token;
     }
 
     public function loginByPassword()
@@ -52,9 +57,11 @@ class Account extends Service
 
         $user = $validator->checkUserLogin($post['account'], $post['password']);
 
-        $this->handleLoginNotice($user);
+        $token = $this->auth->saveAuthInfo($user);
 
-        return $this->auth->saveAuthInfo($user);
+        $this->fireAfterLoginEvent($user);
+
+        return $token;
     }
 
     public function loginByVerify()
@@ -74,21 +81,50 @@ class Account extends Service
 
         $user = $validator->checkVerifyLogin($post['account'], $post['verify_code']);
 
-        $this->handleLoginNotice($user);
+        $token = $this->auth->saveAuthInfo($user);
 
-        return $this->auth->saveAuthInfo($user);
+        $this->fireAfterLoginEvent($user);
+
+        return $token;
     }
 
     public function logout()
     {
+        $user = $this->getLoginUser();
+
         $this->auth->clearAuthInfo();
+
+        $this->fireAfterLogoutEvent($user);
     }
 
-    protected function handleLoginNotice(UserModel $user)
+    protected function fireAfterRegisterEvent(UserModel $user)
     {
-        $service = new AccountLoginNoticeService();
+        /**
+         * @var EventsManager $eventsManager
+         */
+        $eventsManager = Di::getDefault()->getShared('eventsManager');
 
-        $service->createTask($user);
+        $eventsManager->fire('Account:afterRegister', $this, $user);
+    }
+
+    protected function fireAfterLoginEvent(UserModel $user)
+    {
+        /**
+         * @var EventsManager $eventsManager
+         */
+        $eventsManager = Di::getDefault()->getShared('eventsManager');
+
+        $eventsManager->fire('Account:afterLogin', $this, $user);
+    }
+
+    protected function fireAfterLogoutEvent(UserModel $user)
+    {
+        /**
+         * @var EventsManager $eventsManager
+         */
+        $eventsManager = Di::getDefault()->getShared('eventsManager');
+
+        $eventsManager->fire('Account:afterLogout', $this, $user);
     }
 
 }
diff --git a/app/Http/Home/Controllers/ChapterController.php b/app/Http/Home/Controllers/ChapterController.php
index 4cc0cc3c..b23e6454 100644
--- a/app/Http/Home/Controllers/ChapterController.php
+++ b/app/Http/Home/Controllers/ChapterController.php
@@ -9,6 +9,7 @@ use App\Services\Logic\Chapter\ChapterLike as ChapterLikeService;
 use App\Services\Logic\Chapter\DanmuList as ChapterDanmuListService;
 use App\Services\Logic\Chapter\Learning as ChapterLearningService;
 use App\Services\Logic\Chapter\ResourceList as ChapterResourceListService;
+use App\Services\Logic\Course\BasicInfo as CourseInfoService;
 use App\Services\Logic\Course\ChapterList as CourseChapterListService;
 
 /**
@@ -50,20 +51,24 @@ class ChapterController extends Controller
 
         $chapter = $service->handle($id);
 
+        $service = new CourseInfoService();
+
+        $course = $service->handle($chapter['course']['id']);
+
         $owned = $chapter['me']['owned'] ?? false;
 
         if (!$owned) {
             $this->response->redirect([
                 'for' => 'home.course.show',
-                'id' => $chapter['course']['id'],
+                'id' => $course['id'],
             ]);
         }
 
         $service = new CourseChapterListService();
 
-        $catalog = $service->handle($chapter['course']['id']);
+        $catalog = $service->handle($course['id']);
 
-        $this->seo->prependTitle(['章节', $chapter['title'], $chapter['course']['title']]);
+        $this->seo->prependTitle(['章节', $chapter['title'], $course['title']]);
 
         if (!empty($chapter['summary'])) {
             $this->seo->setDescription($chapter['summary']);
@@ -83,6 +88,7 @@ class ChapterController extends Controller
             }
         }
 
+        $this->view->setVar('course', $course);
         $this->view->setVar('chapter', $chapter);
         $this->view->setVar('catalog', $catalog);
     }
diff --git a/app/Http/Home/Controllers/Controller.php b/app/Http/Home/Controllers/Controller.php
index df84d9d2..301b0191 100644
--- a/app/Http/Home/Controllers/Controller.php
+++ b/app/Http/Home/Controllers/Controller.php
@@ -66,17 +66,15 @@ class Controller extends \Phalcon\Mvc\Controller
             $this->checkCsrfToken();
         }
 
-        $config = $this->getConfig();
-
-        if ($config->path('throttle.enabled')) {
-            $this->checkRateLimit();
-        }
+        $this->checkRateLimit();
 
         return true;
     }
 
     public function initialize()
     {
+        $this->eventsManager->fire('Site:afterView', $this, $this->authUser);
+
         $this->seo = $this->getSeo();
         $this->navs = $this->getNavs();
         $this->appInfo = $this->getAppInfo();
diff --git a/app/Http/Home/Controllers/PointGiftController.php b/app/Http/Home/Controllers/PointGiftController.php
new file mode 100644
index 00000000..6fab4cdc
--- /dev/null
+++ b/app/Http/Home/Controllers/PointGiftController.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Http\Home\Controllers;
+
+use App\Services\Logic\Point\GiftInfo as GiftInfoService;
+use App\Services\Logic\Point\GiftList as GiftListService;
+use App\Services\Logic\Point\HotGiftList as HotGiftListService;
+use App\Services\Logic\Point\PointRedeem as GiftRedeemService;
+use App\Services\Logic\User\Console\BalanceInfo as BalanceInfoService;
+use Phalcon\Mvc\Dispatcher;
+use Phalcon\Mvc\View;
+
+/**
+ * @RoutePrefix("/point/gift")
+ */
+class PointGiftController extends Controller
+{
+
+    public function beforeExecuteRoute(Dispatcher $dispatcher)
+    {
+        parent::beforeExecuteRoute($dispatcher);
+
+        if ($this->authUser->id == 0) {
+            $this->response->redirect(['for' => 'home.account.login']);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @Get("/list", name="home.point_gift.list")
+     */
+    public function listAction()
+    {
+        $this->seo->prependTitle('积分兑换');
+
+        $this->view->pick('point/gift/list');
+    }
+
+    /**
+     * @Get("/pager", name="home.point_gift.pager")
+     */
+    public function pagerAction()
+    {
+        $service = new GiftListService();
+
+        $pager = $service->handle();
+
+        $pager->target = 'gift-list';
+
+        $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
+        $this->view->pick('point/gift/pager');
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/{id:[0-9]+}", name="home.point_gift.show")
+     */
+    public function showAction($id)
+    {
+        $service = new GiftInfoService();
+
+        $gift = $service->handle($id);
+
+        $hotGifts = $this->getHotGifts();
+        $userBalance = $this->getUserBalance();
+
+        $this->seo->prependTitle(['积分兑换', $gift['name']]);
+
+        $this->view->pick('point/gift/show');
+        $this->view->setVar('gift', $gift);
+        $this->view->setVar('hot_gifts', $hotGifts);
+        $this->view->setVar('user_balance', $userBalance);
+    }
+
+    /**
+     * @Post("/redeem", name="home.point_gift.redeem")
+     */
+    public function redeemAction()
+    {
+        $service = new GiftRedeemService();
+
+        $service->handle();
+
+        return $this->jsonSuccess(['msg' => '兑换成功']);
+    }
+
+    protected function getHotGifts()
+    {
+        $service = new HotGiftListService();
+
+        return $service->handle();
+    }
+
+    protected function getUserBalance()
+    {
+        $service = new BalanceInfoService();
+
+        return $service->handle();
+    }
+
+}
diff --git a/app/Http/Home/Controllers/PointRedeemController.php b/app/Http/Home/Controllers/PointRedeemController.php
new file mode 100644
index 00000000..37b99430
--- /dev/null
+++ b/app/Http/Home/Controllers/PointRedeemController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Home\Controllers;
+
+use App\Services\Logic\Point\PointRedeem as PointRedeemService;
+
+/**
+ * @RoutePrefix("/point/redeem")
+ */
+class PointRedeemController extends Controller
+{
+
+    /**
+     * @Post("/create", name="home.point_redeem.create")
+     */
+    public function createAction()
+    {
+        $service = new PointRedeemService();
+
+        $service->handle();
+
+        return $this->jsonSuccess(['msg' => '兑换成功']);
+    }
+
+}
diff --git a/app/Http/Home/Controllers/UserConsoleController.php b/app/Http/Home/Controllers/UserConsoleController.php
index 12ed2de5..16f22f8f 100644
--- a/app/Http/Home/Controllers/UserConsoleController.php
+++ b/app/Http/Home/Controllers/UserConsoleController.php
@@ -8,11 +8,15 @@ use App\Services\Logic\User\Console\AccountInfo as AccountInfoService;
 use App\Services\Logic\User\Console\ConnectDelete as ConnectDeleteService;
 use App\Services\Logic\User\Console\ConnectList as ConnectListService;
 use App\Services\Logic\User\Console\ConsultList as ConsultListService;
+use App\Services\Logic\User\Console\ContactInfo as ContactInfoService;
+use App\Services\Logic\User\Console\ContactUpdate as ContactUpdateService;
 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\PointHistory as PointHistoryService;
+use App\Services\Logic\User\Console\PointRedeemList as PointRedeemListService;
 use App\Services\Logic\User\Console\ProfileInfo as ProfileInfoService;
 use App\Services\Logic\User\Console\ProfileUpdate as ProfileUpdateService;
 use App\Services\Logic\User\Console\RefundList as RefundListService;
@@ -67,6 +71,19 @@ class UserConsoleController extends Controller
         $this->view->setVar('user', $user);
     }
 
+    /**
+     * @Get("/contact", name="home.uc.contact")
+     */
+    public function contactAction()
+    {
+        $service = new ContactInfoService();
+
+        $contact = $service->handle();
+
+        $this->view->pick('user/console/contact');
+        $this->view->setVar('contact', $contact);
+    }
+
     /**
      * @Get("/account", name="home.uc.account")
      */
@@ -182,6 +199,32 @@ class UserConsoleController extends Controller
         $this->view->setVar('pager', $pager);
     }
 
+    /**
+     * @Get("/point/history", name="home.uc.point_history")
+     */
+    public function pointHistoryAction()
+    {
+        $service = new PointHistoryService();
+
+        $pager = $service->handle();
+
+        $this->view->pick('user/console/point_history');
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/point/redeems", name="home.uc.point_redeems")
+     */
+    public function pointRedeemsAction()
+    {
+        $service = new PointRedeemListService();
+
+        $pager = $service->handle();
+
+        $this->view->pick('user/console/point_redeems');
+        $this->view->setVar('pager', $pager);
+    }
+
     /**
      * @Get("/friends", name="home.uc.friends")
      */
@@ -249,6 +292,20 @@ class UserConsoleController extends Controller
         return $this->jsonSuccess($content);
     }
 
+    /**
+     * @Post("/contact/update", name="home.uc.update_contact")
+     */
+    public function updateContactAction()
+    {
+        $service = new ContactUpdateService();
+
+        $service->handle();
+
+        $content = ['msg' => '更新收货信息成功'];
+
+        return $this->jsonSuccess($content);
+    }
+
     /**
      * @Post("/connect/{id:[0-9]+}/delete", name="home.uc.unconnect")
      */
diff --git a/app/Http/Home/Services/Account.php b/app/Http/Home/Services/Account.php
index 7f7fb06f..af36e107 100644
--- a/app/Http/Home/Services/Account.php
+++ b/app/Http/Home/Services/Account.php
@@ -9,6 +9,8 @@ use App\Services\Logic\Account\Register as RegisterService;
 use App\Services\Logic\Notice\AccountLogin as AccountLoginNoticeService;
 use App\Validators\Account as AccountValidator;
 use App\Validators\Captcha as CaptchaValidator;
+use Phalcon\Di as Di;
+use Phalcon\Events\Manager as EventsManager;
 
 class Account extends Service
 {
@@ -35,6 +37,8 @@ class Account extends Service
 
         $this->auth->saveAuthInfo($user);
 
+        $this->fireAfterRegisterEvent($user);
+
         return $user;
     }
 
@@ -53,6 +57,8 @@ class Account extends Service
         $this->handleLoginNotice($user);
 
         $this->auth->saveAuthInfo($user);
+
+        $this->fireAfterLoginEvent($user);
     }
 
     public function loginByVerify()
@@ -66,11 +72,47 @@ class Account extends Service
         $this->handleLoginNotice($user);
 
         $this->auth->saveAuthInfo($user);
+
+        $this->fireAfterLoginEvent($user);
     }
 
     public function logout()
     {
+        $user = $this->getLoginUser();
+
         $this->auth->clearAuthInfo();
+
+        $this->fireAfterLogoutEvent($user);
+    }
+
+    protected function fireAfterRegisterEvent(UserModel $user)
+    {
+        /**
+         * @var EventsManager $eventsManager
+         */
+        $eventsManager = Di::getDefault()->getShared('eventsManager');
+
+        $eventsManager->fire('Account:afterRegister', $this, $user);
+    }
+
+    protected function fireAfterLoginEvent(UserModel $user)
+    {
+        /**
+         * @var EventsManager $eventsManager
+         */
+        $eventsManager = Di::getDefault()->getShared('eventsManager');
+
+        $eventsManager->fire('Account:afterLogin', $this, $user);
+    }
+
+    protected function fireAfterLogoutEvent(UserModel $user)
+    {
+        /**
+         * @var EventsManager $eventsManager
+         */
+        $eventsManager = Di::getDefault()->getShared('eventsManager');
+
+        $eventsManager->fire('Account:afterLogout', $this, $user);
     }
 
     protected function handleLoginNotice(UserModel $user)
diff --git a/app/Http/Home/Services/ImMessageTrait.php b/app/Http/Home/Services/ImMessageTrait.php
index c0d99dbe..5a4842bb 100644
--- a/app/Http/Home/Services/ImMessageTrait.php
+++ b/app/Http/Home/Services/ImMessageTrait.php
@@ -98,6 +98,8 @@ Trait ImMessageTrait
 
         Gateway::$registerAddress = $this->getRegisterAddress();
 
+        $imMessage = new ImMessageModel();
+
         if ($to['type'] == 'friend') {
 
             $validator = new ImFriendUserValidator();
@@ -106,9 +108,9 @@ Trait ImMessageTrait
 
             $online = Gateway::isUidOnline($to['id']);
 
-            $messageModel = new ImMessageModel();
+            $imMessage = new ImMessageModel();
 
-            $messageModel->create([
+            $imMessage->create([
                 'sender_id' => $from['id'],
                 'receiver_id' => $to['id'],
                 'receiver_type' => ImMessageModel::TYPE_FRIEND,
@@ -136,9 +138,9 @@ Trait ImMessageTrait
 
             $relation = $validator->checkGroupUser($group->id, $user->id);
 
-            $messageModel = new ImMessageModel();
+            $imMessage = new ImMessageModel();
 
-            $messageModel->create([
+            $imMessage->create([
                 'sender_id' => $from['id'],
                 'receiver_id' => $to['id'],
                 'receiver_type' => ImMessageModel::TYPE_GROUP,
@@ -162,6 +164,8 @@ Trait ImMessageTrait
 
             Gateway::sendToGroup($groupName, $content, $excludeClientId);
         }
+
+        $this->eventsManager->fire('ImMessage:afterCreate', $this, $imMessage);
     }
 
     public function sendCsMessage($from, $to)
diff --git a/app/Http/Home/Views/chapter/read.volt b/app/Http/Home/Views/chapter/read.volt
index b40eebb8..ee858df5 100644
--- a/app/Http/Home/Views/chapter/read.volt
+++ b/app/Http/Home/Views/chapter/read.volt
@@ -18,7 +18,9 @@
         <span class="share">
             <a href="javascript:" title="我要点赞" data-url="{{ like_url }}"><i class="layui-icon layui-icon-praise icon-praise"></i><em class="like-count">{{ chapter.like_count }}</em></a>
             <a href="javascript:" title="学习人次"><i class="layui-icon layui-icon-user"></i><em>{{ chapter.user_count }}</em></a>
-            <a href="javascript:" title="我要提问" data-url="{{ consult_url }}"><i class="layui-icon layui-icon-help icon-help"></i></a>
+            {% if course.market_price > 0 %}
+                <a href="javascript:" title="我要提问" data-url="{{ consult_url }}"><i class="layui-icon layui-icon-help icon-help"></i></a>
+            {% endif %}
             {% if chapter.resource_count > 0 and chapter.me.owned == 1 %}
                 <a href="javascript:" title="资料下载" data-url="{{ resources_url }}"><i class="layui-icon layui-icon-download-circle icon-resource"></i></a>
             {% endif %}
diff --git a/app/Http/Home/Views/chapter/vod.volt b/app/Http/Home/Views/chapter/vod.volt
index ae448a92..4e10cb46 100644
--- a/app/Http/Home/Views/chapter/vod.volt
+++ b/app/Http/Home/Views/chapter/vod.volt
@@ -19,7 +19,9 @@
         <span class="share">
             <a href="javascript:" title="我要点赞" data-url="{{ like_url }}"><i class="layui-icon layui-icon-praise icon-praise {{ liked_class }}"></i><em class="like-count">{{ chapter.like_count }}</em></a>
             <a href="javascript:" title="学习人次"><i class="layui-icon layui-icon-user"></i><em>{{ chapter.user_count }}</em></a>
-            <a href="javascript:" title="我要提问" data-url="{{ consult_url }}"><i class="layui-icon layui-icon-help icon-help"></i></a>
+            {% if course.market_price > 0 %}
+                <a href="javascript:" title="我要提问" data-url="{{ consult_url }}"><i class="layui-icon layui-icon-help icon-help"></i></a>
+            {% endif %}
             {% if chapter.resource_count > 0 and chapter.me.owned == 1 %}
                 <a href="javascript:" title="资料下载" data-url="{{ resources_url }}"><i class="layui-icon layui-icon-download-circle icon-resource"></i></a>
             {% endif %}
diff --git a/app/Http/Home/Views/course/show_teacher.volt b/app/Http/Home/Views/course/show_teacher.volt
index e6e7a5b3..f62d404a 100644
--- a/app/Http/Home/Views/course/show_teacher.volt
+++ b/app/Http/Home/Views/course/show_teacher.volt
@@ -6,7 +6,7 @@
                 {% for teacher in course.teachers %}
                     {% set teacher_url = url({'for':'home.user.show','id':teacher.id}) %}
                     {% set teacher.title = teacher.title ? teacher.title : '小小教书匠' %}
-                    <div class="sidebar-teacher-card clearfix">
+                    <div class="sidebar-user-card clearfix">
                         <div class="avatar">
                             <img src="{{ teacher.avatar }}!avatar_160" alt="{{ teacher.name }}">
                         </div>
diff --git a/app/Http/Home/Views/macros/point.volt b/app/Http/Home/Views/macros/point.volt
new file mode 100644
index 00000000..50a59f9d
--- /dev/null
+++ b/app/Http/Home/Views/macros/point.volt
@@ -0,0 +1,74 @@
+{%- macro redeem_status_info(value) %}
+    {% if value == 1 %}
+        <span class="status">处理中</span>
+    {% elseif value == 2 %}
+        <span class="status">已完成</span>
+    {% elseif value == 3 %}
+        <span class="status">已失败</span>
+    {% endif %}
+{%- endmacro %}
+
+{%- macro gift_type_info(value) %}
+    {% if value == 1 %}
+        <span class="layui-badge layui-bg-green type">课程</span>
+    {% elseif value == 2 %}
+        <span class="layui-badge layui-bg-blue type">商品</span>
+    {% elseif value == 3 %}
+        <span class="layui-badge layui-bg-cyan type">现金</span>
+    {% endif %}
+{%- endmacro %}
+
+{%- macro event_point_info(value) %}
+    {% if value > 0 %}
+        <span class="layui-badge layui-bg-green point">+{{ value }}</span>
+    {% else %}
+        <span class="layui-badge layui-bg-red point">{{ value }}</span>
+    {% endif %}
+{%- endmacro %}
+
+{%- macro event_type_info(value) %}
+    {% if value == 1 %}
+        <span class="type">订单消费</span>
+    {% elseif value == 2 %}
+        <span class="type">积分兑换</span>
+    {% elseif value == 3 %}
+        <span class="type">积分退款</span>
+    {% elseif value == 4 %}
+        <span class="type">帐号注册</span>
+    {% elseif value == 5 %}
+        <span class="type">站点访问</span>
+    {% elseif value == 6 %}
+        <span class="type">课时学习</span>
+    {% elseif value == 7 %}
+        <span class="type">课程评价</span>
+    {% elseif value == 8 %}
+        <span class="type">微聊讨论</span>
+    {% endif %}
+{%- endmacro %}
+
+{%- macro event_detail_info(history) %}
+    {% set event_info = history.event_info %}
+    {% if history.event_type == 1 %}
+        <p class="order">{{ event_info.order.subject }}</p>
+    {% elseif history.event_type == 2 %}
+        {% set gift_url = url({'for':'home.point_gift.show','id':event_info.point_redeem.gift_id}) %}
+        <p class="gift"><a href="{{ gift_url }}">{{ event_info.point_redeem.gift_name }}</a></p>
+    {% elseif history.event_type == 3 %}
+        {% set gift_url = url({'for':'home.point_gift.show','id':event_info.point_redeem.gift_id}) %}
+        <p class="gift"><a href="{{ gift_url }}">{{ event_info.point_redeem.gift_name }}</a></p>
+    {% elseif history.event_type == 4 %}
+        <span class="none">N/A</span>
+    {% elseif history.event_type == 5 %}
+        <span class="none">N/A</span>
+    {% elseif history.event_type == 6 %}
+        {% set course_url = url({'for':'home.course.show','id':event_info.course.id}) %}
+        {% set chapter_url = url({'for':'home.chapter.show','id':event_info.chapter.id}) %}
+        <p class="course">课程：<a href="{{ course_url }}">{{ event_info.course.title }}</a></p>
+        <p class="chapter">章节：<a href="{{ chapter_url }}">{{ event_info.chapter.title }}</a></p>
+    {% elseif history.event_type == 7 %}
+        {% set course_url = url({'for':'home.course.show','id':event_info.course.id}) %}
+        <p class="course"><a href="{{ course_url }}">{{ event_info.course.title }}</a></p>
+    {% elseif history.event_type == 8 %}
+        <span class="none">N/A</span>
+    {% endif %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/partials/header.volt b/app/Http/Home/Views/partials/header.volt
index 1222e867..10279917 100644
--- a/app/Http/Home/Views/partials/header.volt
+++ b/app/Http/Home/Views/partials/header.volt
@@ -32,6 +32,9 @@
         <li class="layui-nav-item">
             <a href="javascript:" class="nav-search" data-type="{{ s_type }}" data-query="{{ s_query }}" data-url="{{ s_url }}"><i class="layui-icon layui-icon-search"></i> 搜索</a>
         </li>
+        <li class="layui-nav-item">
+            <a href="{{ url({'for':'home.point_gift.list'}) }}" class="nav-point-gift"><i class="layui-icon layui-icon-gift"></i> 积分</a>
+        </li>
         <li class="layui-nav-item">
             <a href="{{ url({'for':'home.vip.index'}) }}" class="nav-vip"><i class="layui-icon layui-icon-diamond"></i> 会员</a>
         </li>
diff --git a/app/Http/Home/Views/point/gift/list.volt b/app/Http/Home/Views/point/gift/list.volt
new file mode 100644
index 00000000..6db04fc4
--- /dev/null
+++ b/app/Http/Home/Views/point/gift/list.volt
@@ -0,0 +1,20 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {% set pager_url = url({'for':'home.point_gift.pager'}) %}
+
+    <div class="layui-breadcrumb breadcrumb">
+        <a href="/">首页</a>
+        <a><cite>积分兑换</cite></a>
+    </div>
+
+    <div id="gift-list" data-url="{{ pager_url }}"></div>
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('home/js/point.gift.list.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/point/gift/pager.volt b/app/Http/Home/Views/point/gift/pager.volt
new file mode 100644
index 00000000..0a4ae098
--- /dev/null
+++ b/app/Http/Home/Views/point/gift/pager.volt
@@ -0,0 +1,31 @@
+{{ partial('macros/point') }}
+
+{% if pager.total_pages > 0 %}
+    <div class="course-list clearfix">
+        <div class="layui-row layui-col-space20">
+            {% for item in pager.items %}
+                {% set gift_url = url({'for':'home.point_gift.show','id':item.id}) %}
+                <div class="layui-col-md3">
+                    <div class="course-card">
+                        <div class="cover">
+                            <a href="{{ gift_url }}">
+                                <img src="{{ item.cover }}" alt="item.name">
+                            </a>
+                        </div>
+                        <div class="info">
+                            <div class="title layui-elip">
+                                <a href="{{ gift_url }}">{{ item.name }}</a>
+                            </div>
+                            <div class="meta">
+                                {{ gift_type_info(item.type) }}
+                                <span class="price">{{ item.point }} 积分</span>
+                                <span>{{ item.redeem_count }} 人兑换</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+    {{ partial('partials/pager_ajax') }}
+{% endif %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/point/gift/show.volt b/app/Http/Home/Views/point/gift/show.volt
new file mode 100644
index 00000000..6d2fc52a
--- /dev/null
+++ b/app/Http/Home/Views/point/gift/show.volt
@@ -0,0 +1,123 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/point') }}
+
+    {% set redeem_create_url = url({'for':'home.point_redeem.create'}) %}
+    {% set gift_list_url = url({'for':'home.point_gift.list'}) %}
+
+    <div class="breadcrumb">
+        <span class="layui-breadcrumb">
+            <a href="/">首页</a>
+            <a href="{{ gift_list_url }}">积分兑换</a>
+            <a><cite>{{ gift.name }}</cite></a>
+        </span>
+    </div>
+
+    <div class="layout-main clearfix">
+        <div class="layout-content">
+            <div class="layui-card">
+                <div class="layui-card-header">礼品信息</div>
+                <div class="layui-card-body">
+                    <div class="gift-meta clearfix">
+                        <div class="cover">
+                            <img src="{{ gift.cover }}!cover_270" alt="{{ gift.name }}">
+                        </div>
+                        <div class="info">
+                            {% if gift.type == 1 %}
+                                {% set course_url = url({'for':'home.course.show','id':gift.attrs.id}) %}
+                                <p class="item">
+                                    <a href="{{ course_url }}">{{ gift.name }}</a>
+                                    {{ gift_type_info(gift.type) }}
+                                </p>
+                            {% else %}
+                                <p class="item">{{ gift.name }} {{ gift_type_info(gift.type) }}</p>
+                            {% endif %}
+                            <p class="item stats">
+                                <span class="key">兑换库存</span>
+                                <span class="value">{{ gift.stock }}</span>
+                                <span class="key">兑换价格</span>
+                                <span class="price">{{ gift.point }} 积分</span>
+                                <span class="key">兑换限额</span>
+                                <span class="value">{{ gift.redeem_limit }}</span>
+                                <span class="key">兑换人次</span>
+                                <span class="value">{{ gift.redeem_count }}</span>
+                            </p>
+                            <p class="item">
+                                {% if gift.stock > 0 and user_balance.point > gift.point %}
+                                    <button class="layui-btn layui-bg-red btn-redeem" data-id="{{ gift.id }}" data-url="{{ redeem_create_url }}">立即兑换</button>
+                                {% else %}
+                                    <button class="layui-btn layui-btn-disabled">立即兑换</button>
+                                {% endif %}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-card">
+                <div class="layui-card-header">礼品详情</div>
+                <div class="layui-card-body">
+                    <div class="gift-details markdown-body">{{ gift.details }}</div>
+                </div>
+            </div>
+        </div>
+        <div class="layout-sidebar">
+            <div class="sidebar">
+                <div class="layui-card">
+                    <div class="layui-card-header">我的信息</div>
+                    <div class="layui-card-body">
+                        <div class="sidebar-user-card clearfix">
+                            <div class="avatar">
+                                <img src="{{ auth_user.avatar }}!avatar_160" alt="{{ auth_user.name }}">
+                            </div>
+                            <div class="info">
+                                <div class="name">{{ auth_user.name }}</div>
+                                <div class="meta"><span>当前积分</span><span class="point">{{ user_balance.point }}</span></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="sidebar">
+                <div class="layui-card">
+                    <div class="layui-card-header">热门兑换</div>
+                    <div class="layui-card-body">
+                        {% for gift in hot_gifts %}
+                            {% set gift_url = url({'for':'home.point_gift.show','id':gift.id}) %}
+                            <div class="sidebar-course-card clearfix">
+                                <div class="cover">
+                                    <a href="{{ gift_url }}" title="{{ gift.name }}">
+                                        <img src="{{ gift.cover }}!cover_270" alt="{{ gift.name }}">
+                                    </a>
+                                </div>
+                                <div class="info">
+                                    <div class="title layui-elip">
+                                        <a href="{{ gift_url }}" title="{{ gift.name }}">{{ gift.name }}</a>
+                                    </div>
+                                    <div class="meta">
+                                        <span class="price">{{ gift.point }} 积分</span>
+                                        <span class="count">{{ gift.redeem_count }} 人兑换</span>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block link_css %}
+
+    {{ css_link('home/css/markdown.css') }}
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('home/js/point.gift.show.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/review/add.volt b/app/Http/Home/Views/review/add.volt
index 38309e7a..6a4d1d5f 100644
--- a/app/Http/Home/Views/review/add.volt
+++ b/app/Http/Home/Views/review/add.volt
@@ -34,7 +34,7 @@
             <div class="layui-input-block">
                 <button class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
                 <button type="reset" class="layui-btn layui-btn-primary">重置</button>
-                <input type="hidden" name="course_id" value="{{ request.get('course.id') }}">
+                <input type="hidden" name="course_id" value="{{ request.get('course_id') }}">
                 <input type="hidden" name="rating1" value="5">
                 <input type="hidden" name="rating2" value="5">
                 <input type="hidden" name="rating3" value="5">
diff --git a/app/Http/Home/Views/teacher/console/lives.volt b/app/Http/Home/Views/teacher/console/lives.volt
index f247765d..0cf15df1 100644
--- a/app/Http/Home/Views/teacher/console/lives.volt
+++ b/app/Http/Home/Views/teacher/console/lives.volt
@@ -61,6 +61,6 @@
 
 {% block include_js %}
 
-    {{ js_include('home/js/console.js') }}
+    {{ js_include('home/js/teacher.console.js') }}
 
 {% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/templates/main.volt b/app/Http/Home/Views/templates/main.volt
index 3f9a6253..cb3f3e70 100644
--- a/app/Http/Home/Views/templates/main.volt
+++ b/app/Http/Home/Views/templates/main.volt
@@ -41,7 +41,9 @@
 {% block inline_js %}{% endblock %}
 
 {% if site_info.analytics_enabled == 1 %}
-    {{ site_info.analytics_script }}
+    <div class="layui-hide">
+        {{ site_info.analytics_script }}
+    </div>
 {% endif %}
 
 </body>
diff --git a/app/Http/Home/Views/user/console/contact.volt b/app/Http/Home/Views/user/console/contact.volt
new file mode 100644
index 00000000..fa129d27
--- /dev/null
+++ b/app/Http/Home/Views/user/console/contact.volt
@@ -0,0 +1,69 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {% set update_url = url({'for':'home.uc.update_contact'}) %}
+
+    <div class="layout-main clearfix">
+        <div class="my-sidebar">{{ partial('user/console/menu') }}</div>
+        <div class="my-content">
+            <div class="wrap">
+                <div class="my-nav">
+                    <span class="title">收货信息</span>
+                </div>
+                <form class="layui-form profile-form" method="post" action="{{ update_url }}">
+                    <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="{{ contact.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="phone" value="{{ contact.phone }}" lay-verify="phone">
+                        </div>
+                    </div>
+                    <div class="layui-form-item" id="area-picker" style="margin-bottom: 25px;">
+                        <div class="layui-form-label">所在地区</div>
+                        <div class="layui-input-inline" style="width: 200px;">
+                            <select name="address[province]" class="province-selector" data-value="{{ contact.add_province }}" lay-verify="required">
+                                <option value="">请选择省</option>
+                            </select>
+                        </div>
+                        <div class="layui-input-inline" style="width: 200px;">
+                            <select name="address[city]" class="city-selector" data-value="{{ contact.add_city }}" lay-verify="required">
+                                <option value="">请选择市</option>
+                            </select>
+                        </div>
+                        <div class="layui-input-inline" style="width: 200px;">
+                            <select name="address[county]" class="county-selector" data-value="{{ contact.add_county }}">
+                                <option value="">请选择区</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">详细地址</label>
+                        <div class="layui-input-block">
+                            <textarea class="layui-textarea" name="address[other]" lay-verify="required">{{ contact.add_other }}</textarea>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label"></label>
+                        <div class="layui-input-block">
+                            <button class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
+                            <button class="layui-btn layui-btn-primary" type="reset">重置</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('home/js/user.console.contact.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/user/console/courses.volt b/app/Http/Home/Views/user/console/courses.volt
index 7d9b0f70..932cc0e9 100644
--- a/app/Http/Home/Views/user/console/courses.volt
+++ b/app/Http/Home/Views/user/console/courses.volt
@@ -28,7 +28,7 @@
                         <tbody>
                         {% for item in pager.items %}
                             {% set course_url = url({'for':'home.course.show','id':item.course.id}) %}
-                            {% set review_url = url({'for':'home.review.add'},{'id':item.course.id}) %}
+                            {% set review_url = url({'for':'home.review.add'},{'course_id':item.course.id}) %}
                             {% set allow_review = item.progress > 30 and item.reviewed == 0 %}
                             <tr>
                                 <td>
diff --git a/app/Http/Home/Views/user/console/menu.volt b/app/Http/Home/Views/user/console/menu.volt
index e670e951..619692fe 100644
--- a/app/Http/Home/Views/user/console/menu.volt
+++ b/app/Http/Home/Views/user/console/menu.volt
@@ -36,6 +36,17 @@
     </div>
 </div>
 
+<div class="layui-card">
+    <div class="layui-card-header">积分中心</div>
+    <div class="layui-card-body">
+        <ul class="my-menu">
+            <li><a href="{{ url({'for':'home.point_gift.list'}) }}">积分商城</a></li>
+            <li><a href="{{ url({'for':'home.uc.point_history'}) }}">积分记录</a></li>
+            <li><a href="{{ url({'for':'home.uc.point_redeems'}) }}">兑换记录</a></li>
+        </ul>
+    </div>
+</div>
+
 <div class="layui-card">
     <div class="layui-card-header">聊天设置</div>
     <div class="layui-card-body">
@@ -51,6 +62,7 @@
     <div class="layui-card-body">
         <ul class="my-menu">
             <li><a href="{{ url({'for':'home.uc.profile'}) }}">个人信息</a></li>
+            <li><a href="{{ url({'for':'home.uc.contact'}) }}">收货地址</a></li>
             <li><a href="{{ url({'for':'home.uc.account'}) }}">帐号安全</a></li>
             {% if wechat_oa.enabled == 1 %}
                 <li><a href="{{ url({'for':'home.uc.subscribe'}) }}">关注订阅</a></li>
diff --git a/app/Http/Home/Views/user/console/point_history.volt b/app/Http/Home/Views/user/console/point_history.volt
new file mode 100644
index 00000000..c6c32d74
--- /dev/null
+++ b/app/Http/Home/Views/user/console/point_history.volt
@@ -0,0 +1,47 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/point') }}
+
+    <div class="layout-main clearfix">
+        <div class="my-sidebar">{{ partial('user/console/menu') }}</div>
+        <div class="my-content">
+            <div class="my-nav">
+                <span class="title">积分记录</span>
+            </div>
+            <div class="history-wrap wrap">
+                {% if pager.total_pages > 0 %}
+                    <table class="layui-table history-table" lay-size="lg">
+                        <colgroup>
+                            <col>
+                            <col>
+                            <col>
+                            <col>
+                        </colgroup>
+                        <thead>
+                        <tr>
+                            <th>来源</th>
+                            <th>积分</th>
+                            <th>详情</th>
+                            <th>时间</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for item in pager.items %}
+                            <tr>
+                                <td>{{ event_type_info(item.event_type) }}</td>
+                                <td>{{ event_point_info(item.event_point) }}</td>
+                                <td>{{ event_detail_info(item) }}</td>
+                                <td>{{ date('Y-m-d H:i',item.create_time) }}</td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    {{ partial('partials/pager') }}
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Home/Views/user/console/point_redeems.volt b/app/Http/Home/Views/user/console/point_redeems.volt
new file mode 100644
index 00000000..69ed5556
--- /dev/null
+++ b/app/Http/Home/Views/user/console/point_redeems.volt
@@ -0,0 +1,48 @@
+{% extends 'templates/main.volt' %}
+
+{% block content %}
+
+    {{ partial('macros/point') }}
+
+    <div class="layout-main clearfix">
+        <div class="my-sidebar">{{ partial('user/console/menu') }}</div>
+        <div class="my-content">
+            <div class="my-nav">
+                <span class="title">兑换记录</span>
+            </div>
+            <div class="history-wrap wrap">
+                {% if pager.total_pages > 0 %}
+                    <table class="layui-table" lay-size="lg">
+                        <colgroup>
+                            <col>
+                            <col>
+                            <col>
+                            <col>
+                        </colgroup>
+                        <thead>
+                        <tr>
+                            <th>物品名称</th>
+                            <th>消耗积分</th>
+                            <th>兑换状态</th>
+                            <th>兑换时间</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for item in pager.items %}
+                            {% set gift_url = url({'for':'home.point_gift.show','id':item.gift.id}) %}
+                            <tr>
+                                <td><a href="{{ gift_url }}">{{ item.gift.name }}</a> {{ gift_type_info(item.gift.type) }}</td>
+                                <td>{{ item.gift.point }}</td>
+                                <td>{{ redeem_status_info(item.status) }}</td>
+                                <td>{{ date('Y-m-d H:i',item.create_time) }}</td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    {{ partial('partials/pager') }}
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Library/Cache/Backend/Redis.php b/app/Library/Cache/Backend/Redis.php
index 57422183..fba3a91a 100644
--- a/app/Library/Cache/Backend/Redis.php
+++ b/app/Library/Cache/Backend/Redis.php
@@ -186,6 +186,23 @@ class Redis extends \Phalcon\Cache\Backend\Redis
         return (bool)$redis->exists($lastKey);
     }
 
+    /**
+     * @param string $keyName
+     * @return int|bool
+     */
+    public function ttl($keyName = null)
+    {
+        $redis = $this->getRedis();
+
+        if ($keyName === null) {
+            $lastKey = $this->_lastKey;
+        } else {
+            $lastKey = $this->getKeyName($keyName);
+        }
+
+        return $redis->ttl($lastKey);
+    }
+
     /**
      * {@inheritdoc}
      *
diff --git a/app/Library/Utils/Lock.php b/app/Library/Utils/Lock.php
index f3fb6be4..be5c7cca 100644
--- a/app/Library/Utils/Lock.php
+++ b/app/Library/Utils/Lock.php
@@ -16,7 +16,7 @@ class Lock
      */
     public static function addLock($itemId, $expire = 600)
     {
-        if (!$itemId || $expire <= 0) {
+        if (empty($itemId) || $expire <= 0) {
             return false;
         }
 
@@ -43,7 +43,7 @@ class Lock
      */
     public static function releaseLock($itemId, $lockId)
     {
-        if (!$itemId || !$lockId) {
+        if (empty($itemId) || empty($lockId)) {
             return false;
         }
 
@@ -73,7 +73,7 @@ class Lock
 
     public static function getLockKey($itemId)
     {
-        return sprintf('kg_lock:%s', $itemId);
+        return sprintf('_LOCK_:%s', $itemId);
     }
 
 }
\ No newline at end of file
diff --git a/app/Listeners/Account.php b/app/Listeners/Account.php
new file mode 100644
index 00000000..c7e710a2
--- /dev/null
+++ b/app/Listeners/Account.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\User as UserModel;
+use App\Services\Logic\Notice\AccountLogin as AccountLoginNoticeService;
+use App\Services\Logic\Point\PointHistory as PointHistoryService;
+use Phalcon\Events\Event as PhEvent;
+
+class Account extends Listener
+{
+
+    public function afterRegister(PhEvent $event, $source, UserModel $user)
+    {
+        $this->handleRegisterPoint($user);
+    }
+
+    public function afterLogin(PhEvent $event, $source, UserModel $user)
+    {
+        $this->handleLoginNotice($user);
+    }
+
+    public function afterLogout(PhEvent $event, $source, UserModel $user)
+    {
+
+    }
+
+    protected function handleRegisterPoint(UserModel $user)
+    {
+        $service = new PointHistoryService();
+
+        $service->handleAccountRegister($user);
+    }
+
+    protected function handleLoginNotice(UserModel $user)
+    {
+        $service = new AccountLoginNoticeService();
+
+        $service->createTask($user);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Listeners/ImMessage.php b/app/Listeners/ImMessage.php
new file mode 100644
index 00000000..f5196b8f
--- /dev/null
+++ b/app/Listeners/ImMessage.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\ImMessage as ImMessageModel;
+use App\Services\Logic\Point\PointHistory as PointHistoryService;
+use Phalcon\Events\Event as PhEvent;
+
+class ImMessage extends Listener
+{
+
+    public function afterCreate(PhEvent $event, $source, ImMessageModel $message)
+    {
+        $this->handleDiscussPoint($message);
+    }
+
+    protected function handleDiscussPoint(ImMessageModel $message)
+    {
+        $todayDate = date('Ymd');
+
+        $keyName = sprintf('im_discuss:%s:%s', $message->sender_id, $todayDate);
+
+        $cache = $this->getCache();
+
+        $content = $cache->get($keyName);
+
+        if ($content) return;
+
+        $service = new PointHistoryService();
+
+        $service->handleImDiscuss($message);
+
+        $tomorrow = strtotime($todayDate) + 86400;
+
+        $lifetime = $tomorrow - time();
+
+        $cache->save($keyName, 1, $lifetime);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Listeners/Listener.php b/app/Listeners/Listener.php
index 9e066d1a..39e5c5c1 100644
--- a/app/Listeners/Listener.php
+++ b/app/Listeners/Listener.php
@@ -8,6 +8,28 @@ use Phalcon\Mvc\User\Plugin as UserPlugin;
 class Listener extends UserPlugin
 {
 
+    public function getConfig()
+    {
+        $appService = new AppService();
+
+        return $appService->getConfig();
+    }
+
+
+    public function getCache()
+    {
+        $appService = new AppService();
+
+        return $appService->getCache();
+    }
+
+    public function getRedis()
+    {
+        $appService = new AppService();
+
+        return $appService->getRedis();
+    }
+
     public function getLogger($channel = null)
     {
         $appService = new AppService();
diff --git a/app/Listeners/Review.php b/app/Listeners/Review.php
new file mode 100644
index 00000000..e88ccfc7
--- /dev/null
+++ b/app/Listeners/Review.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\Review as ReviewModel;
+use App\Services\Logic\Point\PointHistory as PointHistoryService;
+use Phalcon\Events\Event as PhEvent;
+
+class Review extends Listener
+{
+
+    public function afterCreate(PhEvent $event, $source, ReviewModel $review)
+    {
+        $this->handleReviewPoint($review);
+    }
+
+    protected function handleReviewPoint(ReviewModel $review)
+    {
+        $service = new PointHistoryService();
+
+        $service->handleCourseReview($review);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Listeners/Site.php b/app/Listeners/Site.php
new file mode 100644
index 00000000..1841332a
--- /dev/null
+++ b/app/Listeners/Site.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Library\Utils\Lock as LockUtil;
+use App\Models\Online as OnlineModel;
+use App\Models\User as UserModel;
+use App\Repos\Online as OnlineRepo;
+use App\Services\Logic\Point\PointHistory as PointHistoryService;
+use App\Traits\Client as ClientTrait;
+use Phalcon\Events\Event as PhEvent;
+
+class Site extends Listener
+{
+
+    use ClientTrait;
+
+    public function afterView(PhEvent $event, $source, UserModel $user)
+    {
+        if ($user->id > 0) {
+
+            $this->handleOnline($user);
+
+            $this->handleVisitPoint($user);
+
+            /**
+             * 更新会重置afterFetch，重新执行
+             */
+            $user->afterFetch();
+        }
+    }
+
+    protected function handleOnline(UserModel $user)
+    {
+        $now = time();
+
+        if ($now - $user->active_time < 900) {
+            return;
+        }
+
+        $itemId = "user_online:{$user->id}";
+
+        $clientType = $this->getClientType();
+        $clientIp = $this->getClientIp();
+
+        $lockId = LockUtil::addLock($itemId);
+
+        if ($lockId === false) return;
+
+        $user->active_time = $now;
+
+        $user->update();
+
+        $onlineRepo = new OnlineRepo();
+
+        $records = $onlineRepo->findByUserDate($user->id, date('Ymd'));
+
+        if ($records->count() > 0) {
+            $online = null;
+            foreach ($records as $record) {
+                $case1 = $record->client_type == $clientType;
+                $case2 = $record->client_ip == $clientIp;
+                if ($case1 && $case2) {
+                    $online = $record;
+                    break;
+                }
+            }
+            if ($online) {
+                $online->active_time = $now;
+                $online->update();
+            } else {
+                $this->createOnline($user->id, $clientType, $clientIp);
+            }
+        } else {
+            $this->createOnline($user->id, $clientType, $clientIp);
+        }
+
+        LockUtil::releaseLock($itemId, $lockId);
+    }
+
+    protected function createOnline($userId, $clientType, $clientIp)
+    {
+        $online = new OnlineModel();
+
+        $online->user_id = $userId;
+        $online->client_type = $clientType;
+        $online->client_ip = $clientIp;
+        $online->active_time = time();
+
+        $online->create();
+
+        return $online;
+    }
+
+    protected function handleVisitPoint(UserModel $user)
+    {
+        $todayDate = date('Ymd');
+
+        $keyName = sprintf('site_visit:%s:%s', $user->id, $todayDate);
+
+        $cache = $this->getCache();
+
+        $content = $cache->get($keyName);
+
+        if ($content) return;
+
+        $service = new PointHistoryService();
+
+        $service->handleSiteVisit($user);
+
+        $tomorrow = strtotime($todayDate) + 86400;
+
+        $lifetime = $tomorrow - time();
+
+        $cache->save($keyName, 1, $lifetime);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Listeners/Pay.php b/app/Listeners/Trade.php
similarity index 87%
rename from app/Listeners/Pay.php
rename to app/Listeners/Trade.php
index ac5b7d88..70207596 100644
--- a/app/Listeners/Pay.php
+++ b/app/Listeners/Trade.php
@@ -9,7 +9,7 @@ use App\Repos\Order as OrderRepo;
 use Phalcon\Events\Event as PhEvent;
 use Phalcon\Logger\Adapter\File as FileLogger;
 
-class Pay extends Listener
+class Trade extends Listener
 {
 
     /**
@@ -73,12 +73,6 @@ class Pay extends Listener
                     'message' => $e->getMessage(),
                 ]));
 
-            $this->logger->debug('After Pay Event Info ' . kg_json_encode([
-                    'event' => $event->getType(),
-                    'source' => get_class($source),
-                    'data' => kg_json_encode($trade),
-                ]));
-
             throw new \RuntimeException('sys.trans_rollback');
         }
     }
diff --git a/app/Listeners/User.php b/app/Listeners/User.php
deleted file mode 100644
index 16ae1453..00000000
--- a/app/Listeners/User.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Library\Utils\Lock as LockUtil;
-use App\Models\Online as OnlineModel;
-use App\Models\User as UserModel;
-use App\Repos\Online as OnlineRepo;
-use App\Traits\Client as ClientTrait;
-use Phalcon\Events\Event;
-
-class User extends Listener
-{
-
-    use ClientTrait;
-
-    public function online(Event $event, $source, UserModel $user)
-    {
-        $itemId = "user:{$user->id}";
-
-        $lockId = LockUtil::addLock($itemId);
-
-        $now = time();
-        $clientType = $this->getClientType();
-        $clientIp = $this->getClientIp();
-
-        if ($now - $user->active_time > 600) {
-
-            $user->active_time = $now;
-
-            $user->update();
-
-            $onlineRepo = new OnlineRepo();
-
-            $records = $onlineRepo->findByUserDate($user->id, date('Y-m-d'));
-
-            if ($records->count() > 0) {
-
-                $online = null;
-
-                foreach ($records as $record) {
-                    if ($record->client_type == $clientType && $record->client_ip == $clientIp) {
-                        $online = $record;
-                        break;
-                    }
-                }
-
-                if ($online) {
-                    $online->active_time = $now;
-                    $online->update();
-                } else {
-                    $this->createOnline($user->id, $clientType, $clientIp);
-                }
-
-            } else {
-                $this->createOnline($user->id, $clientType, $clientIp);
-            }
-        }
-
-        LockUtil::releaseLock($itemId, $lockId);
-    }
-
-    protected function createOnline($userId, $clientType, $clientIp)
-    {
-        $online = new OnlineModel();
-
-        $online->user_id = $userId;
-        $online->client_type = $clientType;
-        $online->client_ip = $clientIp;
-        $online->active_time = time();
-
-        $online->create();
-
-        return $online;
-    }
-
-}
\ No newline at end of file
diff --git a/app/Listeners/UserDailyCounter.php b/app/Listeners/UserDailyCounter.php
index 88cee653..10d66f14 100644
--- a/app/Listeners/UserDailyCounter.php
+++ b/app/Listeners/UserDailyCounter.php
@@ -4,7 +4,7 @@ namespace App\Listeners;
 
 use App\Caches\UserDailyCounter as CacheUserDailyCounter;
 use App\Models\User as UserModel;
-use Phalcon\Events\Event;
+use Phalcon\Events\Event as PhEvent;
 
 class UserDailyCounter extends Listener
 {
@@ -16,42 +16,42 @@ class UserDailyCounter extends Listener
         $this->counter = new CacheUserDailyCounter();
     }
 
-    public function incrFavoriteCount(Event $event, $source, UserModel $user)
+    public function incrFavoriteCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'favorite_count');
     }
 
-    public function incrDanmuCount(Event $event, $source, UserModel $user)
+    public function incrDanmuCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'danmu_count');
     }
 
-    public function incrConsultCount(Event $event, $source, UserModel $user)
+    public function incrConsultCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'consult_count');
     }
 
-    public function incrReviewCount(Event $event, $source, UserModel $user)
+    public function incrReviewCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'review_count');
     }
 
-    public function incrOrderCount(Event $event, $source, UserModel $user)
+    public function incrOrderCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'order_count');
     }
 
-    public function incrConsultLikeCount(Event $event, $source, UserModel $user)
+    public function incrConsultLikeCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'consult_like_count');
     }
 
-    public function incrChapterLikeCount(Event $event, $source, UserModel $user)
+    public function incrChapterLikeCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'chapter_like_count');
     }
 
-    public function incrReviewLikeCount(Event $event, $source, UserModel $user)
+    public function incrReviewLikeCount(PhEvent $event, $source, UserModel $user)
     {
         $this->counter->hIncrBy($user->id, 'review_like_count');
     }
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 74664d38..553e82b9 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -12,56 +12,56 @@ class Account extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 邮箱
      *
      * @var string
      */
-    public $email;
+    public $email = '';
 
     /**
      * 手机
      *
      * @var string
      */
-    public $phone;
+    public $phone = '';
 
     /**
      * 密码
      *
      * @var string
      */
-    public $password;
+    public $password = '';
 
     /**
      * 密盐
      *
      * @var string
      */
-    public $salt;
+    public $salt = '';
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -90,4 +90,4 @@ class Account extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Area.php b/app/Models/Area.php
index 9eeb2d70..9f9efc76 100644
--- a/app/Models/Area.php
+++ b/app/Models/Area.php
@@ -17,32 +17,32 @@ class Area extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 类型
      *
      * @var int
      */
-    public $type;
+    public $type = 0;
 
     /**
      * 编码
      *
      * @var string
      */
-    public $code;
+    public $code = '';
 
     /**
      * 名称
      *
      * @var string
      */
-    public $name;
+    public $name = '';
 
     public function getSource(): string
     {
         return 'kg_area';
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Audit.php b/app/Models/Audit.php
index a9b4cb36..2b23a82e 100644
--- a/app/Models/Audit.php
+++ b/app/Models/Audit.php
@@ -10,49 +10,49 @@ class Audit extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 用户名称
      *
-     * @var int
+     * @var string
      */
-    public $user_name;
+    public $user_name = '';
 
     /**
      * 用户IP
      *
-     * @var int
+     * @var string
      */
-    public $user_ip;
+    public $user_ip = '';
 
     /**
      * 请求路由
      *
      * @var string
      */
-    public $req_route;
+    public $req_route = '';
 
     /**
      * 请求路径
      *
      * @var string
      */
-    public $req_path;
+    public $req_path = '';
 
     /**
      * 请求参数
      *
-     * @var string
+     * @var array|string
      */
-    public $req_data;
+    public $req_data = '';
 
     /**
      * 创建时间
@@ -80,9 +80,7 @@ class Audit extends Model
                 }
             }
             $this->req_data = kg_json_encode($this->req_data);
-        } else {
-            $this->req_data = '';
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Category.php b/app/Models/Category.php
index b0052b16..c172ae83 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -19,84 +19,84 @@ class Category extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 上级编号
      *
      * @var int
      */
-    public $parent_id;
+    public $parent_id = 0;
 
     /**
      * 层级
      *
      * @var int
      */
-    public $level;
+    public $level = 0;
 
     /**
      * 类型
      *
      * @var int
      */
-    public $type;
+    public $type = 0;
 
     /**
      * 名称
      *
      * @var string
      */
-    public $name;
+    public $name = '';
 
     /**
      * 路径
      *
      * @var string
      */
-    public $path;
+    public $path = '';
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 节点数
      *
      * @var int
      */
-    public $child_count;
+    public $child_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -144,4 +144,4 @@ class Category extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Chapter.php b/app/Models/Chapter.php
index 01611874..0c39954e 100644
--- a/app/Models/Chapter.php
+++ b/app/Models/Chapter.php
@@ -60,126 +60,126 @@ class Chapter extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 父级编号
      *
      * @var int
      */
-    public $parent_id;
+    public $parent_id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 摘要
      *
      * @var string
      */
-    public $summary;
+    public $summary = '';
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 免费标识
      *
      * @var int
      */
-    public $free;
+    public $free = 0;
 
     /**
      * 模式类型
      *
      * @var int
      */
-    public $model;
+    public $model = 0;
 
     /**
      * 扩展属性
      *
      * @var string|array
      */
-    public $attrs;
+    public $attrs = '';
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 资源数
      *
      * @var int
      */
-    public $resource_count;
+    public $resource_count = 0;
 
     /**
      * 课时数
      *
      * @var int
      */
-    public $lesson_count;
+    public $lesson_count = 0;
 
     /**
      * 学员数
      *
      * @var int
      */
-    public $user_count;
+    public $user_count = 0;
 
     /**
      * 咨询数
      *
      * @var int
      */
-    public $consult_count;
+    public $consult_count = 0;
 
     /**
      * 点赞数
      *
      * @var int
      */
-    public $like_count;
+    public $like_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -205,22 +205,18 @@ class Chapter extends Model
         $this->model = $course->model;
 
         if ($this->parent_id > 0) {
-
-            $attrs = [];
-
-            switch ($course->model) {
-                case Course::MODEL_VOD:
-                    $attrs = $this->_vod_attrs;
-                    break;
-                case Course::MODEL_LIVE:
-                    $attrs = $this->_live_attrs;
-                    break;
-                case Course::MODEL_READ:
-                    $attrs = $this->_read_attrs;
-                    break;
+            if (empty($this->attrs)) {
+                if ($this->model == Course::MODEL_VOD) {
+                    $this->attrs = $this->_vod_attrs;
+                } elseif ($this->model == Course::MODEL_LIVE) {
+                    $this->attrs = $this->_live_attrs;
+                } elseif ($this->model == Course::MODEL_READ) {
+                    $this->attrs = $this->_read_attrs;
+                }
+            }
+            if (is_array($this->attrs) && !empty($this->attrs)) {
+                $this->attrs = kg_json_encode($this->attrs);
             }
-
-            $this->attrs = kg_json_encode($attrs);
         }
 
         $this->create_time = time();
@@ -253,4 +249,4 @@ class Chapter extends Model
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ChapterLike.php b/app/Models/ChapterLike.php
index 7ee6d671..0421eee1 100644
--- a/app/Models/ChapterLike.php
+++ b/app/Models/ChapterLike.php
@@ -12,42 +12,42 @@ class ChapterLike extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -76,4 +76,4 @@ class ChapterLike extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ChapterLive.php b/app/Models/ChapterLive.php
index b31a2203..41c94474 100644
--- a/app/Models/ChapterLive.php
+++ b/app/Models/ChapterLive.php
@@ -17,63 +17,63 @@ class ChapterLive extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 开始时间
      *
      * @var int
      */
-    public $start_time;
+    public $start_time = 0;
 
     /**
      * 结束时间
      *
      * @var int
      */
-    public $end_time;
+    public $end_time = 0;
 
     /**
      * 用户限额
      *
      * @var int
      */
-    public $user_limit;
+    public $user_limit = 0;
 
     /**
      * 直播状态
      *
      * @var int
      */
-    public $status;
+    public $status = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -102,4 +102,4 @@ class ChapterLive extends Model
         return str_replace('chapter_', '', $streamName);
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ChapterRead.php b/app/Models/ChapterRead.php
index 2f20ee40..3dd8ffa2 100644
--- a/app/Models/ChapterRead.php
+++ b/app/Models/ChapterRead.php
@@ -10,42 +10,42 @@ class ChapterRead extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 内容
      *
      * @var string
      */
-    public $content;
+    public $content = '';
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -55,13 +55,6 @@ class ChapterRead extends Model
     public function beforeCreate()
     {
         $this->create_time = time();
-
-        /**
-         * text类型不能自动填充默认值
-         */
-        if (is_null($this->content)) {
-            $this->content = '';
-        }
     }
 
     public function beforeUpdate()
@@ -69,4 +62,4 @@ class ChapterRead extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ChapterUser.php b/app/Models/ChapterUser.php
index 911c1d5c..b3afebe0 100644
--- a/app/Models/ChapterUser.php
+++ b/app/Models/ChapterUser.php
@@ -12,84 +12,84 @@ class ChapterUser extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 计划编号
      *
      * @var int
      */
-    public $plan_id;
+    public $plan_id = 0;
 
     /**
-     * 学习时长
+     * 学习时长（秒）
      *
      * @var int
      */
-    public $duration;
+    public $duration = 0;
 
     /**
-     * 播放位置
+     * 播放位置（秒）
      *
      * @var int
      */
-    public $position;
+    public $position = 0;
 
     /**
-     * 学习进度
+     * 学习进度（％）
      *
      * @var int
      */
-    public $progress;
+    public $progress = 0;
 
     /**
      * 消费标识
      *
      * @var int
      */
-    public $consumed;
+    public $consumed = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -118,4 +118,4 @@ class ChapterUser extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ChapterVod.php b/app/Models/ChapterVod.php
index f06ad558..52b21b8a 100644
--- a/app/Models/ChapterVod.php
+++ b/app/Models/ChapterVod.php
@@ -12,49 +12,49 @@ class ChapterVod extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 文件编号
      *
      * @var string
      */
-    public $file_id;
+    public $file_id = '';
 
     /**
      * 文件转码
      *
-     * @var string
+     * @var array|string
      */
-    public $file_transcode;
+    public $file_transcode = '';
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -104,4 +104,4 @@ class ChapterVod extends Model
         return $transcode;
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Connect.php b/app/Models/Connect.php
index 4266e805..c5aa5cbd 100644
--- a/app/Models/Connect.php
+++ b/app/Models/Connect.php
@@ -16,63 +16,63 @@ class Connect extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 开放ID
      *
      * @var string
      */
-    public $open_id;
+    public $open_id = '';
 
     /**
      * 开放名称
      *
      * @var string
      */
-    public $open_name;
+    public $open_name = '';
 
     /**
      * 开放头像
      *
      * @var string
      */
-    public $open_avatar;
+    public $open_avatar = '';
 
     /**
      * 提供商
      *
      * @var int
      */
-    public $provider;
+    public $provider = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -101,4 +101,4 @@ class Connect extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Consult.php b/app/Models/Consult.php
index 31ea904d..de38b4a0 100644
--- a/app/Models/Consult.php
+++ b/app/Models/Consult.php
@@ -19,28 +19,35 @@ class Consult extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 提主编号
      *
      * @var int
      */
-    public $owner_id;
+    public $owner_id = 0;
+
+    /**
+     * 答主编号
+     *
+     * @var int
+     */
+    public $replier_id = 0;
 
     /**
      * 答主编号
@@ -54,77 +61,77 @@ class Consult extends Model
      *
      * @var string
      */
-    public $question;
+    public $question = '';
 
     /**
      * 回答
      *
      * @var string
      */
-    public $answer;
+    public $answer = '';
 
     /**
      * 评分
      *
      * @var int
      */
-    public $rating;
+    public $rating = 0;
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 私密标识
      *
      * @var int
      */
-    public $private;
+    public $private = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 赞成数
      *
      * @var int
      */
-    public $like_count;
+    public $like_count = 0;
 
     /**
      * 回复时间
      *
      * @var int
      */
-    public $reply_time;
+    public $reply_time = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -157,4 +164,4 @@ class Consult extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ConsultLike.php b/app/Models/ConsultLike.php
index efa4d3d5..b88af738 100644
--- a/app/Models/ConsultLike.php
+++ b/app/Models/ConsultLike.php
@@ -12,42 +12,42 @@ class ConsultLike extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 咨询编号
      *
      * @var int
      */
-    public $consult_id;
+    public $consult_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -76,4 +76,4 @@ class ConsultLike extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Course.php b/app/Models/Course.php
index f8420cc7..71285d02 100644
--- a/app/Models/Course.php
+++ b/app/Models/Course.php
@@ -52,56 +52,56 @@ class Course extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 封面
      *
      * @var string
      */
-    public $cover;
+    public $cover = '';
 
     /**
      * 简介
      *
      * @var string
      */
-    public $summary;
+    public $summary = '';
 
     /**
      * 关键字
      *
      * @var string
      */
-    public $keywords;
+    public $keywords = '';
 
     /**
      * 详情
      *
      * @var string
      */
-    public $details;
+    public $details = '';
 
     /**
      * 主分类编号
      *
      * @var int
      */
-    public $category_id;
+    public $category_id = 0;
 
     /**
      * 主教师编号
      *
      * @var int
      */
-    public $teacher_id;
+    public $teacher_id = 0;
 
     /**
      * 原始价格
@@ -115,147 +115,147 @@ class Course extends Model
      *
      * @var float
      */
-    public $market_price;
+    public $market_price = 0.00;
 
     /**
      * 会员价格
      *
      * @var float
      */
-    public $vip_price;
+    public $vip_price = 0.00;
 
     /**
      * 学习期限（月）
      *
      * @var int
      */
-    public $study_expiry;
+    public $study_expiry = 0;
 
     /**
      * 退款期限（天）
      *
      * @var int
      */
-    public $refund_expiry;
+    public $refund_expiry = 0;
 
     /**
      * 用户评价
      *
      * @var float
      */
-    public $rating;
+    public $rating = 0.00;
 
     /**
      * 综合得分
      *
      * @var float
      */
-    public $score;
+    public $score = 0.00;
 
     /**
      * 模式类型
      *
      * @var int
      */
-    public $model;
+    public $model = 0;
 
     /**
      * 难度级别
      *
      * @var int
      */
-    public $level;
+    public $level = 0;
 
     /**
      * 扩展属性
      *
      * @var string|array
      */
-    public $attrs;
+    public $attrs = '';
 
     /**
      * 推荐标识
      *
      * @var int
      */
-    public $featured;
+    public $featured = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 资源数
      *
      * @var int
      */
-    public $resource_count;
+    public $resource_count = 0;
 
     /**
      * 学员数
      *
      * @var int
      */
-    public $user_count;
+    public $user_count = 0;
 
     /**
      * 课时数
      *
      * @var int
      */
-    public $lesson_count;
+    public $lesson_count = 0;
 
     /**
      * 套餐数
      *
      * @var int
      */
-    public $package_count;
+    public $package_count = 0;
 
     /**
      * 咨询数
      *
      * @var int
      */
-    public $consult_count;
+    public $consult_count = 0;
 
     /**
      * 评价数
      *
      * @var int
      */
-    public $review_count;
+    public $review_count = 0;
 
     /**
      * 收藏数
      *
      * @var int
      */
-    public $favorite_count;
+    public $favorite_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -278,18 +278,18 @@ class Course extends Model
 
     public function beforeCreate()
     {
-        $attrs = [];
+        if (empty($this->attrs)) {
+            if ($this->model == self::MODEL_VOD) {
+                $this->attrs = $this->_vod_attrs;
+            } elseif ($this->model == self::MODEL_LIVE) {
+                $this->attrs = $this->_live_attrs;
+            } elseif ($this->model == self::MODEL_READ) {
+                $this->attrs = $this->_read_attrs;
+            }
+        }
 
-        switch ($this->model) {
-            case Course::MODEL_VOD:
-                $attrs = $this->_vod_attrs;
-                break;
-            case Course::MODEL_LIVE:
-                $attrs = $this->_live_attrs;
-                break;
-            case Course::MODEL_READ:
-                $attrs = $this->_read_attrs;
-                break;
+        if (is_array($this->attrs) && !empty($this->attrs)) {
+            $this->attrs = kg_json_encode($this->attrs);
         }
 
         if (empty($this->cover)) {
@@ -298,17 +298,6 @@ class Course extends Model
             $this->cover = self::getCoverPath($this->cover);
         }
 
-        /**
-         * text类型不会自动填充默认值
-         */
-        if (is_null($this->details)) {
-            $this->details = '';
-        }
-
-        if (!empty($attrs)) {
-            $this->attrs = kg_json_encode($attrs);
-        }
-
         $this->create_time = time();
     }
 
@@ -427,4 +416,4 @@ class Course extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/CourseCategory.php b/app/Models/CourseCategory.php
index 32eec7c6..ca820542 100644
--- a/app/Models/CourseCategory.php
+++ b/app/Models/CourseCategory.php
@@ -10,28 +10,28 @@ class CourseCategory extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 分类编号
      *
      * @var int
      */
-    public $category_id;
+    public $category_id = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     public function getSource(): string
     {
@@ -43,4 +43,4 @@ class CourseCategory extends Model
         $this->create_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/CourseFavorite.php b/app/Models/CourseFavorite.php
index eda06128..8801f8f2 100644
--- a/app/Models/CourseFavorite.php
+++ b/app/Models/CourseFavorite.php
@@ -12,42 +12,42 @@ class CourseFavorite extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -76,4 +76,4 @@ class CourseFavorite extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/CoursePackage.php b/app/Models/CoursePackage.php
index 1ea23a98..1ae4f7d1 100644
--- a/app/Models/CoursePackage.php
+++ b/app/Models/CoursePackage.php
@@ -10,28 +10,28 @@ class CoursePackage extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 套餐编号
      *
      * @var int
      */
-    public $package_id;
+    public $package_id = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     public function getSource(): string
     {
@@ -43,4 +43,4 @@ class CoursePackage extends Model
         $this->create_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/CourseRating.php b/app/Models/CourseRating.php
index 170be4ef..a124f798 100644
--- a/app/Models/CourseRating.php
+++ b/app/Models/CourseRating.php
@@ -10,49 +10,49 @@ class CourseRating extends Model
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 综合评分
      *
      * @var float
      */
-    public $rating;
+    public $rating = 0.00;
 
     /**
      * 维度1评分
      *
      * @var float
      */
-    public $rating1;
+    public $rating1 = 0.00;
 
     /**
      * 维度2评分
      *
      * @var float
      */
-    public $rating2;
+    public $rating2 = 0.00;
 
     /**
      * 维度3评分
      *
      * @var float
      */
-    public $rating3;
+    public $rating3 = 0.00;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -69,4 +69,4 @@ class CourseRating extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/CourseRelated.php b/app/Models/CourseRelated.php
index 4c593320..31c07801 100644
--- a/app/Models/CourseRelated.php
+++ b/app/Models/CourseRelated.php
@@ -10,28 +10,28 @@ class CourseRelated extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 相关编号
      *
      * @var int
      */
-    public $related_id;
+    public $related_id = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     public function getSource(): string
     {
@@ -43,4 +43,4 @@ class CourseRelated extends Model
         $this->create_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/CourseTopic.php b/app/Models/CourseTopic.php
index 083c1aef..3e3d04cc 100644
--- a/app/Models/CourseTopic.php
+++ b/app/Models/CourseTopic.php
@@ -10,28 +10,28 @@ class CourseTopic extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 话题编号
      *
      * @var int
      */
-    public $topic_id;
+    public $topic_id = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     public function getSource(): string
     {
@@ -43,4 +43,4 @@ class CourseTopic extends Model
         $this->create_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/CourseUser.php b/app/Models/CourseUser.php
index 09f316d4..f31c2995 100644
--- a/app/Models/CourseUser.php
+++ b/app/Models/CourseUser.php
@@ -20,97 +20,99 @@ class CourseUser extends Model
     const SOURCE_CHARGE = 2; // 付费
     const SOURCE_VIP = 3; // 会员
     const SOURCE_IMPORT = 4; // 导入
+    const SOURCE_POINT_REDEEM = 5; // 积分兑换
+    const SOURCE_LUCKY_REDEEM = 6; // 抽奖兑换
 
     /**
      * 主键编号
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 计划编号
      *
      * @var int
      */
-    public $plan_id;
+    public $plan_id = 0;
 
     /**
      * 角色类型
      *
      * @var int
      */
-    public $role_type;
+    public $role_type = 0;
 
     /**
      * 来源类型
      *
      * @var int
      */
-    public $source_type;
+    public $source_type = 0;
 
     /**
      * 过期时间
      *
      * @var int
      */
-    public $expiry_time;
+    public $expiry_time = 0;
 
     /**
-     * 学习时长
+     * 学习时长（秒）
      *
      * @var int
      */
-    public $duration;
+    public $duration = 0;
 
     /**
-     * 学习进度
+     * 学习进度（％）
      *
      * @var int
      */
-    public $progress;
+    public $progress = 0;
 
     /**
      * 评价标识
      *
      * @var int
      */
-    public $reviewed;
+    public $reviewed = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -156,7 +158,9 @@ class CourseUser extends Model
             self::SOURCE_CHARGE => '付费',
             self::SOURCE_VIP => '会员',
             self::SOURCE_IMPORT => '导入',
+            self::SOURCE_POINT_REDEEM => '积分兑换',
+            self::SOURCE_LUCKY_REDEEM => '抽奖兑换',
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Danmu.php b/app/Models/Danmu.php
index 78c2e612..56196005 100644
--- a/app/Models/Danmu.php
+++ b/app/Models/Danmu.php
@@ -34,91 +34,91 @@ class Danmu extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $owner_id;
+    public $owner_id = 0;
 
     /**
      * 内容
      *
      * @var string
      */
-    public $text;
+    public $text = '';
 
     /**
      * 颜色
      *
      * @var string
      */
-    public $color;
+    public $color = 'white';
 
     /**
      * 字号
      *
      * @var int
      */
-    public $size;
+    public $size = 0;
 
     /**
      * 位置
      *
      * @var int
      */
-    public $position;
+    public $position = 0;
 
     /**
      * 时间轴
      *
      * @var int
      */
-    public $time;
+    public $time = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 1;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -199,4 +199,4 @@ class Danmu extends Model
         return $keys[$index];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Help.php b/app/Models/Help.php
index aab1153b..403cc349 100644
--- a/app/Models/Help.php
+++ b/app/Models/Help.php
@@ -13,63 +13,63 @@ class Help extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 分类编号
      *
      * @var int
      */
-    public $category_id;
+    public $category_id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 内容
      *
      * @var string
      */
-    public $content;
+    public $content = '';
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -90,13 +90,6 @@ class Help extends Model
 
     public function beforeCreate()
     {
-        /**
-         * text类型不会自动填充默认值
-         */
-        if (is_null($this->content)) {
-            $this->content = '';
-        }
-
         $this->create_time = time();
     }
 
@@ -116,4 +109,4 @@ class Help extends Model
         $cache->rebuild();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ImFriendGroup.php b/app/Models/ImFriendGroup.php
index d51af955..7af9caca 100644
--- a/app/Models/ImFriendGroup.php
+++ b/app/Models/ImFriendGroup.php
@@ -12,49 +12,49 @@ class ImFriendGroup extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 名称
      *
      * @var string
      */
-    public $name;
+    public $name = '';
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 状态
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 成员数
      *
      * @var int
      */
-    public $user_count;
+    public $user_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -83,5 +83,4 @@ class ImFriendGroup extends Model
         $this->update_time = time();
     }
 
-}
-
+}
\ No newline at end of file
diff --git a/app/Models/ImFriendUser.php b/app/Models/ImFriendUser.php
index b2d169a6..b8f6d18f 100644
--- a/app/Models/ImFriendUser.php
+++ b/app/Models/ImFriendUser.php
@@ -10,49 +10,49 @@ class ImFriendUser extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 好友编号
      *
      * @var int
      */
-    public $friend_id;
+    public $friend_id = 0;
 
     /**
      * 分组编号
      *
      * @var int
      */
-    public $group_id;
+    public $group_id = 0;
 
     /**
      * 消息数量
      *
      * @var int
      */
-    public $msg_count;
+    public $msg_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -69,4 +69,4 @@ class ImFriendUser extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ImGroup.php b/app/Models/ImGroup.php
index ec899cd0..c18fa829 100644
--- a/app/Models/ImGroup.php
+++ b/app/Models/ImGroup.php
@@ -22,91 +22,91 @@ class ImGroup extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 群主编号
      *
      * @var int
      */
-    public $owner_id;
+    public $owner_id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 群组类型
      *
      * @var int
      */
-    public $type;
+    public $type = 0;
 
     /**
      * 名称
      *
      * @var string
      */
-    public $name;
+    public $name = '';
 
     /**
      * 图标
      *
      * @var string
      */
-    public $avatar;
+    public $avatar = '';
 
     /**
      * 简介
      *
      * @var string
      */
-    public $about;
+    public $about = '';
 
     /**
      * 发布状态
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除状态
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 成员数
      *
      * @var int
      */
-    public $user_count;
+    public $user_count = 0;
 
     /**
      * 消息数
      *
      * @var int
      */
-    public $msg_count;
+    public $msg_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -186,5 +186,4 @@ class ImGroup extends Model
         ];
     }
 
-}
-
+}
\ No newline at end of file
diff --git a/app/Models/ImGroupUser.php b/app/Models/ImGroupUser.php
index c5483884..0131532a 100644
--- a/app/Models/ImGroupUser.php
+++ b/app/Models/ImGroupUser.php
@@ -10,42 +10,42 @@ class ImGroupUser extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 群组编号
      *
      * @var int
      */
-    public $group_id;
+    public $group_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -62,5 +62,4 @@ class ImGroupUser extends Model
         $this->update_time = time();
     }
 
-}
-
+}
\ No newline at end of file
diff --git a/app/Models/ImMessage.php b/app/Models/ImMessage.php
index 92dbd568..fcef59d0 100644
--- a/app/Models/ImMessage.php
+++ b/app/Models/ImMessage.php
@@ -18,70 +18,70 @@ class ImMessage extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 对话编号
      *
      * @var string
      */
-    public $chat_id;
+    public $chat_id = '';
 
     /**
      * 发送方编号
      *
      * @var int
      */
-    public $sender_id;
+    public $sender_id = 0;
 
     /**
      * 接收方编号
      *
      * @var int
      */
-    public $receiver_id;
+    public $receiver_id = 0;
 
     /**
      * 接收方类型
      *
      * @var int
      */
-    public $receiver_type;
+    public $receiver_type = 0;
 
     /**
      * 内容
      *
      * @var string
      */
-    public $content;
+    public $content = '';
 
     /**
      * 阅读标识
      *
      * @var int
      */
-    public $viewed;
+    public $viewed = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -123,4 +123,4 @@ class ImMessage extends Model
         return implode('-', $list);
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ImNotice.php b/app/Models/ImNotice.php
index 612224b1..73fe6bfd 100644
--- a/app/Models/ImNotice.php
+++ b/app/Models/ImNotice.php
@@ -29,70 +29,70 @@ class ImNotice extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 发送方编号
      *
      * @var int
      */
-    public $sender_id;
+    public $sender_id = 0;
 
     /**
      * 接收方编号
      *
      * @var int
      */
-    public $receiver_id;
+    public $receiver_id = 0;
 
     /**
      * 条目类型
      *
      * @var int
      */
-    public $item_type;
+    public $item_type = 0;
 
     /**
      * 条目内容
      *
      * @var string
      */
-    public $item_info;
+    public $item_info = '';
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 阅读标识
      *
      * @var int
      */
-    public $viewed;
+    public $viewed = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -136,4 +136,4 @@ class ImNotice extends Model
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ImUser.php b/app/Models/ImUser.php
index b70cfde7..8a7bf9dc 100644
--- a/app/Models/ImUser.php
+++ b/app/Models/ImUser.php
@@ -21,77 +21,77 @@ class ImUser extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 名称
      *
      * @var string
      */
-    public $name;
+    public $name = '';
 
     /**
      * 头像
      *
      * @var string
      */
-    public $avatar;
+    public $avatar = '';
 
     /**
      * 签名
      *
      * @var string
      */
-    public $sign;
+    public $sign = '';
 
     /**
      * 皮肤
      *
      * @var string
      */
-    public $skin;
+    public $skin = '';
 
     /**
      * 状态
      *
      * @var string
      */
-    public $status;
+    public $status = 'none';
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 好友数
      *
      * @var int
      */
-    public $friend_count;
+    public $friend_count = 0;
 
     /**
      * 群组数
      *
      * @var int
      */
-    public $group_count;
+    public $group_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -146,4 +146,4 @@ class ImUser extends Model
         return $url;
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Learning.php b/app/Models/Learning.php
index 09391062..a84c32de 100644
--- a/app/Models/Learning.php
+++ b/app/Models/Learning.php
@@ -10,98 +10,98 @@ class Learning extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 请求编号
      *
      * @var string
      */
-    public $request_id;
+    public $request_id = '';
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 计划编号
      *
      * @var int
      */
-    public $plan_id;
+    public $plan_id = 0;
 
     /**
-     * 持续时长
+     * 持续时长（秒）
      *
      * @var int
      */
-    public $duration;
+    public $duration = 0;
 
     /**
-     * 播放位置
+     * 播放位置（秒）
      *
      * @var int
      */
-    public $position;
+    public $position = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 客户端类型
      *
      * @var int
      */
-    public $client_type;
+    public $client_type = 0;
 
     /**
      * 客户端IP
      *
      * @var string
      */
-    public $client_ip;
+    public $client_ip = '';
 
     /**
      * 活跃时间
      *
      * @var int
      */
-    public $active_time;
+    public $active_time = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -118,4 +118,4 @@ class Learning extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Nav.php b/app/Models/Nav.php
index f8b98ae5..5370784f 100644
--- a/app/Models/Nav.php
+++ b/app/Models/Nav.php
@@ -24,98 +24,98 @@ class Nav extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 上级编号
      *
      * @var int
      */
-    public $parent_id;
+    public $parent_id = 0;
 
     /**
      * 层级
      *
      * @var int
      */
-    public $level;
+    public $level = 0;
 
     /**
      * 名称
      *
      * @var string
      */
-    public $name;
+    public $name = '';
 
     /**
      * 路径
      *
      * @var string
      */
-    public $path;
+    public $path = '';
 
     /**
      * 打开方式
      *
      * @var string
      */
-    public $target;
+    public $target = '';
 
     /**
      * 链接地址
      *
      * @var string
      */
-    public $url;
+    public $url = '';
 
     /**
      * 位置
      *
      * @var int
      */
-    public $position;
+    public $position = 1;
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 节点数
      *
      * @var int
      */
-    public $child_count;
+    public $child_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -164,4 +164,4 @@ class Nav extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Online.php b/app/Models/Online.php
index e00c62a2..9780740f 100644
--- a/app/Models/Online.php
+++ b/app/Models/Online.php
@@ -10,49 +10,49 @@ class Online extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 客户端类型
      *
      * @var int
      */
-    public $client_type;
+    public $client_type = 0;
 
     /**
      * 客户端IP
      *
      * @var string
      */
-    public $client_ip;
+    public $client_ip = '';
 
     /**
      * 活跃时间
      *
      * @var int
      */
-    public $active_time;
+    public $active_time = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -69,4 +69,4 @@ class Online extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 22924000..675b191a 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -30,98 +30,98 @@ class Order extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 序号
      *
      * @var string
      */
-    public $sn;
+    public $sn = '';
 
     /**
      * 主题
      *
      * @var string
      */
-    public $subject;
+    public $subject = '';
 
     /**
      * 金额
      *
      * @var float
      */
-    public $amount;
+    public $amount = 0.00;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $owner_id;
+    public $owner_id = 0;
 
     /**
      * 条目编号
      *
      * @var int
      */
-    public $item_id;
+    public $item_id = 0;
 
     /**
      * 条目类型
      *
      * @var int
      */
-    public $item_type;
+    public $item_type = 0;
 
     /**
      * 条目信息
      *
      * @var string|array
      */
-    public $item_info;
+    public $item_info = '';
 
     /**
      * 终端类型
      *
      * @var int
      */
-    public $client_type;
+    public $client_type = 0;
 
     /**
      * 终端IP
      *
      * @var string
      */
-    public $client_ip;
+    public $client_ip = '';
 
     /**
      * 状态类型
      *
      * @var int
      */
-    public $status;
+    public $status = self::STATUS_PENDING;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -205,4 +205,4 @@ class Order extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/OrderStatus.php b/app/Models/OrderStatus.php
index 2f38f6ec..85b528be 100644
--- a/app/Models/OrderStatus.php
+++ b/app/Models/OrderStatus.php
@@ -10,28 +10,28 @@ class OrderStatus extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 订单编号
      *
      * @var int
      */
-    public $order_id;
+    public $order_id = 0;
 
     /**
      * 状态类型
      *
      * @var int
      */
-    public $status;
+    public $status = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     public function getSource(): string
     {
@@ -43,4 +43,4 @@ class OrderStatus extends Model
         $this->create_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Package.php b/app/Models/Package.php
index 583a3c0a..ff5ba3f5 100644
--- a/app/Models/Package.php
+++ b/app/Models/Package.php
@@ -13,70 +13,70 @@ class Package extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 简介
      *
      * @var string
      */
-    public $summary;
+    public $summary = '';
 
     /**
      * 优惠价格
      *
      * @var float
      */
-    public $market_price;
+    public $market_price = 0.00;
 
     /**
      * 会员价格
      *
      * @var float
      */
-    public $vip_price;
+    public $vip_price = 0.00;
 
     /**
      * 课程数量
      *
      * @var int
      */
-    public $course_count;
+    public $course_count = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -122,4 +122,4 @@ class Package extends Model
         $this->vip_price = (float)$this->vip_price;
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Page.php b/app/Models/Page.php
index aed492e1..8b18ed14 100644
--- a/app/Models/Page.php
+++ b/app/Models/Page.php
@@ -13,49 +13,49 @@ class Page extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 内容
      *
      * @var string
      */
-    public $content;
+    public $content = '';
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -76,13 +76,6 @@ class Page extends Model
 
     public function beforeCreate()
     {
-        /**
-         * text类型不会自动填充默认值
-         */
-        if (is_null($this->content)) {
-            $this->content = '';
-        }
-
         $this->create_time = time();
     }
 
@@ -102,4 +95,4 @@ class Page extends Model
         $cache->rebuild();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/PointGift.php b/app/Models/PointGift.php
new file mode 100644
index 00000000..a24e4313
--- /dev/null
+++ b/app/Models/PointGift.php
@@ -0,0 +1,242 @@
+<?php
+
+namespace App\Models;
+
+use App\Caches\MaxPointGiftId as MaxPointGiftIdCache;
+use Phalcon\Mvc\Model\Behavior\SoftDelete;
+use Phalcon\Text;
+
+class PointGift extends Model
+{
+
+    /**
+     * 礼物类型
+     */
+    const TYPE_COURSE = 1; // 课程
+    const TYPE_GOODS = 2; // 商品
+    const TYPE_CASH = 3; // 现金
+
+    /**
+     * 课程扩展属性
+     *
+     * @var array
+     */
+    protected $_course_attrs = [
+        'id' => 0,
+        'title' => '',
+        'market_price' => 0,
+        'study_expiry_time' => 0,
+    ];
+
+    /**
+     * 商品扩展属性
+     *
+     * @var array
+     */
+    protected $_goods_attrs = [
+        'source' => '',
+        'price' => 0,
+        'url' => '',
+    ];
+
+    /**
+     * 现金扩展属性
+     *
+     * @var array
+     */
+    protected $_cash_attrs = ['amount' => 0];
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id = 0;
+
+    /**
+     * 名称
+     *
+     * @var string
+     */
+    public $name = '';
+
+    /**
+     * 封面
+     *
+     * @var string
+     */
+    public $cover = '';
+
+    /**
+     * 详情
+     *
+     * @var string
+     */
+    public $details = '';
+
+    /**
+     * 属性
+     *
+     * @var string|array
+     */
+    public $attrs = [];
+
+    /**
+     * 类型
+     *
+     * @var int
+     */
+    public $type = 0;
+
+    /**
+     * 库存
+     *
+     * @var int
+     */
+    public $stock = 0;
+
+    /**
+     * 所需积分
+     *
+     * @var int
+     */
+    public $point = 0;
+
+    /**
+     * 发布标识
+     *
+     * @var int
+     */
+    public $published = 0;
+
+    /**
+     * 删除标识
+     *
+     * @var int
+     */
+    public $deleted = 0;
+
+    /**
+     * 兑换限额
+     *
+     * @var int
+     */
+    public $redeem_limit = 1;
+
+    /**
+     * 兑换数量
+     *
+     * @var int
+     */
+    public $redeem_count = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    /**
+     * 更新时间
+     *
+     * @var int
+     */
+    public $update_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_point_gift';
+    }
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        $this->addBehavior(
+            new SoftDelete([
+                'field' => 'deleted',
+                'value' => 1,
+            ])
+        );
+    }
+
+    public function beforeCreate()
+    {
+        if (empty($this->attrs)) {
+            if ($this->type == self::TYPE_COURSE) {
+                $this->attrs = $this->_course_attrs;
+            } elseif ($this->type == self::TYPE_GOODS) {
+                $this->attrs = $this->_goods_attrs;
+            } elseif ($this->type == self::TYPE_CASH) {
+                $this->attrs = $this->_cash_attrs;
+            }
+        }
+
+        if (is_array($this->attrs) && !empty($this->attrs)) {
+            $this->attrs = kg_json_encode($this->attrs);
+        }
+
+        if (empty($this->cover)) {
+            $this->cover = kg_default_cover_path();
+        } elseif (Text::startsWith($this->cover, 'http')) {
+            $this->cover = self::getCoverPath($this->cover);
+        }
+
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        if (Text::startsWith($this->cover, 'http')) {
+            $this->cover = self::getCoverPath($this->cover);
+        }
+
+        if (is_array($this->attrs) && !empty($this->attrs)) {
+            $this->attrs = kg_json_encode($this->attrs);
+        }
+
+        if ($this->deleted == 1) {
+            $this->published = 0;
+        }
+
+        $this->update_time = time();
+    }
+
+    public function afterCreate()
+    {
+        $cache = new MaxPointGiftIdCache();
+
+        $cache->rebuild();
+    }
+
+    public function afterFetch()
+    {
+        if (!Text::startsWith($this->cover, 'http')) {
+            $this->cover = kg_cos_cover_url($this->cover);
+        }
+
+        if (is_string($this->attrs) && !empty($this->attrs)) {
+            $this->attrs = json_decode($this->attrs, true);
+        }
+    }
+
+    public static function getCoverPath($url)
+    {
+        if (Text::startsWith($url, 'http')) {
+            return parse_url($url, PHP_URL_PATH);
+        }
+
+        return $url;
+    }
+
+    public static function types()
+    {
+        return [
+            self::TYPE_COURSE => '课程',
+            self::TYPE_GOODS => '商品',
+            self::TYPE_CASH => '现金',
+        ];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/PointHistory.php b/app/Models/PointHistory.php
new file mode 100644
index 00000000..0b6919c9
--- /dev/null
+++ b/app/Models/PointHistory.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Models;
+
+use Phalcon\Mvc\Model\Behavior\SoftDelete;
+
+class PointHistory extends Model
+{
+
+    /**
+     * 事件类型
+     */
+    const EVENT_ORDER_CONSUME = 1; // 订单消费
+    const EVENT_POINT_REDEEM = 2; // 积分兑换
+    const EVENT_POINT_REFUND = 3; // 积分退款
+    const EVENT_ACCOUNT_REGISTER = 4; // 帐号注册
+    const EVENT_SITE_VISIT = 5; // 站点访问
+    const EVENT_CHAPTER_STUDY = 6; // 课时学习
+    const EVENT_COURSE_REVIEW = 7; // 课程评价
+    const EVENT_IM_DISCUSS = 8; // 微聊讨论
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id = 0;
+
+    /**
+     * 用户编号
+     *
+     * @var int
+     */
+    public $user_id = 0;
+
+    /**
+     * 用户名称
+     *
+     * @var int
+     */
+    public $user_name = '';
+
+    /**
+     * 事件编号
+     *
+     * @var int
+     */
+    public $event_id = 0;
+
+    /**
+     * 事件类型
+     *
+     * @var int
+     */
+    public $event_type = '';
+
+    /**
+     * 事件内容
+     *
+     * @var string|array
+     */
+    public $event_info = [];
+
+    /**
+     * 事件积分
+     *
+     * @var int
+     */
+    public $event_point = 0;
+
+    /**
+     * 删除标识
+     *
+     * @var int
+     */
+    public $deleted = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    /**
+     * 更新时间
+     *
+     * @var int
+     */
+    public $update_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_point_history';
+    }
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        $this->addBehavior(
+            new SoftDelete([
+                'field' => 'deleted',
+                'value' => 1,
+            ])
+        );
+    }
+
+    public function beforeCreate()
+    {
+        if (is_array($this->event_info) && !empty($this->event_info)) {
+            $this->event_info = kg_json_encode($this->event_info);
+        }
+
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        $this->update_time = time();
+    }
+
+    public function afterFetch()
+    {
+        if (is_string($this->event_info) && !empty($this->event_info)) {
+            $this->event_info = json_decode($this->event_info, true);
+        }
+    }
+
+    public static function eventTypes()
+    {
+        return [
+            self::EVENT_ORDER_CONSUME => '订单消费',
+            self::EVENT_POINT_REDEEM => '积分兑换',
+            self::EVENT_POINT_REFUND => '积分退款',
+            self::EVENT_ACCOUNT_REGISTER => '用户注册',
+            self::EVENT_SITE_VISIT => '用户登录',
+            self::EVENT_CHAPTER_STUDY => '课时学习',
+            self::EVENT_COURSE_REVIEW => '课程评价',
+            self::EVENT_IM_DISCUSS => '微聊讨论',
+        ];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/PointRedeem.php b/app/Models/PointRedeem.php
new file mode 100644
index 00000000..ddabb505
--- /dev/null
+++ b/app/Models/PointRedeem.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace App\Models;
+
+class PointRedeem extends Model
+{
+
+    /**
+     * 状态类型
+     */
+    const STATUS_PENDING = 1; // 待处理
+    const STATUS_FINISHED = 2; // 已完成
+    const STATUS_FAILED = 3; //　已失败
+
+    /**
+     * 主键编号
+     *
+     * @var int
+     */
+    public $id = 0;
+
+    /**
+     * 用户编号
+     *
+     * @var int
+     */
+    public $user_id = 0;
+
+    /**
+     * 用户名称
+     *
+     * @var string
+     */
+    public $user_name = '';
+
+    /**
+     * 礼品编号
+     *
+     * @var int
+     */
+    public $gift_id = 0;
+
+    /**
+     * 礼品名称
+     *
+     * @var string
+     */
+    public $gift_name = '';
+
+    /**
+     * 礼品类型
+     *
+     * @var int
+     */
+    public $gift_type = 0;
+
+    /**
+     * 礼品积分
+     *
+     * @var int
+     */
+    public $gift_point = 0;
+
+    /**
+     * 联系人
+     *
+     * @var string
+     */
+    public $contact_name = '';
+
+    /**
+     * 联系电话
+     *
+     * @var string
+     */
+    public $contact_phone = '';
+
+    /**
+     * 联系地址
+     *
+     * @var string
+     */
+    public $contact_address = '';
+
+    /**
+     * 备注内容
+     *
+     * @var string
+     */
+    public $remark = '';
+
+    /**
+     * 兑换状态
+     *
+     * @var int
+     */
+    public $status = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    /**
+     * 更新时间
+     *
+     * @var int
+     */
+    public $update_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_point_redeem';
+    }
+
+    public function beforeCreate()
+    {
+        $this->status = self::STATUS_PENDING;
+
+        $this->create_time = time();
+    }
+
+    public function beforeUpdate()
+    {
+        $this->update_time = time();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/Refund.php b/app/Models/Refund.php
index f893bd2c..f74bf494 100644
--- a/app/Models/Refund.php
+++ b/app/Models/Refund.php
@@ -22,91 +22,91 @@ class Refund extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $owner_id;
+    public $owner_id = 0;
 
     /**
      * 订单编号
      *
      * @var int
      */
-    public $order_id;
+    public $order_id = 0;
 
     /**
      * 交易编号
      *
      * @var int
      */
-    public $trade_id;
+    public $trade_id = 0;
 
     /**
      * 序号
      *
      * @var string
      */
-    public $sn;
+    public $sn = '';
 
     /**
      * 主题
      *
      * @var string
      */
-    public $subject;
+    public $subject = '';
 
     /**
      * 金额
      *
      * @var float
      */
-    public $amount;
+    public $amount = 0.00;
 
     /**
      * 状态类型
      *
      * @var int
      */
-    public $status;
+    public $status = self::STATUS_PENDING;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 申请备注
      *
      * @var string
      */
-    public $apply_note;
+    public $apply_note = '';
 
     /**
      * 审核备注
      *
      * @var string
      */
-    public $review_note;
+    public $review_note = '';
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -129,6 +129,8 @@ class Refund extends Model
 
     public function beforeCreate()
     {
+        $this->status = self::STATUS_PENDING;
+
         $this->sn = date('YmdHis') . rand(1000, 9999);
 
         $this->create_time = time();
@@ -166,4 +168,4 @@ class Refund extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/RefundStatus.php b/app/Models/RefundStatus.php
index 5b57d592..e0130076 100644
--- a/app/Models/RefundStatus.php
+++ b/app/Models/RefundStatus.php
@@ -10,28 +10,28 @@ class RefundStatus extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      *  退款编号
      *
      * @var int
      */
-    public $refund_id;
+    public $refund_id = 0;
 
     /**
      * 状态类型
      *
      * @var int
      */
-    public $status;
+    public $status = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     public function getSource(): string
     {
@@ -43,4 +43,4 @@ class RefundStatus extends Model
         $this->create_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Resource.php b/app/Models/Resource.php
index 15245d50..77b58e29 100644
--- a/app/Models/Resource.php
+++ b/app/Models/Resource.php
@@ -10,42 +10,42 @@ class Resource extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 章节编号
      *
      * @var int
      */
-    public $chapter_id;
+    public $chapter_id = 0;
 
     /**
      * 上传编号
      *
      * @var int
      */
-    public $upload_id;
+    public $upload_id = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -62,4 +62,4 @@ class Resource extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Review.php b/app/Models/Review.php
index 5d6b6e4f..6e6f2a68 100644
--- a/app/Models/Review.php
+++ b/app/Models/Review.php
@@ -12,105 +12,105 @@ class Review extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 课程编号
      *
      * @var int
      */
-    public $course_id;
+    public $course_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $owner_id;
+    public $owner_id = 0;
 
     /**
      * 评价内容
      *
      * @var string
      */
-    public $content;
+    public $content = '';
 
     /**
      * 回复内容
      *
      * @var string
      */
-    public $reply;
+    public $reply = '';
 
     /**
      * 综合评分
      *
      * @var float
      */
-    public $rating;
+    public $rating = 0.00;
 
     /**
      * 维度1评分
      *
      * @var float
      */
-    public $rating1;
+    public $rating1 = 0.00;
 
     /**
      * 维度2评分
      *
      * @var float
      */
-    public $rating2;
+    public $rating2 = 0.00;
 
     /**
      * 维度3评分
      *
      * @var float
      */
-    public $rating3;
+    public $rating3 = 0.00;
 
     /**
      * 匿名标识
      *
      * @var int
      */
-    public $anonymous;
+    public $anonymous = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 点赞数量
      *
      * @var int
      */
-    public $like_count;
+    public $like_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -154,4 +154,4 @@ class Review extends Model
         return round($sumRating / 3, 2);
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/ReviewLike.php b/app/Models/ReviewLike.php
index bfd03e72..96b09b09 100644
--- a/app/Models/ReviewLike.php
+++ b/app/Models/ReviewLike.php
@@ -12,42 +12,42 @@ class ReviewLike extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 评价编号
      *
      * @var int
      */
-    public $review_id;
+    public $review_id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -76,4 +76,4 @@ class ReviewLike extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Reward.php b/app/Models/Reward.php
index 017a0258..dc6d9ffa 100644
--- a/app/Models/Reward.php
+++ b/app/Models/Reward.php
@@ -12,42 +12,42 @@ class Reward extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 价格
      *
      * @var float
      */
-    public $price;
+    public $price = 0.00;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -81,4 +81,4 @@ class Reward extends Model
         $this->price = (float)$this->price;
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Role.php b/app/Models/Role.php
index a30b573b..ed631fb4 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -26,63 +26,63 @@ class Role extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 类型
      *
-     * @var string
+     * @var int
      */
-    public $type;
+    public $type = self::TYPE_CUSTOM;
 
     /**
      * 名称
      *
      * @var string
      */
-    public $name;
+    public $name = '';
 
     /**
      * 简介
      *
      * @var string
      */
-    public $summary;
+    public $summary = '';
 
     /**
      * 权限路由
      *
-     * @var string
+     * @var array|string
      */
-    public $routes;
+    public $routes = '';
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 成员数
      *
      * @var int
      */
-    public $user_count;
+    public $user_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -146,4 +146,4 @@ class Role extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index a4bd5f01..edc89b87 100644
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -10,32 +10,32 @@ class Setting extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 配置块
      *
      * @var string
      */
-    public $section;
+    public $section = '';
 
     /**
      * 配置键
      *
      * @var string
      */
-    public $item_key;
+    public $item_key = '';
 
     /**
      * 配置值
      *
      * @var string
      */
-    public $item_value;
+    public $item_value = '';
 
     public function getSource(): string
     {
         return 'kg_setting';
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Slide.php b/app/Models/Slide.php
index d5675fff..4d72b708 100644
--- a/app/Models/Slide.php
+++ b/app/Models/Slide.php
@@ -20,84 +20,84 @@ class Slide extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 封面
      *
      * @var string
      */
-    public $cover;
+    public $cover = '';
 
     /**
      * 摘要
      *
      * @var string
      */
-    public $summary;
+    public $summary = '';
 
     /**
      * 内容
      *
      * @var string
      */
-    public $content;
+    public $content = '';
 
     /**
      * 平台
      *
      * @var int
      */
-    public $platform;
+    public $platform = 0;
 
     /**
      * 目标
      *
      * @var int
      */
-    public $target;
+    public $target = 0;
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -165,4 +165,4 @@ class Slide extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Task.php b/app/Models/Task.php
index dd85bb59..4f7dd698 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -10,6 +10,14 @@ class Task extends Model
      */
     const TYPE_DELIVER = 1; // 发货
     const TYPE_REFUND = 2; // 退款
+    const TYPE_POINT_GIFT_DELIVER = 3; // 积分礼品派发
+    const TYPE_LUCKY_GIFT_DELIVER = 4; // 抽奖礼品派发
+
+    const TYPE_NOTICE_ACCOUNT_LOGIN = 11; // 帐号登录通知
+    const TYPE_NOTICE_LIVE_BEGIN = 12; // 直播开始通知
+    const TYPE_NOTICE_ORDER_FINISH = 13; // 订单完成通知
+    const TYPE_NOTICE_REFUND_FINISH = 14; // 退款完成通知
+    const TYPE_NOTICE_CONSULT_REPLY = 15; // 咨询回复通知
 
     const TYPE_NOTICE_ACCOUNT_LOGIN = 11; // 帐号登录通知
     const TYPE_NOTICE_LIVE_BEGIN = 12; // 直播开始通知
@@ -37,63 +45,63 @@ class Task extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 条目编号
      *
      * @var int
      */
-    public $item_id;
+    public $item_id = 0;
 
     /**
      * 条目类型
      *
      * @var int
      */
-    public $item_type;
+    public $item_type = 0;
 
     /**
      * 条目内容
      *
      * @var string|array
      */
-    public $item_info;
+    public $item_info = '';
 
     /**
      * 优先级
      *
      * @var int
      */
-    public $priority;
+    public $priority = self::PRIORITY_LOW;
 
     /**
      * 状态标识
      *
      * @var int
      */
-    public $status;
+    public $status = self::STATUS_PENDING;
 
     /**
      * 重试次数
      *
      * @var int
      */
-    public $try_count;
+    public $try_count = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -127,4 +135,4 @@ class Task extends Model
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Topic.php b/app/Models/Topic.php
index f4776907..6b5794b5 100644
--- a/app/Models/Topic.php
+++ b/app/Models/Topic.php
@@ -13,56 +13,56 @@ class Topic extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 简介
      *
      * @var string
      */
-    public $summary;
+    public $summary = '';
 
     /**
      * 课程数量
      *
      * @var int
      */
-    public $course_count;
+    public $course_count = 0;
 
     /**
      * 发布标识
      *
      * @var int
      */
-    public $published;
+    public $published = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -102,4 +102,4 @@ class Topic extends Model
         $cache->rebuild();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Trade.php b/app/Models/Trade.php
index 0a3d24bf..3090222f 100644
--- a/app/Models/Trade.php
+++ b/app/Models/Trade.php
@@ -26,84 +26,84 @@ class Trade extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $owner_id;
+    public $owner_id = 0;
 
     /**
      * 订单编号
      *
      * @var int
      */
-    public $order_id;
+    public $order_id = 0;
 
     /**
      * 商户流水号
      *
      * @var string
      */
-    public $sn;
+    public $sn = '';
 
     /**
      * 主题
      *
      * @var string
      */
-    public $subject;
+    public $subject = '';
 
     /**
      * 金额
      *
      * @var float
      */
-    public $amount;
+    public $amount = 0.00;
 
     /**
      * 平台类型
      *
      * @var int
      */
-    public $channel;
+    public $channel = 0;
 
     /**
      * 平台流水号
      *
      * @var string
      */
-    public $channel_sn;
+    public $channel_sn = '';
 
     /**
      * 状态类型
      *
      * @var int
      */
-    public $status;
+    public $status = self::STATUS_PENDING;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -171,4 +171,4 @@ class Trade extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/TradeStatus.php b/app/Models/TradeStatus.php
index 9b1a2f5a..175d095c 100644
--- a/app/Models/TradeStatus.php
+++ b/app/Models/TradeStatus.php
@@ -10,28 +10,28 @@ class TradeStatus extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 交易编号
      *
      * @var int
      */
-    public $trade_id;
+    public $trade_id = 0;
 
     /**
      * 状态类型
      *
      * @var int
      */
-    public $status;
+    public $status = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     public function getSource(): string
     {
@@ -43,4 +43,4 @@ class TradeStatus extends Model
         $this->create_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Upload.php b/app/Models/Upload.php
index c6e717f8..ed86f76e 100644
--- a/app/Models/Upload.php
+++ b/app/Models/Upload.php
@@ -23,70 +23,70 @@ class Upload extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 名称
      *
      * @var string
      */
-    public $name;
+    public $name = '';
 
     /**
      * 路径
      *
      * @var string
      */
-    public $path;
+    public $path = '';
 
     /**
      * mime
      *
      * @var string
      */
-    public $mime;
+    public $mime = '';
 
     /**
      * md5
      *
      * @var string
      */
-    public $md5;
+    public $md5 = '';
 
     /**
-     * 大小
+     * 大小（字节）
      *
      * @var int
      */
-    public $size;
+    public $size = 0;
 
     /**
      * 类型
      *
      * @var int
      */
-    public $type;
+    public $type = 0;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -122,4 +122,4 @@ class Upload extends Model
         $cache->rebuild();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/User.php b/app/Models/User.php
index 4e007a8d..f4d7703c 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Caches\MaxUserId as MaxUserIdCache;
+use App\Caches\User as UserCache;
 use App\Services\Sync\UserIndex as UserIndexSync;
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
 use Phalcon\Text;
@@ -216,6 +217,10 @@ class User extends Model
                 'avatar' => $this->avatar,
             ]);
         }
+
+        $userCache = new UserCache();
+
+        $userCache->rebuild($this->id);
     }
 
     public function afterFetch()
@@ -251,4 +256,4 @@ class User extends Model
         ];
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/UserBalance.php b/app/Models/UserBalance.php
new file mode 100644
index 00000000..8ab1334f
--- /dev/null
+++ b/app/Models/UserBalance.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Models;
+
+use Phalcon\Mvc\Model\Behavior\SoftDelete;
+
+class UserBalance extends Model
+{
+
+    /**
+     * 用户编号（主键）
+     *
+     * @var int
+     */
+    public $user_id = 0;
+
+    /**
+     * 可用现金（元）
+     *
+     * @var float
+     */
+    public $cash = 0.00;
+
+    /**
+     * 可用积分
+     *
+     * @var int
+     */
+    public $point = 0;
+
+    /**
+     * 删除标识
+     *
+     * @var int
+     */
+    public $deleted = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    /**
+     * 更新时间
+     *
+     * @var int
+     */
+    public $update_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_user_balance';
+    }
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        $this->addBehavior(
+            new SoftDelete([
+                'field' => 'deleted',
+                'value' => 1,
+            ])
+        );
+    }
+
+    public function beforeCreate()
+    {
+        $this->create_time = time();
+    }
+
+    public function beforeSave()
+    {
+        $this->update_time = time();
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/UserContact.php b/app/Models/UserContact.php
new file mode 100644
index 00000000..790df7ca
--- /dev/null
+++ b/app/Models/UserContact.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Models;
+
+use Phalcon\Mvc\Model\Behavior\SoftDelete;
+
+
+class UserContact extends Model
+{
+
+    /**
+     * 用户编号（主键）
+     *
+     * @var int
+     */
+    public $user_id = 0;
+
+    /**
+     * 姓名
+     *
+     * @var string
+     */
+    public $name = '';
+
+    /**
+     * 手机
+     *
+     * @var string
+     */
+    public $phone = '';
+
+    /**
+     * 地址（省）
+     *
+     * @var string
+     */
+    public $add_province = '';
+
+    /**
+     * 地址（市）
+     *
+     * @var string
+     */
+    public $add_city = '';
+
+    /**
+     * 地址（区）
+     *
+     * @var string
+     */
+    public $add_county = '';
+
+    /**
+     * 地址（详）
+     *
+     * @var string
+     */
+    public $add_other = '';
+
+    /**
+     * 删除标识
+     *
+     * @var int
+     */
+    public $deleted = 0;
+
+    /**
+     * 创建时间
+     *
+     * @var int
+     */
+    public $create_time = 0;
+
+    /**
+     * 更新时间
+     *
+     * @var int
+     */
+    public $update_time = 0;
+
+    public function getSource(): string
+    {
+        return 'kg_user_contact';
+    }
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        $this->addBehavior(
+            new SoftDelete([
+                'field' => 'deleted',
+                'value' => 1,
+            ])
+        );
+    }
+
+    public function beforeSave()
+    {
+        if (empty($this->create_time)) {
+            $this->create_time = time();
+        }
+
+        $this->update_time = time();
+    }
+
+    public function fullAddress()
+    {
+        return implode(' ', [
+            $this->add_province,
+            $this->add_city,
+            $this->add_county,
+            $this->add_other,
+        ]);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Models/UserSession.php b/app/Models/UserSession.php
index 1e50498e..31fd144b 100644
--- a/app/Models/UserSession.php
+++ b/app/Models/UserSession.php
@@ -12,56 +12,56 @@ class UserSession extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 会话编号
      *
      * @var string
      */
-    public $session_id;
+    public $session_id = '';
 
     /**
      * 终端类型
      *
      * @var int
      */
-    public $client_type;
+    public $client_type = 0;
 
     /**
      * 终端IP
      *
      * @var string
      */
-    public $client_ip;
+    public $client_ip = '';
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -90,4 +90,4 @@ class UserSession extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/UserToken.php b/app/Models/UserToken.php
index 8a1ee4d3..a3f6f642 100644
--- a/app/Models/UserToken.php
+++ b/app/Models/UserToken.php
@@ -12,56 +12,56 @@ class UserToken extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 令牌
      *
      * @var string
      */
-    public $token;
+    public $token = '';
 
     /**
      * 终端类型
      *
      * @var int
      */
-    public $client_type;
+    public $client_type = 0;
 
     /**
      * 终端IP
      *
      * @var string
      */
-    public $client_ip;
+    public $client_ip = '';
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -90,4 +90,4 @@ class UserToken extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/Vip.php b/app/Models/Vip.php
index 26453113..b6a8446e 100644
--- a/app/Models/Vip.php
+++ b/app/Models/Vip.php
@@ -12,49 +12,49 @@ class Vip extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 标题
      *
      * @var string
      */
-    public $title;
+    public $title = '';
 
     /**
      * 期限（天）
      *
      * @var int
      */
-    public $expiry;
+    public $expiry = 0;
 
     /**
      * 价格
      *
      * @var float
      */
-    public $price;
+    public $price = 0.00;
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -88,4 +88,4 @@ class Vip extends Model
         $this->price = (float)$this->price;
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Models/WechatSubscribe.php b/app/Models/WechatSubscribe.php
index e1633caa..0e2efe98 100644
--- a/app/Models/WechatSubscribe.php
+++ b/app/Models/WechatSubscribe.php
@@ -12,42 +12,42 @@ class WechatSubscribe extends Model
      *
      * @var int
      */
-    public $id;
+    public $id = 0;
 
     /**
      * 用户编号
      *
      * @var int
      */
-    public $user_id;
+    public $user_id = 0;
 
     /**
      * 开放ID
      *
      * @var string
      */
-    public $open_id;
+    public $open_id = '';
 
     /**
      * 删除标识
      *
      * @var int
      */
-    public $deleted;
+    public $deleted = 0;
 
     /**
      * 创建时间
      *
      * @var int
      */
-    public $create_time;
+    public $create_time = 0;
 
     /**
      * 更新时间
      *
      * @var int
      */
-    public $update_time;
+    public $update_time = 0;
 
     public function getSource(): string
     {
@@ -76,4 +76,4 @@ class WechatSubscribe extends Model
         $this->update_time = time();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/Repos/PointGift.php b/app/Repos/PointGift.php
new file mode 100644
index 00000000..406ce516
--- /dev/null
+++ b/app/Repos/PointGift.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\PointGift as PointGiftModel;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class PointGift extends Repository
+{
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(PointGiftModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['id'])) {
+            $builder->andWhere('id = :id:', ['id' => $where['id']]);
+        }
+
+        if (!empty($where['type'])) {
+            $builder->andWhere('type = :type:', ['type' => $where['type']]);
+        }
+
+        if (!empty($where['name'])) {
+            $builder->andWhere('name LIKE :name:', ['name' => "%{$where['name']}%"]);
+        }
+
+        if (isset($where['published'])) {
+            $builder->andWhere('published = :published:', ['published' => $where['published']]);
+        }
+
+        if (isset($where['deleted'])) {
+            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
+        }
+
+        switch ($sort) {
+            case 'popular':
+                $orderBy = 'redeem_count DESC';
+                break;
+            default:
+                $orderBy = 'id DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+    /**
+     * @param int $id
+     * @return PointGiftModel|Model|bool
+     */
+    public function findById($id)
+    {
+        return PointGiftModel::findFirst([
+            'conditions' => 'id = :id:',
+            'bind' => ['id' => $id],
+        ]);
+    }
+
+    /**
+     * @param array $ids
+     * @param string|array $columns
+     * @return ResultsetInterface|Resultset|PointGiftModel[]
+     */
+    public function findByIds($ids, $columns = '*')
+    {
+        return PointGiftModel::query()
+            ->columns($columns)
+            ->inWhere('id', $ids)
+            ->execute();
+    }
+
+}
diff --git a/app/Repos/PointHistory.php b/app/Repos/PointHistory.php
new file mode 100644
index 00000000..234425ca
--- /dev/null
+++ b/app/Repos/PointHistory.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\PointHistory as PointHistoryModel;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class PointHistory extends Repository
+{
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(PointHistoryModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['user_id'])) {
+            $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
+        }
+
+        if (!empty($where['event_id'])) {
+            $builder->andWhere('event_id = :event_id:', ['event_id' => $where['event_id']]);
+        }
+
+        if (!empty($where['event_type'])) {
+            $builder->andWhere('event_type = :event_type:', ['event_type' => $where['event_type']]);
+        }
+
+        switch ($sort) {
+            default:
+                $orderBy = 'id DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+    /**
+     * @param int $eventId
+     * @param int $eventType
+     * @return PointHistoryModel|Model|bool
+     */
+    public function findEventHistory($eventId, $eventType)
+    {
+        return PointHistoryModel::findFirst([
+            'conditions' => 'event_id = ?1 AND event_type = ?2',
+            'bind' => [1 => $eventId, 2 => $eventType],
+        ]);
+    }
+
+    /**
+     * @param int $eventId
+     * @param int $eventType
+     * @param string $date
+     * @return PointHistoryModel|Model|bool
+     */
+    public function findDailyEventHistory($eventId, $eventType, $date)
+    {
+        $createTime = strtotime($date);
+
+        return PointHistoryModel::findFirst([
+            'conditions' => 'event_id = ?1 AND event_type = ?2 AND create_time > ?3',
+            'bind' => [1 => $eventId, 2 => $eventType, 3 => $createTime],
+        ]);
+    }
+
+    /**
+     * @param int $id
+     * @return PointHistoryModel|Model|bool
+     */
+    public function findById($id)
+    {
+        return PointHistoryModel::findFirst([
+            'conditions' => 'id = :id:',
+            'bind' => ['id' => $id],
+        ]);
+    }
+
+    /**
+     * @param array $ids
+     * @param string|array $columns
+     * @return ResultsetInterface|Resultset|PointHistoryModel[]
+     */
+    public function findByIds($ids, $columns = '*')
+    {
+        return PointHistoryModel::query()
+            ->columns($columns)
+            ->inWhere('id', $ids)
+            ->execute();
+    }
+
+}
diff --git a/app/Repos/PointRedeem.php b/app/Repos/PointRedeem.php
new file mode 100644
index 00000000..b5f4a877
--- /dev/null
+++ b/app/Repos/PointRedeem.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\PointRedeem as PointRedeemModel;
+use Phalcon\Mvc\Model;
+
+class PointRedeem extends Repository
+{
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(PointRedeemModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['user_id'])) {
+            $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
+        }
+
+        if (!empty($where['gift_id'])) {
+            $builder->andWhere('gift_id = :gift_id:', ['gift_id' => $where['gift_id']]);
+        }
+
+        if (!empty($where['gift_type'])) {
+            $builder->andWhere('gift_type = :gift_type:', ['gift_type' => $where['gift_type']]);
+        }
+
+        if (!empty($where['status'])) {
+            $builder->andWhere('status = :status:', ['status' => $where['status']]);
+        }
+
+        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 PointRedeemModel|Model|bool
+     */
+    public function findById($id)
+    {
+        return PointRedeemModel::findFirst([
+            'conditions' => 'id = :id:',
+            'bind' => ['id' => $id],
+        ]);
+    }
+
+    public function countUserGiftRedeems($userId, $giftId)
+    {
+        return (int)PointRedeemModel::count([
+            'conditions' => 'user_id = :user_id: AND gift_id = :gift_id:',
+            'bind' => ['user_id' => $userId, 'gift_id' => $giftId],
+        ]);
+    }
+
+}
diff --git a/app/Repos/User.php b/app/Repos/User.php
index 1c2e1c78..c8c2a9a8 100644
--- a/app/Repos/User.php
+++ b/app/Repos/User.php
@@ -7,6 +7,8 @@ use App\Models\CourseFavorite as CourseFavoriteModel;
 use App\Models\CourseUser as CourseUserModel;
 use App\Models\ImUser as ImUserModel;
 use App\Models\User as UserModel;
+use App\Models\UserBalance as UserBalanceModel;
+use App\Models\UserContact as UserContactModel;
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
@@ -104,6 +106,30 @@ class User extends Repository
             ->execute();
     }
 
+    /**
+     * @param int $userId
+     * @return UserBalanceModel|Model
+     */
+    public function findUserBalance($userId)
+    {
+        return UserBalanceModel::findFirst([
+            'conditions' => 'user_id = :user_id:',
+            'bind' => ['user_id' => $userId],
+        ]);
+    }
+
+    /**
+     * @param int $userId
+     * @return UserContactModel|Model
+     */
+    public function findUserContact($userId)
+    {
+        return UserContactModel::findFirst([
+            'conditions' => 'user_id = :user_id:',
+            'bind' => ['user_id' => $userId],
+        ]);
+    }
+
     /**
      * @param int $id
      * @return ImUserModel|Model|bool
diff --git a/app/Services/Auth/Api.php b/app/Services/Auth/Api.php
index 6a13f3df..e1cf4a2c 100644
--- a/app/Services/Auth/Api.php
+++ b/app/Services/Auth/Api.php
@@ -17,10 +17,7 @@ class Api extends AuthService
     {
         $token = $this->generateToken($user->id);
 
-        /**
-         * demo版本不限制多人登录
-         */
-        // $this->logoutOtherClients($user->id);
+        $this->logoutOtherClients($user->id);
 
         $this->createUserToken($user->id, $token);
 
diff --git a/app/Services/Auth/Home.php b/app/Services/Auth/Home.php
index be023728..6cafc47d 100644
--- a/app/Services/Auth/Home.php
+++ b/app/Services/Auth/Home.php
@@ -17,10 +17,7 @@ class Home extends AuthService
     {
         $sessionId = $this->session->getId();
 
-        /**
-         * demo版本不限制多人登录
-         */
-        // $this->logoutOtherClients($user->id);
+        $this->logoutOtherClients($user->id);
 
         $this->createUserSession($user->id, $sessionId);
 
diff --git a/app/Services/ChapterVod.php b/app/Services/ChapterVod.php
index 89d6d292..f0ab6c78 100644
--- a/app/Services/ChapterVod.php
+++ b/app/Services/ChapterVod.php
@@ -17,16 +17,11 @@ class ChapterVod extends Service
             return [];
         }
 
-        /**
-         * @var array $transcode
-         */
-        $transcode = $vod->file_transcode;
-
         $vod = new Vod();
 
         $result = [];
 
-        foreach ($transcode as $key => $file) {
+        foreach ($vod->file_transcode as $key => $file) {
             $file['url'] = $vod->getPlayUrl($file['url']);
             $type = $this->getDefinitionType($file['height']);
             $result[$type] = $file;
@@ -54,14 +49,14 @@ class ChapterVod extends Service
     }
 
     /**
-     * @return array
+     * 腾讯云播放器只支持[od|hd|sd]，实际转码速率[hd|sd|fd]，重新映射清晰度
      */
     protected function getVodTemplates()
     {
         return [
-            'hd' => ['height' => 720, 'rate' => 1800],
-            'sd' => ['height' => 540, 'rate' => 1000],
-            'fd' => ['height' => 360, 'rate' => 400],
+            'od' => ['height' => 720, 'rate' => 1800],
+            'hd' => ['height' => 540, 'rate' => 1000],
+            'sd' => ['height' => 360, 'rate' => 400],
         ];
     }
 
diff --git a/app/Services/Logic/Chapter/BasicInfo.php b/app/Services/Logic/Chapter/BasicInfo.php
index 65e88b25..8c571f8c 100644
--- a/app/Services/Logic/Chapter/BasicInfo.php
+++ b/app/Services/Logic/Chapter/BasicInfo.php
@@ -112,6 +112,8 @@ class BasicInfo extends Service
 
         $read = $chapterRepo->findChapterRead($chapter->id);
 
+        $read->content = kg_parse_markdown($read->content);
+
         return [
             'id' => $chapter->id,
             'title' => $chapter->title,
diff --git a/app/Services/Logic/Chapter/ChapterLike.php b/app/Services/Logic/Chapter/ChapterLike.php
index d917e83c..d564dd89 100644
--- a/app/Services/Logic/Chapter/ChapterLike.php
+++ b/app/Services/Logic/Chapter/ChapterLike.php
@@ -77,7 +77,7 @@ class ChapterLike extends Service
 
     protected function incrUserDailyChapterLikeCount(UserModel $user)
     {
-        $this->eventsManager->fire('userDailyCounter:incrChapterLikeCount', $this, $user);
+        $this->eventsManager->fire('UserDailyCounter:incrChapterLikeCount', $this, $user);
     }
 
 }
diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php
index 7f21287d..369fd19a 100644
--- a/app/Services/Logic/Consult/ConsultCreate.php
+++ b/app/Services/Logic/Consult/ConsultCreate.php
@@ -147,7 +147,7 @@ class ConsultCreate extends Service
 
     protected function incrUserDailyConsultCount(UserModel $user)
     {
-        $this->eventsManager->fire('userDailyCounter:incrConsultCount', $this, $user);
+        $this->eventsManager->fire('UserDailyCounter:incrConsultCount', $this, $user);
     }
 
 }
diff --git a/app/Services/Logic/Consult/ConsultLike.php b/app/Services/Logic/Consult/ConsultLike.php
index c49adeef..e1c06fb8 100644
--- a/app/Services/Logic/Consult/ConsultLike.php
+++ b/app/Services/Logic/Consult/ConsultLike.php
@@ -78,7 +78,7 @@ class ConsultLike extends Service
 
     protected function incrUserDailyConsultLikeCount(UserModel $user)
     {
-        $this->eventsManager->fire('userDailyCounter:incrConsultLikeCount', $this, $user);
+        $this->eventsManager->fire('UserDailyCounter:incrConsultLikeCount', $this, $user);
     }
 
 }
diff --git a/app/Services/Logic/Danmu/DanmuCreate.php b/app/Services/Logic/Danmu/DanmuCreate.php
index 35fe1b26..47288358 100644
--- a/app/Services/Logic/Danmu/DanmuCreate.php
+++ b/app/Services/Logic/Danmu/DanmuCreate.php
@@ -53,7 +53,7 @@ class DanmuCreate extends Service
 
     protected function incrUserDailyDanmuCount(UserModel $user)
     {
-        $this->eventsManager->fire('userDailyCounter:incrDanmuCount', $this, $user);
+        $this->eventsManager->fire('UserDailyCounter:incrDanmuCount', $this, $user);
     }
 
 }
diff --git a/app/Services/Logic/Notice/PointRedeemFinish.php b/app/Services/Logic/Notice/PointRedeemFinish.php
new file mode 100644
index 00000000..2c88e21e
--- /dev/null
+++ b/app/Services/Logic/Notice/PointRedeemFinish.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Services\Logic\Notice;
+
+use App\Models\Order as OrderModel;
+use App\Models\Task as TaskModel;
+use App\Repos\Order as OrderRepo;
+use App\Repos\User as UserRepo;
+use App\Repos\WechatSubscribe as WechatSubscribeRepo;
+use App\Services\Logic\Service as LogicService;
+use App\Services\Sms\Notice\OrderFinish as SmsOrderFinishNotice;
+use App\Services\Wechat\Notice\OrderFinish as WechatOrderFinishNotice;
+
+class PointRedeemFinish extends LogicService
+{
+
+    public function handleTask(TaskModel $task)
+    {
+        $orderId = $task->item_info['order']['id'];
+
+        $orderRepo = new OrderRepo();
+
+        $order = $orderRepo->findById($orderId);
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($order->owner_id);
+
+        $params = [
+            'user' => [
+                'id' => $user->id,
+                'name' => $user->name,
+            ],
+            'order' => [
+                'sn' => $order->sn,
+                'subject' => $order->subject,
+                'amount' => $order->amount,
+                'create_time' => $order->create_time,
+                'update_time' => $order->update_time,
+            ],
+        ];
+
+        $subscribeRepo = new WechatSubscribeRepo();
+
+        $subscribe = $subscribeRepo->findByUserId($order->owner_id);
+
+        if ($subscribe && $subscribe->deleted == 0) {
+
+            $notice = new WechatOrderFinishNotice();
+
+            return $notice->handle($subscribe, $params);
+
+        } else {
+
+            $notice = new SmsOrderFinishNotice();
+
+            return $notice->handle($user, $params);
+        }
+    }
+
+    public function createTask(OrderModel $order)
+    {
+        $task = new TaskModel();
+
+        $itemInfo = [
+            'order' => ['id' => $order->id],
+        ];
+
+        $task->item_id = $order->id;
+        $task->item_info = $itemInfo;
+        $task->item_type = TaskModel::TYPE_NOTICE_ORDER_FINISH;
+        $task->priority = TaskModel::PRIORITY_HIGH;
+        $task->status = TaskModel::STATUS_PENDING;
+
+        $task->create();
+    }
+
+}
diff --git a/app/Services/Logic/Order/OrderCreate.php b/app/Services/Logic/Order/OrderCreate.php
index b829b21e..d03ed8d5 100644
--- a/app/Services/Logic/Order/OrderCreate.php
+++ b/app/Services/Logic/Order/OrderCreate.php
@@ -221,7 +221,7 @@ class OrderCreate extends Service
 
     protected function incrUserDailyOrderCount(UserModel $user)
     {
-        $this->eventsManager->fire('userDailyCounter:incrOrderCount', $this, $user);
+        $this->eventsManager->fire('UserDailyCounter:incrOrderCount', $this, $user);
     }
 
 }
diff --git a/app/Services/Logic/Point/GiftInfo.php b/app/Services/Logic/Point/GiftInfo.php
new file mode 100644
index 00000000..4cb7caf8
--- /dev/null
+++ b/app/Services/Logic/Point/GiftInfo.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Services\Logic\Point;
+
+use App\Models\PointGift;
+use App\Services\Logic\CourseTrait;
+use App\Services\Logic\PointGiftTrait;
+use App\Services\Logic\Service;
+
+class GiftInfo extends Service
+{
+
+    use CourseTrait;
+    use PointGiftTrait;
+
+    public function handle($id)
+    {
+        $gift = $this->checkGift($id);
+
+        if ($gift->type == PointGift::TYPE_COURSE) {
+            $gift = $this->getCourseGift($gift);
+        }
+
+        $gift->details = kg_parse_markdown($gift->details);
+
+        return [
+            'id' => $gift->id,
+            'name' => $gift->name,
+            'cover' => $gift->cover,
+            'details' => $gift->details,
+            'attrs' => $gift->attrs,
+            'type' => $gift->type,
+            'stock' => $gift->stock,
+            'point' => $gift->point,
+            'redeem_limit' => $gift->redeem_limit,
+            'redeem_count' => $gift->redeem_count,
+        ];
+    }
+
+    protected function getCourseGift(PointGift $gift)
+    {
+        $courseId = $gift->attrs['id'] ?? 0;
+
+        $course = $this->checkCourse($courseId);
+
+        $gift->name = $course->title;
+        $gift->cover = $course->cover;
+        $gift->details = $course->details;
+
+        return $gift;
+    }
+
+}
diff --git a/app/Services/Logic/Point/GiftList.php b/app/Services/Logic/Point/GiftList.php
new file mode 100644
index 00000000..d3a7b16b
--- /dev/null
+++ b/app/Services/Logic/Point/GiftList.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Services\Logic\Point;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\PointGift as PointGiftRepo;
+use App\Services\Logic\Service;
+
+class GiftList extends Service
+{
+
+    public function handle()
+    {
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['published'] = 1;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $giftRepo = new PointGiftRepo();
+
+        $pager = $giftRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handleGifts($pager);
+    }
+
+    protected function handleGifts($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $baseUrl = kg_cos_url();
+
+        $items = [];
+
+        foreach ($pager->items->toArray() as $gift) {
+
+            $gift['cover'] = $baseUrl . $gift['cover'];
+
+            $items[] = [
+                'id' => $gift['id'],
+                'name' => $gift['name'],
+                'cover' => $gift['cover'],
+                'details' => $gift['details'],
+                'type' => $gift['type'],
+                'point' => $gift['point'],
+                'redeem_count' => $gift['redeem_count'],
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/Point/HotGiftList.php b/app/Services/Logic/Point/HotGiftList.php
new file mode 100644
index 00000000..0564722b
--- /dev/null
+++ b/app/Services/Logic/Point/HotGiftList.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Services\Logic\Point;
+
+use App\Caches\PointHotGiftList;
+use App\Services\Logic\Service;
+
+class HotGiftList extends Service
+{
+
+    public function handle()
+    {
+        $cache = new PointHotGiftList();
+
+        $cache->setLimit(5);
+
+        return $cache->get() ?: [];
+    }
+
+}
diff --git a/app/Services/Logic/Point/PointHistory.php b/app/Services/Logic/Point/PointHistory.php
new file mode 100644
index 00000000..ef6641fd
--- /dev/null
+++ b/app/Services/Logic/Point/PointHistory.php
@@ -0,0 +1,440 @@
+<?php
+
+namespace App\Services\Logic\Point;
+
+use App\Models\ChapterUser as ChapterUserModel;
+use App\Models\ImMessage as ImMessageModel;
+use App\Models\Order as OrderModel;
+use App\Models\PointHistory as PointHistoryModel;
+use App\Models\PointRedeem as PointRedeemModel;
+use App\Models\Review as ReviewModel;
+use App\Models\User as UserModel;
+use App\Models\UserBalance as UserBalanceModel;
+use App\Repos\Chapter as ChapterRepo;
+use App\Repos\Course as CourseRepo;
+use App\Repos\PointHistory as PointHistoryRepo;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Service;
+
+class PointHistory extends Service
+{
+
+    public function handleOrderConsume(OrderModel $order)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $ruleEnabled = $setting['consume_rule']['enabled'] ?? 0;
+
+        if ($ruleEnabled == 0) return;
+
+        $ruleRate = $setting['consume_rule']['rate'] ?? 0;
+
+        if ($ruleRate <= 0) return;
+
+        $eventId = $order->id;
+        $eventType = PointHistoryModel::EVENT_ORDER_CONSUME;
+        $eventPoint = $ruleRate * $order->amount;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($order->owner_id);
+
+        $eventInfo = [
+            'order' => [
+                'sn' => $order->sn,
+                'subject' => $order->subject,
+                'amount' => $order->amount,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_point = $eventPoint;
+        $history->event_info = $eventInfo;
+
+        $this->handlePointHistory($history);
+    }
+
+    public function handlePointRedeem(PointRedeemModel $redeem)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventId = $redeem->id;
+        $eventType = PointHistoryModel::EVENT_POINT_REDEEM;
+        $eventPoint = 0 - $redeem->gift_point;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($redeem->user_id);
+
+        $eventInfo = [
+            'point_redeem' => [
+                'id' => $redeem->id,
+                'gift_id' => $redeem->gift_id,
+                'gift_name' => $redeem->gift_name,
+                'gift_type' => $redeem->gift_type,
+                'gift_point' => $redeem->gift_point,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_point = $eventPoint;
+        $history->event_info = $eventInfo;
+
+        $this->handlePointHistory($history);
+    }
+
+    public function handlePointRefund(PointRedeemModel $redeem)
+    {
+        $eventId = $redeem->id;
+        $eventType = PointHistoryModel::EVENT_POINT_REFUND;
+        $eventPoint = $redeem->gift_point;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($redeem->user_id);
+
+        $eventInfo = [
+            'point_redeem' => [
+                'id' => $redeem->id,
+                'gift_id' => $redeem->gift_id,
+                'gift_name' => $redeem->gift_name,
+                'gift_type' => $redeem->gift_type,
+                'gift_point' => $redeem->gift_point,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_point = $eventPoint;
+        $history->event_info = $eventInfo;
+
+        $this->handlePointHistory($history);
+    }
+
+    public function handleSiteVisit(UserModel $user)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['site_visit']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['site_visit']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $eventId = $user->id;
+        $eventType = PointHistoryModel::EVENT_SITE_VISIT;
+        $eventInfo = '每日访问';
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findDailyEventHistory($eventId, $eventType, date('Ymd'));
+
+        if ($history) return;
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_point = $eventPoint;
+        $history->event_info = $eventInfo;
+
+        $this->handlePointHistory($history);
+    }
+
+    public function handleAccountRegister(UserModel $user)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['account_register']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['account_register']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $eventId = $user->id;
+        $eventType = PointHistoryModel::EVENT_ACCOUNT_REGISTER;
+        $eventInfo = '帐号注册';
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findDailyEventHistory($eventId, $eventType, date('Ymd'));
+
+        if ($history) return;
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $user->id;
+        $history->event_type = $eventType;
+        $history->event_point = $eventPoint;
+        $history->event_info = $eventInfo;
+
+        $this->handlePointHistory($history);
+    }
+
+    public function handleChapterStudy(ChapterUserModel $chapterUser)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['chapter_study']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['chapter_study']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $eventId = $chapterUser->id;
+        $eventType = PointHistoryModel::EVENT_CHAPTER_STUDY;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($chapterUser->user_id);
+
+        $courseRepo = new CourseRepo();
+
+        $course = $courseRepo->findById($chapterUser->course_id);
+
+        $chapterRepo = new ChapterRepo();
+
+        $chapter = $chapterRepo->findById($chapterUser->chapter_id);
+
+        $eventInfo = [
+            'course' => [
+                'id' => $course->id,
+                'title' => $course->title,
+            ],
+            'chapter' => [
+                'id' => $chapter->id,
+                'title' => $chapter->title,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_info = $eventInfo;
+        $history->event_point = $eventPoint;
+
+        $this->handlePointHistory($history);
+    }
+
+    public function handleCourseReview(ReviewModel $review)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['course_review']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['course_review']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $eventId = $review->id;
+        $eventType = PointHistoryModel::EVENT_COURSE_REVIEW;
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findEventHistory($eventId, $eventType);
+
+        if ($history) return;
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($review->owner_id);
+
+        $courseRepo = new CourseRepo();
+
+        $course = $courseRepo->findById($review->course_id);
+
+        $eventInfo = [
+            'course' => [
+                'id' => $course->id,
+                'title' => $course->title,
+            ]
+        ];
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_info = $eventInfo;
+        $history->event_point = $eventPoint;
+
+        $this->handlePointHistory($history);
+    }
+
+    public function handleImDiscuss(ImMessageModel $message)
+    {
+        $setting = $this->getSettings('point');
+
+        $pointEnabled = $setting['enabled'] ?? 0;
+
+        if ($pointEnabled == 0) return;
+
+        $eventRule = json_decode($setting['event_rule'], true);
+
+        $eventEnabled = $eventRule['im_discuss']['enabled'] ?? 0;
+
+        if ($eventEnabled == 0) return;
+
+        $eventPoint = $eventRule['im_discuss']['point'] ?? 0;
+
+        if ($eventPoint <= 0) return;
+
+        $eventId = $message->sender_id;
+        $eventType = PointHistoryModel::EVENT_IM_DISCUSS;
+        $eventInfo = '每日微聊';
+
+        $historyRepo = new PointHistoryRepo();
+
+        $history = $historyRepo->findDailyEventHistory($eventId, $eventType, date('Ymd'));
+
+        if ($history) return;
+
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($message->sender_id);
+
+        $history = new PointHistoryModel();
+
+        $history->user_id = $user->id;
+        $history->user_name = $user->name;
+        $history->event_id = $eventId;
+        $history->event_type = $eventType;
+        $history->event_info = $eventInfo;
+        $history->event_point = $eventPoint;
+
+        $this->handlePointHistory($history);
+    }
+
+    protected function handlePointHistory(PointHistoryModel $history)
+    {
+        $logger = $this->getLogger('point');
+
+        try {
+
+            $this->db->begin();
+
+            if ($history->create() === false) {
+                throw new \RuntimeException('Create Point History Failed');
+            }
+
+            $userRepo = new UserRepo();
+
+            $balance = $userRepo->findUserBalance($history->user_id);
+
+            if ($balance) {
+                $balance->user_id = $history->user_id;
+                $balance->point += $history->event_point;
+                $result = $balance->update();
+            } else {
+                $balance = new UserBalanceModel();
+                $balance->user_id = $history->user_id;
+                $balance->point = $history->event_point;
+                $result = $balance->create();
+            }
+
+            if ($result === false) {
+                throw new \RuntimeException('Save User Balance Failed');
+            }
+
+            $this->db->commit();
+
+        } catch (\Exception $e) {
+
+            $this->db->rollback();
+
+            $logger->error('Point History Exception ' . kg_json_encode([
+                    'code' => $e->getCode(),
+                    'message' => $e->getMessage(),
+                ]));
+
+            throw new \RuntimeException('sys.trans_rollback');
+        }
+    }
+
+}
diff --git a/app/Services/Logic/Point/PointRedeem.php b/app/Services/Logic/Point/PointRedeem.php
new file mode 100644
index 00000000..5be3cc65
--- /dev/null
+++ b/app/Services/Logic/Point/PointRedeem.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace App\Services\Logic\Point;
+
+use App\Library\Utils\Lock as LockUtil;
+use App\Models\PointGift as PointGiftModel;
+use App\Models\PointRedeem as PointRedeemModel;
+use App\Models\Task as TaskModel;
+use App\Models\User as UserModel;
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Point\PointHistory as PointHistoryService;
+use App\Services\Logic\PointGiftTrait;
+use App\Services\Logic\Service;
+use App\Validators\PointRedeem as PointRedeemValidator;
+
+class PointRedeem extends Service
+{
+
+    use PointGiftTrait;
+
+    public function handle()
+    {
+        $giftId = $this->request->getPost('gift_id', ['trim', 'int']);
+
+        $gift = $this->checkGift($giftId);
+
+        $user = $this->getLoginUser();
+
+        $validator = new PointRedeemValidator();
+
+        $validator->checkIfAllowRedeem($gift, $user);
+
+        $this->createPointRedeem($gift, $user);
+    }
+
+    protected function createPointRedeem(PointGiftModel $gift, UserModel $user)
+    {
+        $logger = $this->getLogger('point');
+
+        $itemId = "point_redeem:{$gift->id}";
+
+        $lockId = LockUtil::addLock($itemId);
+
+        if ($lockId === false) {
+            throw new \RuntimeException('Add Lock Failed');
+        }
+
+        try {
+
+            $this->db->begin();
+
+            $redeem = new PointRedeemModel();
+
+            $redeem->user_id = $user->id;
+            $redeem->user_name = $user->name;
+            $redeem->gift_id = $gift->id;
+            $redeem->gift_type = $gift->type;
+            $redeem->gift_name = $gift->name;
+            $redeem->gift_point = $gift->point;
+
+            if ($gift->type == PointGiftModel::TYPE_GOODS) {
+                $userRepo = new UserRepo();
+                $contact = $userRepo->findUserContact($user->id);
+                $redeem->contact_name = $contact->name;
+                $redeem->contact_phone = $contact->phone;
+                $redeem->contact_address = $contact->fullAddress();
+            }
+
+            $result = $redeem->create();
+
+            if ($result === false) {
+                throw new \RuntimeException('Create Point Redeem Failed');
+            }
+
+            $gift->stock -= 1;
+            $gift->redeem_count += 1;
+
+            if ($gift->update() === false) {
+                throw new \RuntimeException('Decrease Gift Stock Failed');
+            }
+
+            $task = new TaskModel();
+
+            $itemInfo = [
+                'point_redeem' => [
+                    'id' => $redeem->id,
+                    'user_id' => $redeem->user_id,
+                    'gift_id' => $redeem->gift_id,
+                ]
+            ];
+
+            $task->item_id = $redeem->id;
+            $task->item_type = TaskModel::TYPE_POINT_GIFT_DELIVER;
+            $task->item_info = $itemInfo;
+
+            $result = $task->create();
+
+            if ($result === false) {
+                throw new \RuntimeException('Create Gift Deliver Task Failed');
+            }
+
+            $this->handleRedeemPoint($redeem);
+
+            $this->db->commit();
+
+        } catch (\Exception $e) {
+
+            $this->db->rollback();
+
+            $logger->error('Point Redeem Exception ' . kg_json_encode([
+                    'file' => $e->getFile(),
+                    'line' => $e->getLine(),
+                    'message' => $e->getMessage(),
+                ]));
+
+            throw new \RuntimeException('sys.trans_rollback');
+        }
+
+        LockUtil::releaseLock($itemId, $lockId);
+    }
+
+    protected function handleRedeemPoint(PointRedeemModel $redeem)
+    {
+        $service = new PointHistoryService();
+
+        $service->handlePointRedeem($redeem);
+    }
+
+}
diff --git a/app/Services/Logic/PointGiftTrait.php b/app/Services/Logic/PointGiftTrait.php
new file mode 100644
index 00000000..c7095fba
--- /dev/null
+++ b/app/Services/Logic/PointGiftTrait.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Services\Logic;
+
+use App\Validators\PointGift as PointGiftValidator;
+
+trait PointGiftTrait
+{
+
+    public function checkGift($id)
+    {
+        $validator = new PointGiftValidator();
+
+        return $validator->checkGift($id);
+    }
+
+}
diff --git a/app/Services/Logic/Review/ReviewCreate.php b/app/Services/Logic/Review/ReviewCreate.php
index b56d38fe..1b4d3c37 100644
--- a/app/Services/Logic/Review/ReviewCreate.php
+++ b/app/Services/Logic/Review/ReviewCreate.php
@@ -54,6 +54,8 @@ class ReviewCreate extends Service
 
         $this->updateCourseRating($course);
 
+        $this->eventsManager->fire('Review:afterCreate', $this, $review);
+
         return $review;
     }
 
diff --git a/app/Services/Logic/Review/ReviewLike.php b/app/Services/Logic/Review/ReviewLike.php
index 033371a4..5ae74f52 100644
--- a/app/Services/Logic/Review/ReviewLike.php
+++ b/app/Services/Logic/Review/ReviewLike.php
@@ -78,7 +78,7 @@ class ReviewLike extends Service
 
     protected function incrUserDailyReviewLikeCount(UserModel $user)
     {
-        $this->eventsManager->fire('userDailyCounter:incrReviewLikeCount', $this, $user);
+        $this->eventsManager->fire('UserDailyCounter:incrReviewLikeCount', $this, $user);
     }
 
 }
diff --git a/app/Services/Logic/User/Console/BalanceInfo.php b/app/Services/Logic/User/Console/BalanceInfo.php
new file mode 100644
index 00000000..656d4253
--- /dev/null
+++ b/app/Services/Logic/User/Console/BalanceInfo.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Services\Logic\User\Console;
+
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Service;
+
+class BalanceInfo extends Service
+{
+
+    public function handle()
+    {
+        $user = $this->getLoginUser();
+
+        $userRepo = new UserRepo();
+
+        $balance = $userRepo->findUserBalance($user->id);
+
+        if (!$balance) {
+            return [
+                'cash' => 0.00,
+                'point' => 0,
+            ];
+        }
+
+        return [
+            'cash' => $balance->cash,
+            'point' => $balance->point,
+        ];
+    }
+
+}
diff --git a/app/Services/Logic/User/Console/ContactInfo.php b/app/Services/Logic/User/Console/ContactInfo.php
new file mode 100644
index 00000000..1125baec
--- /dev/null
+++ b/app/Services/Logic/User/Console/ContactInfo.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Services\Logic\User\Console;
+
+use App\Repos\User as UserRepo;
+use App\Services\Logic\Service;
+
+class ContactInfo extends Service
+{
+
+    public function handle()
+    {
+        $user = $this->getLoginUser();
+
+        $userRepo = new UserRepo();
+
+        $contact = $userRepo->findUserContact($user->id);
+
+        if (!$contact) {
+            return $this->defaultContactInfo();
+        }
+
+        return [
+            'name' => $contact->name,
+            'phone' => $contact->phone,
+            'add_province' => $contact->add_province,
+            'add_city' => $contact->add_city,
+            'add_county' => $contact->add_county,
+            'add_other' => $contact->add_other,
+        ];
+    }
+
+    protected function defaultContactInfo()
+    {
+        return [
+            'name' => '',
+            'phone' => '',
+            'add_province' => '',
+            'add_city' => '',
+            'add_county' => '',
+            'add_other' => '',
+        ];
+    }
+
+}
diff --git a/app/Services/Logic/User/Console/ContactUpdate.php b/app/Services/Logic/User/Console/ContactUpdate.php
new file mode 100644
index 00000000..d8ab0aaf
--- /dev/null
+++ b/app/Services/Logic/User/Console/ContactUpdate.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Services\Logic\User\Console;
+
+use App\Models\UserContact as UserContactModel;
+use App\Services\Logic\Service;
+use App\Validators\UserContact as UserContactValidator;
+
+class ContactUpdate extends Service
+{
+
+    public function handle()
+    {
+        $post = $this->request->getPost();
+
+        $user = $this->getLoginUser();
+
+        $validator = new UserContactValidator();
+
+        $contact = new UserContactModel();
+
+        $contact->name = $validator->checkName($post['name']);
+        $contact->phone = $validator->checkPhone($post['phone']);
+        $contact->add_province = $validator->checkAddProvince($post['address']['province']);
+        $contact->add_city = $validator->checkAddCity($post['address']['city']);
+        $contact->add_county = $validator->checkAddCounty($post['address']['county']);
+        $contact->add_other = $validator->checkAddOther($post['address']['other']);
+        $contact->user_id = $user->id;
+
+        $contact->save();
+
+        return $contact;
+    }
+
+}
diff --git a/app/Services/Logic/User/Console/PointHistory.php b/app/Services/Logic/User/Console/PointHistory.php
new file mode 100644
index 00000000..1a655619
--- /dev/null
+++ b/app/Services/Logic/User/Console/PointHistory.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Services\Logic\User\Console;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\PointHistory as PointHistoryRepo;
+use App\Services\Logic\Service;
+use App\Services\Logic\UserTrait;
+
+class PointHistory extends Service
+{
+
+    use UserTrait;
+
+    public function handle()
+    {
+        $user = $this->getLoginUser();
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['user_id'] = $user->id;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $historyRepo = new PointHistoryRepo();
+
+        $pager = $historyRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handlePager($pager);
+    }
+
+    public function handlePager($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $items = [];
+
+        foreach ($pager->items as $item) {
+            $items[] = [
+                'id' => $item->id,
+                'event_id' => $item->event_id,
+                'event_type' => $item->event_type,
+                'event_info' => $item->event_info,
+                'event_point' => $item->event_point,
+                'create_time' => $item->create_time,
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Logic/User/Console/PointRedeemList.php b/app/Services/Logic/User/Console/PointRedeemList.php
new file mode 100644
index 00000000..9b65d41f
--- /dev/null
+++ b/app/Services/Logic/User/Console/PointRedeemList.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Services\Logic\User\Console;
+
+use App\Library\Paginator\Query as PagerQuery;
+use App\Repos\PointRedeem as PointRedeemRepo;
+use App\Services\Logic\Service;
+use App\Services\Logic\UserTrait;
+
+class PointRedeemList extends Service
+{
+
+    use UserTrait;
+
+    public function handle()
+    {
+        $user = $this->getLoginUser();
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['user_id'] = $user->id;
+        $params['deleted'] = 0;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $redeemRepo = new PointRedeemRepo();
+
+        $pager = $redeemRepo->paginate($params, $sort, $page, $limit);
+
+        return $this->handlePager($pager);
+    }
+
+    public function handlePager($pager)
+    {
+        if ($pager->total_items == 0) {
+            return $pager;
+        }
+
+        $items = [];
+
+        foreach ($pager->items as $item) {
+            $items[] = [
+                'id' => $item->id,
+                'status' => $item->status,
+                'create_time' => $item->create_time,
+                'user' => [
+                    'id' => $item->user_id,
+                    'name' => $item->user_name,
+                ],
+                'gift' => [
+                    'id' => $item->gift_id,
+                    'name' => $item->gift_name,
+                    'type' => $item->gift_type,
+                    'point' => $item->gift_point,
+                ],
+                'contact' => [
+                    'name' => $item->contact_name,
+                    'phone' => $item->contact_phone,
+                    'address' => $item->contact_address,
+                ],
+            ];
+        }
+
+        $pager->items = $items;
+
+        return $pager;
+    }
+
+}
diff --git a/app/Services/Pay/Alipay.php b/app/Services/Pay/Alipay.php
index a8498d92..25ce01dc 100644
--- a/app/Services/Pay/Alipay.php
+++ b/app/Services/Pay/Alipay.php
@@ -193,7 +193,7 @@ class Alipay extends PayService
 
         $trade->channel_sn = $data->trade_no;
 
-        $this->eventsManager->fire('pay:afterPay', $this, $trade);
+        $this->eventsManager->fire('Trade:afterPay', $this, $trade);
 
         $trade = $tradeRepo->findById($trade->id);
 
diff --git a/app/Services/Pay/Wxpay.php b/app/Services/Pay/Wxpay.php
index ba94fb0e..89ee126a 100644
--- a/app/Services/Pay/Wxpay.php
+++ b/app/Services/Pay/Wxpay.php
@@ -194,7 +194,7 @@ class Wxpay extends PayService
 
         $trade->channel_sn = $data->transaction_id;
 
-        $this->eventsManager->fire('pay:afterPay', $this, $trade);
+        $this->eventsManager->fire('Trade:afterPay', $this, $trade);
 
         $trade = $tradeRepo->findById($trade->id);
 
diff --git a/app/Services/Throttle.php b/app/Services/Throttle.php
index 7a5f4140..341ffd37 100644
--- a/app/Services/Throttle.php
+++ b/app/Services/Throttle.php
@@ -19,18 +19,18 @@ class Throttle extends Service
 
         $cacheKey = $this->getCacheKey($sign);
 
+        if ($cache->ttl($cacheKey) < 1) {
+            $cache->save($cacheKey, 0, $config->path('throttle.lifetime'));
+        }
+
         $rateLimit = $cache->get($cacheKey);
 
-        if ($rateLimit) {
-            if ($rateLimit >= $config->path('throttle.rate_limit')) {
-                return false;
-            } else {
-                $cache->increment($cacheKey, 1);
-            }
-        } else {
-            $cache->save($cacheKey, 1, $config->path('throttle.lifetime'));
+        if ($rateLimit >= $config->path('throttle.rate_limit')) {
+            return false;
         }
 
+        $cache->increment($cacheKey, 1);
+
         return true;
     }
 
diff --git a/app/Traits/Auth.php b/app/Traits/Auth.php
index 6cde45db..a8a87a13 100644
--- a/app/Traits/Auth.php
+++ b/app/Traits/Auth.php
@@ -2,12 +2,11 @@
 
 namespace App\Traits;
 
+use App\Caches\User as UserCache;
 use App\Models\User as UserModel;
-use App\Repos\User as UserRepo;
 use App\Services\Auth as AuthService;
 use App\Validators\Validator as AppValidator;
 use Phalcon\Di as Di;
-use Phalcon\Events\Manager as EventsManager;
 
 trait Auth
 {
@@ -23,18 +22,9 @@ trait Auth
             return $this->getGuestUser();
         }
 
-        $userRepo = new UserRepo();
+        $userCache = new UserCache();
 
-        $user = $userRepo->findById($authUser['id']);
-
-        /**
-         * @var EventsManager $eventsManager
-         */
-        $eventsManager = Di::getDefault()->getShared('eventsManager');
-
-        $eventsManager->fire('user:online', $this, $user);
-
-        return $user;
+        return $userCache->get($authUser['id']);
     }
 
     /**
@@ -48,9 +38,9 @@ trait Auth
 
         $validator->checkAuthUser($authUser['id']);
 
-        $userRepo = new UserRepo();
+        $userCache = new UserCache();
 
-        return $userRepo->findById($authUser['id']);
+        return $userCache->get($authUser['id']);
     }
 
     /**
diff --git a/app/Traits/Security.php b/app/Traits/Security.php
index 408d7339..51eba092 100644
--- a/app/Traits/Security.php
+++ b/app/Traits/Security.php
@@ -30,13 +30,6 @@ trait Security
         $validator->checkRateLimit();
     }
 
-    public function checkApiSignature()
-    {
-        $validator = new SecurityValidator();
-
-        $validator->checkApiSignature();
-    }
-
     public function isNotSafeRequest()
     {
         /**
diff --git a/app/Validators/Help.php b/app/Validators/Help.php
index e9da769d..e3f406f4 100644
--- a/app/Validators/Help.php
+++ b/app/Validators/Help.php
@@ -91,7 +91,7 @@ class Help extends Validator
             throw new BadRequestException('help.content_too_short');
         }
 
-        if ($length > 3000) {
+        if ($length > 30000) {
             throw new BadRequestException('help.content_too_long');
         }
 
diff --git a/app/Validators/ImGroup.php b/app/Validators/ImGroup.php
index d2118a43..0ca4bb51 100644
--- a/app/Validators/ImGroup.php
+++ b/app/Validators/ImGroup.php
@@ -77,9 +77,9 @@ class ImGroup extends Validator
         return $value;
     }
 
-    public function checkAbout($name)
+    public function checkAbout($about)
     {
-        $value = $this->filter->sanitize($name, ['trim', 'string']);
+        $value = $this->filter->sanitize($about, ['trim', 'string']);
 
         $length = kg_strlen($value);
 
diff --git a/app/Validators/Page.php b/app/Validators/Page.php
index 5925d029..078b2536 100644
--- a/app/Validators/Page.php
+++ b/app/Validators/Page.php
@@ -86,7 +86,7 @@ class Page extends Validator
             throw new BadRequestException('page.content_too_short');
         }
 
-        if ($length > 3000) {
+        if ($length > 30000) {
             throw new BadRequestException('page.content_too_long');
         }
 
diff --git a/app/Validators/PointGift.php b/app/Validators/PointGift.php
new file mode 100644
index 00000000..d764c537
--- /dev/null
+++ b/app/Validators/PointGift.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace App\Validators;
+
+use App\Caches\MaxPointGiftId as MaxPointGiftIdCache;
+use App\Caches\PointGift as PointGiftCache;
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Library\Validators\Common as CommonValidator;
+use App\Models\PointGift as PointGiftModel;
+use App\Repos\PointGift as PointGiftRepo;
+
+class PointGift extends Validator
+{
+
+    /**
+     * @param int $id
+     * @return PointGiftModel
+     * @throws BadRequestException
+     */
+    public function checkGiftCache($id)
+    {
+        $this->checkId($id);
+
+        $giftCache = new PointGiftCache();
+
+        $gift = $giftCache->get($id);
+
+        if (!$gift) {
+            throw new BadRequestException('point_gift.not_found');
+        }
+
+        return $gift;
+    }
+
+    public function checkGift($id)
+    {
+        $this->checkId($id);
+
+        $giftRepo = new PointGiftRepo();
+
+        $gift = $giftRepo->findById($id);
+
+        if (!$gift) {
+            throw new BadRequestException('point_gift.not_found');
+        }
+
+        return $gift;
+    }
+
+    public function checkId($id)
+    {
+        $id = intval($id);
+
+        $maxGiftIdCache = new MaxPointGiftIdCache();
+
+        $maxId = $maxGiftIdCache->get();
+
+        if ($id < 1 || $id > $maxId) {
+            throw new BadRequestException('point_gift.not_found');
+        }
+    }
+
+    public function checkName($name)
+    {
+        $value = $this->filter->sanitize($name, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 2) {
+            throw new BadRequestException('point_gift.name_too_short');
+        }
+
+        if ($length > 30) {
+            throw new BadRequestException('point_gift.name_too_long');
+        }
+
+        return $value;
+    }
+
+    public function checkDetails($details)
+    {
+        $value = $this->filter->sanitize($details, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length > 30000) {
+            throw new BadRequestException('point_gift.details_too_long');
+        }
+
+        return $value;
+    }
+
+    public function checkCover($cover)
+    {
+        $value = $this->filter->sanitize($cover, ['trim', 'string']);
+
+        if (!CommonValidator::url($value)) {
+            throw new BadRequestException('point_gift.invalid_cover');
+        }
+
+        return kg_cos_img_style_trim($value);
+    }
+
+    public function checkType($type)
+    {
+        $list = PointGiftModel::types();
+
+        if (!isset($list[$type])) {
+            throw new BadRequestException('point_gift.invalid_type');
+        }
+
+        return $type;
+    }
+
+    public function checkPoint($point)
+    {
+        $value = $this->filter->sanitize($point, ['trim', 'int']);
+
+        if ($value < 1 || $value > 999999) {
+            throw new BadRequestException('point_gift.invalid_point');
+        }
+
+        return $value;
+    }
+
+    public function checkStock($stock)
+    {
+        $value = $this->filter->sanitize($stock, ['trim', 'int']);
+
+        if ($value < 1 || $value > 999999) {
+            throw new BadRequestException('point_gift.invalid_stock');
+        }
+
+        return $value;
+    }
+
+    public function checkRedeemLimit($limit)
+    {
+        $value = $this->filter->sanitize($limit, ['trim', 'int']);
+
+        if ($value < 1 || $value > 999999) {
+            throw new BadRequestException('point_gift.invalid_redeem_limit');
+        }
+
+        return $value;
+    }
+
+    public function checkPublishStatus($status)
+    {
+        if (!in_array($status, [0, 1])) {
+            throw new BadRequestException('point_gift.invalid_publish_status');
+        }
+
+        return $status;
+    }
+
+    public function checkCourse($id)
+    {
+        $validator = new Course();
+
+        return $validator->checkCourse($id);
+    }
+
+}
diff --git a/app/Validators/PointRedeem.php b/app/Validators/PointRedeem.php
new file mode 100644
index 00000000..6a64d590
--- /dev/null
+++ b/app/Validators/PointRedeem.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Validators;
+
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Models\Course as CourseModel;
+use App\Models\PointGift as PointGiftModel;
+use App\Models\User as UserModel;
+use App\Repos\CourseUser as CourseUserRepo;
+use App\Repos\PointRedeem as PointRedeemRepo;
+use App\Repos\User as UserRepo;
+
+
+class PointRedeem extends Validator
+{
+
+    public function checkRedeem($id)
+    {
+        $redeemRepo = new PointRedeemRepo();
+
+        $redeem = $redeemRepo->findById($id);
+
+        if (!$redeem) {
+            throw new BadRequestException('point_redeem.not_found');
+        }
+
+        return $redeem;
+    }
+
+    public function checkGift($giftId)
+    {
+        $validator = new PointGift();
+
+        return $validator->checkGift($giftId);
+    }
+
+    public function checkIfAllowRedeem(PointGiftModel $gift, UserModel $user)
+    {
+        $this->checkStock($gift);
+
+        $this->checkRedeemLimit($gift, $user);
+
+        $this->checkPointBalance($gift, $user);
+
+        if ($gift->type == PointGiftModel::TYPE_COURSE) {
+
+            $validator = new Course();
+
+            $course = $validator->checkCourse($gift->attrs['id']);
+
+            $this->checkIfAllowRedeemCourse($course, $user);
+
+        } elseif ($gift->type == PointGiftModel::TYPE_GOODS) {
+
+            $this->checkIfAllowRedeemGoods($user);
+        }
+    }
+
+    protected function checkIfAllowRedeemCourse(CourseModel $course, UserModel $user)
+    {
+        if ($course->published == 0) {
+            throw new BadRequestException('point_redeem.course_not_published');
+        }
+
+        if ($course->market_price == 0) {
+            throw new BadRequestException('point_redeem.course_free');
+        }
+
+        $courseUserRepo = new CourseUserRepo();
+
+        $courseUser = $courseUserRepo->findCourseUser($course->id, $user->id);
+
+        if ($courseUser && $courseUser->expiry_time > time()) {
+            throw new BadRequestException('point_redeem.course_owned');
+        }
+    }
+
+    protected function checkIfAllowRedeemGoods(UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $contact = $userRepo->findUserContact($user->id);
+
+        if (!$contact) {
+            throw new BadRequestException('point_redeem.no_user_contact');
+        }
+    }
+
+    protected function checkStock(PointGiftModel $gift)
+    {
+        if ($gift->stock < 1) {
+            throw new BadRequestException('point_redeem.no_enough_stock');
+        }
+    }
+
+    protected function checkRedeemLimit(PointGiftModel $gift, UserModel $user)
+    {
+        $redeemRepo = new PointRedeemRepo();
+
+        $count = $redeemRepo->countUserGiftRedeems($user->id, $gift->id);
+
+        if ($count >= $gift->redeem_limit) {
+            throw new BadRequestException('point_redeem.reach_redeem_limit');
+        }
+    }
+
+    protected function checkPointBalance(PointGiftModel $gift, UserModel $user)
+    {
+        $userRepo = new UserRepo();
+
+        $balance = $userRepo->findUserBalance($user->id);
+
+        if (!$balance || $balance->point < $gift->point) {
+            throw new BadRequestException('point_redeem.no_enough_point');
+        }
+    }
+
+}
diff --git a/app/Validators/UserContact.php b/app/Validators/UserContact.php
new file mode 100644
index 00000000..34304516
--- /dev/null
+++ b/app/Validators/UserContact.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Validators;
+
+use App\Exceptions\BadRequest as BadRequestException;
+use App\Library\Validators\Common as CommonValidator;
+use App\Repos\User as UserRepo;
+
+class UserContact extends Validator
+{
+
+    public function checkContact($id)
+    {
+        $userRepo = new UserRepo();
+
+        $user = $userRepo->findById($id);
+
+        if (!$user) {
+            throw new BadRequestException('user_contact.not_found');
+        }
+
+        return $user;
+    }
+
+    public function checkName($name)
+    {
+        $value = $this->filter->sanitize($name, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 2 || $length > 15) {
+            throw new BadRequestException('user_contact.invalid_name');
+        }
+
+        return $value;
+    }
+
+    public function checkPhone($phone)
+    {
+        $value = $this->filter->sanitize($phone, ['trim', 'string']);
+
+        if (!CommonValidator::phone($value)) {
+            throw new BadRequestException('user_contact.invalid_phone');
+        }
+
+        return $value;
+    }
+
+    public function checkAddProvince($province)
+    {
+        $value = $this->filter->sanitize($province, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 2 || $length > 15) {
+            throw new BadRequestException('user_contact.invalid_add_province');
+        }
+
+        return $value;
+    }
+
+    public function checkAddCity($city)
+    {
+        $value = $this->filter->sanitize($city, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 2 || $length > 15) {
+            throw new BadRequestException('user_contact.invalid_add_city');
+        }
+
+        return $value;
+    }
+
+    public function checkAddCounty($county)
+    {
+        $value = $this->filter->sanitize($county, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 2 || $length > 15) {
+            throw new BadRequestException('user_contact.invalid_add_county');
+        }
+
+        return $value;
+    }
+
+    public function checkAddOther($other)
+    {
+        $value = $this->filter->sanitize($other, ['trim', 'string']);
+
+        $length = kg_strlen($value);
+
+        if ($length < 5 || $length > 50) {
+            throw new BadRequestException('user_contact.invalid_add_other');
+        }
+
+        return $value;
+    }
+
+}
diff --git a/config/errors.php b/config/errors.php
index 16e5a804..ca812440 100644
--- a/config/errors.php
+++ b/config/errors.php
@@ -222,7 +222,7 @@ $error['page.not_found'] = '单页不存在';
 $error['page.title_too_short'] = '标题太短（少于2个字符）';
 $error['page.title_too_long'] = '标题太长（多于50个字符）';
 $error['page.content_too_short'] = '内容太短（少于10个字符）';
-$error['page.content_too_long'] = '内容太长（多于3000个字符）';
+$error['page.content_too_long'] = '内容太长（多于30000个字符）';
 $error['page.invalid_publish_status'] = '无效的发布状态';
 
 /**
@@ -232,7 +232,7 @@ $error['help.not_found'] = '帮助不存在';
 $error['help.title_too_short'] = '标题太短（少于2个字符）';
 $error['help.title_too_long'] = '标题太长（多于50个字符）';
 $error['help.content_too_short'] = '内容太短（少于10个字符）';
-$error['help.content_too_long'] = '内容太长（多于60000个字符）';
+$error['help.content_too_long'] = '内容太长（多于30000个字符）';
 $error['help.invalid_priority'] = '无效的排序数值（范围：1-255）';
 $error['help.invalid_publish_status'] = '无效的发布状态';
 
@@ -244,7 +244,7 @@ $error['slide.invalid_platform'] = '无效的平台类型';
 $error['slide.invalid_target'] = '无效的目标类型';
 $error['slide.invalid_link'] = '无效的链接地址';
 $error['slide.invalid_priority'] = '无效的排序数值（范围：1-255）';
-$error['slide.invalid_cover'] = '无效的封面图片';
+$error['slide.invalid_cover'] = '无效的封面';
 $error['slide.title_too_short'] = '标题太短（少于2个字符）';
 $error['slide.title_too_long'] = '标题太长（多于50个字符）';
 $error['slide.summary_too_long'] = '简介太长（多于255个字符）';
@@ -356,4 +356,38 @@ $error['im_message.content_too_short'] = '消息内容太短（少于1字符）'
 $error['im_message.content_too_long'] = '消息内容太长（超过1000字符）';
 $error['im_message.self_chat'] = '不能给自己发送消息';
 
+/**
+ * 联系信息相关
+ */
+$error['user_contact.invalid_name'] = '无效的用户姓名';
+$error['user_contact.invalid_phone'] = '无效的手机号码';
+$error['user_contact.invalid_add_province'] = '无效的地址（省）';
+$error['user_contact.invalid_add_city'] = '无效的地址（市）';
+$error['user_contact.invalid_add_county'] = '无效的地址（区）';
+$error['user_contact.invalid_add_other'] = '无效的地址（详）';
+
+/**
+ * 积分兑换相关
+ */
+$error['point_gift.not_found'] = '礼品不存在';
+$error['point_gift.name_too_short'] = '礼品名称太短（少于2字符）';
+$error['point_gift.name_too_long'] = '礼品名称太长（超过30字符）';
+$error['point_gift.details_too_long'] = '礼品详情太长（多于30000个字符）';
+$error['point_gift.invalid_cover'] = '无效的封面';
+$error['point_gift.invalid_type'] = '无效的类型';
+$error['point_gift.invalid_point'] = '无效的积分值（范围1-999999）';
+$error['point_gift.invalid_stock'] = '无效的库存值（范围1-999999）';
+$error['point_gift.invalid_redeem_limit'] = '无效的兑换限额（范围1-999999）';
+$error['point_gift.invalid_publish_status'] = '无效的发布状态';
+
+$error['point_redeem.not_found'] = '兑换不存在';
+$error['point_redeem.course_not_published'] = '课程尚未发布';
+$error['point_redeem.course_free'] = '课程当前免费，无需积分兑换';
+$error['point_redeem.course_owned'] = '您已经拥有课程，无需积分兑换';
+$error['point_redeem.no_user_contact'] = '您尚未设置收货地址，请前往用户中心设置';
+$error['point_redeem.reach_redeem_limit'] = '超出物品兑换限额';
+$error['point_redeem.no_enough_point'] = '您的积分余额不足以抵扣此次兑换';
+$error['point_redeem.no_enough_stock'] = '兑换物品库存不足';
+
+
 return $error;
diff --git a/config/events.php b/config/events.php
index f4211779..f8caf678 100644
--- a/config/events.php
+++ b/config/events.php
@@ -1,11 +1,17 @@
 <?php
 
-use App\Listeners\Pay;
-use App\Listeners\User;
+use App\Listeners\Account;
+use App\Listeners\ImMessage;
+use App\Listeners\Review;
+use App\Listeners\Site;
+use App\Listeners\Trade;
 use App\Listeners\UserDailyCounter;
 
 return [
-    'pay' => Pay::class,
-    'user' => User::class,
-    'userDailyCounter' => UserDailyCounter::class,
+    'UserDailyCounter' => UserDailyCounter::class,
+    'ImMessage' => ImMessage::class,
+    'Account' => Account::class,
+    'Review' => Review::class,
+    'Trade' => Trade::class,
+    'Site' => Site::class,
 ];
\ No newline at end of file
diff --git a/db/migrations/20210126024511_data_202101261130.php b/db/migrations/20210126024511_data_202101261130.php
new file mode 100644
index 00000000..51ecdd03
--- /dev/null
+++ b/db/migrations/20210126024511_data_202101261130.php
@@ -0,0 +1,47 @@
+<?php
+
+class Data202101261130 extends Phinx\Migration\AbstractMigration
+{
+
+    public function up()
+    {
+        $consumeRule = ['enabled' => 1, 'rate' => 5];
+
+        $eventRule = [
+            'account_register' => ['enabled' => 1, 'point' => 100],
+            'course_review' => ['enabled' => 1, 'point' => 50],
+            'chapter_study' => ['enabled' => 1, 'point' => 10],
+            'site_visit' => ['enabled' => 1, 'point' => 10],
+            'im_discuss' => ['enabled' => 1, 'point' => 10],
+        ];
+
+        $rows = [
+            [
+                'section' => 'point',
+                'item_key' => 'enabled',
+                'item_value' => 1,
+            ],
+            [
+                'section' => 'point',
+                'item_key' => 'consume_rule',
+                'item_value' => json_encode($consumeRule),
+            ],
+            [
+                'section' => 'point',
+                'item_key' => 'event_rule',
+                'item_value' => json_encode($eventRule),
+            ],
+        ];
+
+        $this->table('kg_setting')->insert($rows)->save();
+    }
+
+    public function down()
+    {
+        $this->getQueryBuilder()
+            ->delete('kg_setting')
+            ->where(['section' => 'point'])
+            ->execute();
+    }
+
+}
diff --git a/db/migrations/20210126081614_schema_202101261615.php b/db/migrations/20210126081614_schema_202101261615.php
new file mode 100644
index 00000000..b2207b52
--- /dev/null
+++ b/db/migrations/20210126081614_schema_202101261615.php
@@ -0,0 +1,85 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class Schema202101261615 extends Phinx\Migration\AbstractMigration
+{
+
+    public function change()
+    {
+        $courseTable = $this->table('kg_course');
+
+        if ($courseTable->hasColumn('resource_count') == false) {
+            $courseTable->addColumn('resource_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '资源数',
+                'after' => 'deleted',
+            ])->save();
+        }
+
+        $chapterTable = $this->table('kg_chapter');
+
+        if ($chapterTable->hasColumn('resource_count') == false) {
+            $chapterTable->addColumn('resource_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '资源数',
+                'after' => 'deleted',
+            ])->save();
+        }
+
+        /**
+         * 补救前期遗漏，重新统计数据
+         */
+        $this->recount();
+    }
+
+    protected function recount()
+    {
+        $resources = $this->getQueryBuilder()->select('*')->from('kg_resource')->execute();
+
+        $courseMappings = [];
+        $chapterMappings = [];
+
+        if ($resources->count() > 0) {
+            foreach ($resources as $resource) {
+                $courseId = $resource['course_id'];
+                $chapterId = $resource['chapter_id'];
+                $courseMappings[$courseId] = isset($courseMappings[$courseId]) ? $courseMappings[$courseId] + 1 : 1;
+                $chapterMappings[$chapterId] = isset($chapterMappings[$chapterId]) ? $chapterMappings[$chapterId] + 1 : 1;
+            }
+            $this->recountCourseResource($courseMappings);
+            $this->recountChapterResource($chapterMappings);
+        }
+    }
+
+    protected function recountCourseResource($mappings)
+    {
+        $builder = $this->getQueryBuilder();
+
+        foreach ($mappings as $courseId => $resourceCount) {
+            $builder->update('kg_course')
+                ->set('resource_count', $resourceCount)
+                ->where(['id' => $courseId])
+                ->execute();
+        }
+    }
+
+    protected function recountChapterResource($mappings)
+    {
+        $builder = $this->getQueryBuilder();
+
+        foreach ($mappings as $chapterId => $resourceCount) {
+            $builder->update('kg_chapter')
+                ->set('resource_count', $resourceCount)
+                ->where(['id' => $chapterId])
+                ->execute();
+        }
+    }
+
+}
diff --git a/db/migrations/20210213093244_schema_202102131730.php b/db/migrations/20210213093244_schema_202102131730.php
new file mode 100644
index 00000000..848f31d0
--- /dev/null
+++ b/db/migrations/20210213093244_schema_202102131730.php
@@ -0,0 +1,519 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class Schema202102131730 extends Phinx\Migration\AbstractMigration
+{
+
+    public function change()
+    {
+        $this->table('kg_point_gift', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'DYNAMIC',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('name', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 100,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '名称',
+                'after' => 'id',
+            ])
+            ->addColumn('cover', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 100,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '封面',
+                'after' => 'name',
+            ])
+            ->addColumn('details', 'text', [
+                'null' => false,
+                'limit' => 65535,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '详情',
+                'after' => 'cover',
+            ])
+            ->addColumn('attrs', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 1000,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '扩展属性',
+                'after' => 'details',
+            ])
+            ->addColumn('type', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '类型',
+                'after' => 'attrs',
+            ])
+            ->addColumn('stock', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '库存',
+                'after' => 'type',
+            ])
+            ->addColumn('point', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '所需积分',
+                'after' => 'stock',
+            ])
+            ->addColumn('published', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '发布标识',
+                'after' => 'point',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'published',
+            ])
+            ->addColumn('redeem_limit', 'integer', [
+                'null' => false,
+                'default' => '1',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '兑换限额',
+                'after' => 'deleted',
+            ])
+            ->addColumn('redeem_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '兑换数量',
+                'after' => 'redeem_limit',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'redeem_count',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->create();
+
+        $this->table('kg_point_history', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'DYNAMIC',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('user_id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '用户编号',
+                'after' => 'id',
+            ])
+            ->addColumn('user_name', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '用户名称',
+                'after' => 'user_id',
+            ])
+            ->addColumn('event_id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '事件编号',
+                'after' => 'user_name',
+            ])
+            ->addColumn('event_type', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '事件类型',
+                'after' => 'event_id',
+            ])
+            ->addColumn('event_info', 'string', [
+                'null' => false,
+                'default' => '0',
+                'limit' => 1000,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '事件内容',
+                'after' => 'event_type',
+            ])
+            ->addColumn('event_point', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'comment' => '事件积分',
+                'after' => 'event_info',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'event_point',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'deleted',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->addIndex(['event_id', 'event_type'], [
+                'name' => 'event',
+                'unique' => false,
+            ])
+            ->addIndex(['user_id'], [
+                'name' => 'user_id',
+                'unique' => false,
+            ])
+            ->create();
+
+        $this->table('kg_point_redeem', [
+            'id' => false,
+            'primary_key' => ['id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'DYNAMIC',
+        ])
+            ->addColumn('id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'identity' => 'enable',
+                'comment' => '主键编号',
+            ])
+            ->addColumn('user_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '用户编号',
+                'after' => 'id',
+            ])
+            ->addColumn('user_name', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '用户名称',
+                'after' => 'user_id',
+            ])
+            ->addColumn('gift_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '礼品编号',
+                'after' => 'user_name',
+            ])
+            ->addColumn('gift_name', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 100,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '礼品名称',
+                'after' => 'gift_id',
+            ])
+            ->addColumn('gift_type', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '礼品类型',
+                'after' => 'gift_name',
+            ])
+            ->addColumn('gift_point', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '礼品积分',
+                'after' => 'gift_type',
+            ])
+            ->addColumn('contact_name', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '联系人',
+                'after' => 'gift_point',
+            ])
+            ->addColumn('contact_phone', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '联系电话',
+                'after' => 'contact_name',
+            ])
+            ->addColumn('contact_address', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 100,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '联系地址',
+                'after' => 'contact_phone',
+            ])
+            ->addColumn('remark', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 255,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '备注',
+                'after' => 'contact_address',
+            ])
+            ->addColumn('status', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '状态标识',
+                'after' => 'remark',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'status',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->addIndex(['gift_id'], [
+                'name' => 'gift_id',
+                'unique' => false,
+            ])
+            ->addIndex(['user_id'], [
+                'name' => 'user_id',
+                'unique' => false,
+            ])
+            ->create();
+
+        $this->table('kg_user_balance', [
+            'id' => false,
+            'primary_key' => ['user_id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'DYNAMIC',
+        ])
+            ->addColumn('user_id', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '用户编号',
+            ])
+            ->addColumn('cash', 'decimal', [
+                'null' => false,
+                'default' => '0.00',
+                'precision' => '10',
+                'scale' => '2',
+                'comment' => '可用现金',
+                'after' => 'user_id',
+            ])
+            ->addColumn('point', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'comment' => '可用积分',
+                'after' => 'cash',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'point',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'deleted',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->create();
+
+        $this->table('kg_user_contact', [
+            'id' => false,
+            'primary_key' => ['user_id'],
+            'engine' => 'InnoDB',
+            'encoding' => 'utf8mb4',
+            'collation' => 'utf8mb4_general_ci',
+            'comment' => '',
+            'row_format' => 'DYNAMIC',
+        ])
+            ->addColumn('user_id', 'integer', [
+                'null' => false,
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '用户编号',
+            ])
+            ->addColumn('name', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '姓名',
+                'after' => 'user_id',
+            ])
+            ->addColumn('phone', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '电话',
+                'after' => 'name',
+            ])
+            ->addColumn('add_province', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '地址(省)',
+                'after' => 'phone',
+            ])
+            ->addColumn('add_city', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '地址(市)',
+                'after' => 'add_province',
+            ])
+            ->addColumn('add_county', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 30,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '地址(区)',
+                'after' => 'add_city',
+            ])
+            ->addColumn('add_other', 'string', [
+                'null' => false,
+                'default' => '',
+                'limit' => 50,
+                'collation' => 'utf8mb4_general_ci',
+                'encoding' => 'utf8mb4',
+                'comment' => '地址(详)',
+                'after' => 'add_county',
+            ])
+            ->addColumn('deleted', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '删除标识',
+                'after' => 'add_other',
+            ])
+            ->addColumn('create_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '创建时间',
+                'after' => 'deleted',
+            ])
+            ->addColumn('update_time', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '更新时间',
+                'after' => 'create_time',
+            ])
+            ->create();
+    }
+
+}
\ No newline at end of file
diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css
index b5ef5dcc..c8977177 100644
--- a/public/static/admin/css/common.css
+++ b/public/static/admin/css/common.css
@@ -34,6 +34,14 @@
     list-style: decimal;
 }
 
+.kg-layer-content {
+    padding: 15px;
+}
+
+.kg-layer-content .layui-table {
+    margin: 0;
+}
+
 .kg-body {
     padding: 15px;
 }
diff --git a/public/static/admin/js/contact.js b/public/static/admin/js/contact.js
new file mode 100644
index 00000000..c16d9f21
--- /dev/null
+++ b/public/static/admin/js/contact.js
@@ -0,0 +1,21 @@
+layui.use(['jquery', 'layer'], function () {
+
+    var $ = layui.jquery;
+    var layer = layui.layer;
+
+    $('.kg-contact').on('click', function () {
+        var content = '<div class="kg-layer-content">' +
+            '<table class="layui-table">' +
+            '<tr><td>联系人</td><td>手机号</td><td>收货地址</td></tr>' +
+            '<tr><td>' + $(this).data('name') + '</td><td>' + $(this).data('phone') + '</td><td>' + $(this).data('address') + '</td></tr>' +
+            '</table>' +
+            '</div>';
+        layer.open({
+            type: 1,
+            title: '联系信息',
+            area: ['800px', '160px'],
+            content: content
+        });
+    });
+
+});
\ No newline at end of file
diff --git a/public/static/admin/js/vditor.js b/public/static/admin/js/vditor.js
index 69071b58..3e08c2fb 100644
--- a/public/static/admin/js/vditor.js
+++ b/public/static/admin/js/vditor.js
@@ -42,13 +42,6 @@ layui.use(['jquery'], function () {
         value: $textarea.val()
     });
 
-    /**
-     * 取消提交表单行为
-     */
-    $('body').on('click', '.vditor-preview__action > button', function () {
-        return false;
-    });
-
     /**
      * 同步编辑器内容到表单
      */
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index 25ffe190..2b86ebde 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -778,36 +778,40 @@
     margin: 5px;
 }
 
-.sidebar-teacher-card {
+.sidebar-user-card {
     margin-bottom: 15px;
 }
 
-.sidebar-teacher-card .avatar {
+.sidebar-user-card .avatar {
     float: left;
     width: 60px;
     height: 60px;
     margin-right: 10px;
 }
 
-.sidebar-teacher-card .avatar img {
+.sidebar-user-card .avatar img {
     width: 100%;
     height: 100%;
     border-radius: 60px;
 }
 
-.sidebar-teacher-card .info {
+.sidebar-user-card .info {
     float: left;
     padding: 5px 0;
 }
 
-.sidebar-teacher-card .info .name {
+.sidebar-user-card .info .name {
 }
 
-.sidebar-teacher-card .info .title {
+.sidebar-user-card .info .title {
     color: #666;
     font-size: 12px;
 }
 
+.sidebar-user-card .info span {
+    margin-right: 5px;
+}
+
 .topic-badge {
     padding: 2px 5px;
     margin-right: 5px;
@@ -1824,4 +1828,43 @@
 
 .layim-chat-status .offline {
     color: gray;
+}
+
+.gift-meta .cover {
+    float: left;
+    margin-right: 10px;
+}
+
+.gift-meta .cover img {
+    width: 210px;
+    height: 118px;
+}
+
+.gift-meta .info {
+    float: left;
+    width: 400px;
+}
+
+.gift-meta .info p {
+    line-height: 35px;
+}
+
+.gift-meta .info .stats {
+    margin-bottom: 10px;
+}
+
+.gift-meta .info span {
+    margin-right: 5px;
+}
+
+.gift-meta .info .value {
+    color: #666;
+}
+
+.gift-meta .info .price, .sidebar-user-card .info .point {
+    color: red;
+}
+
+.gift-details {
+    min-height: 450px;
 }
\ No newline at end of file
diff --git a/public/static/home/js/point.gift.list.js b/public/static/home/js/point.gift.list.js
new file mode 100644
index 00000000..f3ff5cba
--- /dev/null
+++ b/public/static/home/js/point.gift.list.js
@@ -0,0 +1,9 @@
+layui.use(['jquery', 'helper'], function () {
+
+    var $ = layui.jquery;
+    var helper = layui.helper;
+    var $giftList = $('#gift-list');
+
+    helper.ajaxLoadHtml($giftList.data('url'), $giftList.attr('id'));
+
+});
\ No newline at end of file
diff --git a/public/static/home/js/point.gift.show.js b/public/static/home/js/point.gift.show.js
new file mode 100644
index 00000000..a8df29bc
--- /dev/null
+++ b/public/static/home/js/point.gift.show.js
@@ -0,0 +1,24 @@
+layui.use(['jquery', 'layer'], function () {
+
+    var $ = layui.jquery;
+    var layer = layui.layer;
+
+    $('.btn-redeem').on('click', function () {
+        var url = $(this).data('url');
+        var data = {gift_id: $(this).data('id')};
+        layer.confirm('兑换不支持退换，确定要兑换该物品吗？', function () {
+            $.ajax({
+                type: 'POST',
+                url: url,
+                data: data,
+                success: function (res) {
+                    layer.msg(res.msg, {icon: 1});
+                    setTimeout(function () {
+                        window.location.href = '/uc/point/redeems';
+                    }, 3000);
+                }
+            });
+        });
+    });
+
+});
\ No newline at end of file
diff --git a/public/static/home/js/user.console.contact.js b/public/static/home/js/user.console.contact.js
new file mode 100644
index 00000000..6aa2f380
--- /dev/null
+++ b/public/static/home/js/user.console.contact.js
@@ -0,0 +1,12 @@
+layui.use(['layarea'], function () {
+
+    var layarea = layui.layarea;
+
+    layarea.render({
+        elem: '#area-picker',
+        change: function (res) {
+            console.log(res);
+        }
+    });
+
+});
\ No newline at end of file
diff --git a/scheduler.php b/scheduler.php
index 2424b002..04427af1 100644
--- a/scheduler.php
+++ b/scheduler.php
@@ -25,6 +25,9 @@ $scheduler->php($script, $bin, ['--task' => 'vod_event', '--action' => 'main'])
 $scheduler->php($script, $bin, ['--task' => 'close_trade', '--action' => 'main'])
     ->at('*/13 * * * *');
 
+$scheduler->php($script, $bin, ['--task' => 'point_gift_deliver', '--action' => 'main'])
+    ->at('*/11 * * * *');
+
 $scheduler->php($script, $bin, ['--task' => 'close_order', '--action' => 'main'])
     ->hourly(3);