From aab8d7a8f2494f860423f59e44807a8ba4c99a45 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Fri, 4 Sep 2020 17:33:16 +0800
Subject: [PATCH] =?UTF-8?q?demo=E5=88=86=E6=94=AF=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=95=8F=E6=84=9F=E6=95=B0=E6=8D=AE=E4=BB=A5=E5=8F=8A=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Admin/Controllers/Controller.php     | 11 +++
 .../Admin/Controllers/PublicController.php    |  4 +
 .../Admin/Controllers/SettingController.php   | 26 +++---
 app/Http/Admin/Services/Chapter.php           |  1 -
 app/Http/Admin/Services/Course.php            |  1 -
 app/Http/Admin/Services/Setting.php           | 73 +++++++++++-----
 app/Http/Admin/Views/chapter/lessons.volt     |  6 +-
 .../Admin/Views/chapter/lessons_live.volt     | 16 ++--
 app/Http/Admin/Views/chapter/lessons_vod.volt |  6 +-
 app/Http/Admin/Views/setting/live_notify.volt | 13 +--
 app/Http/Admin/Views/setting/live_pull.volt   | 25 +++---
 app/Http/Admin/Views/setting/live_push.volt   | 15 ++--
 app/Http/Admin/Views/setting/smser.volt       |  2 +
 app/Services/Live.php                         | 33 ++++----
 app/Services/LiveNotify.php                   | 10 +--
 .../20200827112717_insert_setting_data.php    | 84 +++++++++++++------
 16 files changed, 202 insertions(+), 124 deletions(-)

diff --git a/app/Http/Admin/Controllers/Controller.php b/app/Http/Admin/Controllers/Controller.php
index 2704f7b3..2c3bb1f1 100644
--- a/app/Http/Admin/Controllers/Controller.php
+++ b/app/Http/Admin/Controllers/Controller.php
@@ -21,6 +21,17 @@ class Controller extends \Phalcon\Mvc\Controller
 
     public function beforeExecuteRoute(Dispatcher $dispatcher)
     {
+        /**
+         * demo分支拒绝数据提交
+         */
+        if ($this->isNotSafeRequest()) {
+            $dispatcher->forward([
+                'controller' => 'public',
+                'action' => 'forbidden',
+            ]);
+            return false;
+        }
+
         if ($this->isNotSafeRequest()) {
             $this->checkHttpReferer();
             $this->checkCsrfToken();
diff --git a/app/Http/Admin/Controllers/PublicController.php b/app/Http/Admin/Controllers/PublicController.php
index 04b8d8f1..5e0a1ab4 100644
--- a/app/Http/Admin/Controllers/PublicController.php
+++ b/app/Http/Admin/Controllers/PublicController.php
@@ -17,6 +17,8 @@ class PublicController extends \Phalcon\Mvc\Controller
      */
     public function authAction()
     {
+        $this->response->setStatusCode(401);
+
         if ($this->request->isAjax()) {
             return $this->jsonError(['msg' => '会话已过期，请重新登录']);
         }
@@ -29,6 +31,8 @@ class PublicController extends \Phalcon\Mvc\Controller
      */
     public function forbiddenAction()
     {
+        $this->response->setStatusCode(403);
+
         if ($this->request->isAjax()) {
             return $this->jsonError(['msg' => '无相关操作权限']);
         }
diff --git a/app/Http/Admin/Controllers/SettingController.php b/app/Http/Admin/Controllers/SettingController.php
index 670c6700..c06cf6d6 100644
--- a/app/Http/Admin/Controllers/SettingController.php
+++ b/app/Http/Admin/Controllers/SettingController.php
@@ -31,7 +31,7 @@ class SettingController extends Controller
 
             $site = $settingService->getSectionSettings($section);
 
-            $site->base_url = $site->base_url ?: kg_site_base_url();
+            $site['base_url'] = $site['base_url'] ?: kg_site_base_url();
 
             $this->view->setVar('site', $site);
         }
@@ -117,12 +117,12 @@ class SettingController extends Controller
      */
     public function liveAction()
     {
-        $section = 'live';
-
         $settingService = new SettingService();
 
         if ($this->request->isPost()) {
 
+            $section = $this->request->getPost('section');
+
             $data = $this->request->getPost();
 
             $settingService->updateLiveSettings($section, $data);
@@ -131,9 +131,13 @@ class SettingController extends Controller
 
         } else {
 
-            $live = $settingService->getLiveSettings();
+            $push = $settingService->getLiveSettings('live.push');
+            $pull = $settingService->getLiveSettings('live.pull');
+            $notify = $settingService->getLiveSettings('live.notify');
 
-            $this->view->setVar('live', $live);
+            $this->view->setVar('push', $push);
+            $this->view->setVar('pull', $pull);
+            $this->view->setVar('notify', $notify);
         }
     }
 
@@ -156,13 +160,8 @@ class SettingController extends Controller
 
         } else {
 
-            $alipay = $settingService->getSectionSettings('pay.alipay');
-
-            $alipay->notify_url = $alipay->notify_url ?: kg_full_url(['for' => 'desktop.alipay_notify']);
-
-            $wxpay = $settingService->getSectionSettings('pay.wxpay');
-
-            $wxpay->notify_url = $wxpay->notify_url ?: kg_full_url(['for' => 'desktop.wxpay_notify']);
+            $alipay = $settingService->getAlipaySettings();
+            $wxpay = $settingService->getWxpaySettings();
 
             $this->view->setVar('alipay', $alipay);
             $this->view->setVar('wxpay', $wxpay);
@@ -190,10 +189,7 @@ class SettingController extends Controller
 
             $smser = $settingService->getSectionSettings($section);
 
-            $template = json_decode($smser->template);
-
             $this->view->setVar('smser', $smser);
-            $this->view->setVar('template', $template);
         }
     }
 
diff --git a/app/Http/Admin/Services/Chapter.php b/app/Http/Admin/Services/Chapter.php
index 32cfcbad..6071a2f4 100644
--- a/app/Http/Admin/Services/Chapter.php
+++ b/app/Http/Admin/Services/Chapter.php
@@ -118,7 +118,6 @@ class Chapter extends Service
             $logger = $this->getLogger();
 
             $logger->error('Create Chapter Error ' . kg_json_encode([
-                    'line' => $e->getLine(),
                     'code' => $e->getCode(),
                     'message' => $e->getMessage(),
                 ]));
diff --git a/app/Http/Admin/Services/Course.php b/app/Http/Admin/Services/Course.php
index 31a3fb3b..503e96b2 100644
--- a/app/Http/Admin/Services/Course.php
+++ b/app/Http/Admin/Services/Course.php
@@ -113,7 +113,6 @@ class Course extends Service
             $logger = $this->getLogger();
 
             $logger->error('Create Course Error ' . kg_json_encode([
-                    'line' => $e->getLine(),
                     'code' => $e->getCode(),
                     'message' => $e->getMessage(),
                 ]));
diff --git a/app/Http/Admin/Services/Setting.php b/app/Http/Admin/Services/Setting.php
index a3502f58..68b7709c 100644
--- a/app/Http/Admin/Services/Setting.php
+++ b/app/Http/Admin/Services/Setting.php
@@ -9,17 +9,64 @@ use App\Repos\Vip as VipRepo;
 class Setting extends Service
 {
 
+    public function getAlipaySettings()
+    {
+        $alipay = $this->getSectionSettings('pay.alipay');
+
+        $alipay['notify_url'] = $alipay['notify_url'] ?: kg_full_url(['for' => 'desktop.alipay_notify']);
+
+        return $alipay;
+    }
+
+    public function getWxpaySettings()
+    {
+        $wxpay = $this->getSectionSettings('pay.wxpay');
+
+        $wxpay['notify_url'] = $wxpay['notify_url'] ?: kg_full_url(['for' => 'desktop.wxpay_notify']);
+
+        return $wxpay;
+    }
+
+    public function getVipSettings()
+    {
+        $vipRepo = new VipRepo();
+
+        return $vipRepo->findAll(['deleted' => 0]);
+    }
+
+    public function getLiveSettings($section)
+    {
+        $result = $this->getSectionSettings($section);
+
+        if ($section == 'live.notify') {
+            $result['stream_begin_url'] = $result['stream_begin_url'] ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'streamBegin']);
+            $result['stream_end_url'] = $result['stream_end_url'] ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'streamEnd']);
+            $result['record_url'] = $result['record_url'] ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'record']);
+            $result['snapshot_url'] = $result['snapshot_url'] ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'snapshot']);
+            $result['porn_url'] = $result['porn_url'] ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'porn']);
+        }
+
+        return $result;
+    }
+
     public function getSectionSettings($section)
     {
         $settingsRepo = new SettingRepo();
 
         $items = $settingsRepo->findBySection($section);
 
-        $result = new \stdClass();
+        $result = [];
 
+        /**
+         * demo分支过滤敏感数据
+         */
         if ($items->count() > 0) {
             foreach ($items as $item) {
-                $result->{$item->item_key} = $item->item_value;
+                $pattern = '/(auth|key|secret|pwd|password)/';
+                if (preg_match($pattern, $item->item_key)) {
+                    $item->item_value = '***';
+                }
+                $result[$item->item_key] = $item->item_value;
             }
         }
 
@@ -81,7 +128,9 @@ class Setting extends Service
     public function updateSmserSettings($section, $settings)
     {
         $template = $settings['template'];
+
         $keys = array_keys($template['id']);
+
         $myTemplate = [];
 
         foreach ($keys as $key) {
@@ -96,13 +145,6 @@ class Setting extends Service
         $this->updateSectionSettings($section, $settings);
     }
 
-    public function getVipSettings()
-    {
-        $vipRepo = new VipRepo();
-
-        return $vipRepo->findAll(['deleted' => 0]);
-    }
-
     public function updateVipSettings($items)
     {
         $vipRepo = new VipRepo();
@@ -114,17 +156,4 @@ class Setting extends Service
         }
     }
 
-    public function getLiveSettings()
-    {
-        $live = $this->getSectionSettings('live');
-
-        $live->notify_stream_begin_url = $live->notify_stream_begin_url ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'streamBegin']);
-        $live->notify_stream_end_url = $live->notify_stream_end_url ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'streamEnd']);
-        $live->notify_record_url = $live->notify_record_url ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'record']);
-        $live->notify_snapshot_url = $live->notify_snapshot_url ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'snapshot']);
-        $live->notify_porn_url = $live->notify_porn_url ?: kg_full_url(['for' => 'desktop.live_notify'], ['action' => 'porn']);
-
-        return $live;
-    }
-
 }
diff --git a/app/Http/Admin/Views/chapter/lessons.volt b/app/Http/Admin/Views/chapter/lessons.volt
index 26246c29..8ec5ab29 100644
--- a/app/Http/Admin/Views/chapter/lessons.volt
+++ b/app/Http/Admin/Views/chapter/lessons.volt
@@ -21,11 +21,11 @@
         </div>
     </div>
 
-    {% if course.model == '1' %}
+    {% if course.model == 1 %}
         {{ partial('chapter/lessons_vod') }}
-    {% elseif course.model == '2' %}
+    {% elseif course.model == 2 %}
         {{ partial('chapter/lessons_live') }}
-    {% elseif course.model == '3' %}
+    {% elseif course.model == 3 %}
         {{ partial('chapter/lessons_read') }}
     {% endif %}
 
diff --git a/app/Http/Admin/Views/chapter/lessons_live.volt b/app/Http/Admin/Views/chapter/lessons_live.volt
index 3c280789..649374af 100644
--- a/app/Http/Admin/Views/chapter/lessons_live.volt
+++ b/app/Http/Admin/Views/chapter/lessons_live.volt
@@ -7,9 +7,13 @@
     {% endif %}
 {%- endmacro %}
 
-{%- macro live_status_info(attrs) %}
-    {% if attrs['stream']['status'] != 'active' %}
-        <span class="layui-badge layui-bg-blue">直播中</span>
+{%- macro live_status_info(status) %}
+    {% if status == 'active' %}
+        <span class="layui-badge layui-bg-blue">活跃</span>
+    {% elseif status == 'inactive' %}
+        <span class="layui-badge layui-bg-gray">沉默</span>
+    {% elseif status == 'forbid' %}
+        <span class="layui-badge layui-bg-red">禁播</span>
     {% endif %}
 {%- endmacro %}
 
@@ -21,13 +25,15 @@
         <col>
         <col>
         <col>
+        <col>
         <col width="12%">
     </colgroup>
     <thead>
     <tr>
         <th>编号</th>
         <th>名称</th>
-        <th>时间</th>
+        <th>直播时间</th>
+        <th>推流状态</th>
         <th>排序</th>
         <th>免费</th>
         <th>发布</th>
@@ -46,9 +52,9 @@
             <td>
                 <span><a href="{{ edit_url }}">{{ item.title }}</a></span>
                 <span class="layui-badge layui-bg-green">课</span>
-                {{ live_status_info(item.attrs) }}
             </td>
             <td>{{ live_time_info(item.attrs) }}</td>
+            <td>{{ live_status_info(item.attrs['stream']['status']) }}</td>
             <td><input class="layui-input kg-priority" type="text" name="priority" title="数值越小排序越靠前" value="{{ item.priority }}" data-url="{{ update_url }}"></td>
             <td><input type="checkbox" name="free" value="1" lay-skin="switch" lay-text="是|否" lay-filter="free" data-url="{{ update_url }}" {% if item.free == 1 %}checked{% endif %}></td>
             <td><input type="checkbox" name="published" value="1" lay-skin="switch" lay-text="是|否" lay-filter="published" data-url="{{ update_url }}" {% if item.published == 1 %}checked{% endif %}></td>
diff --git a/app/Http/Admin/Views/chapter/lessons_vod.volt b/app/Http/Admin/Views/chapter/lessons_vod.volt
index 157e6a83..93777824 100644
--- a/app/Http/Admin/Views/chapter/lessons_vod.volt
+++ b/app/Http/Admin/Views/chapter/lessons_vod.volt
@@ -27,8 +27,8 @@
     <tr>
         <th>编号</th>
         <th>名称</th>
-        <th>视频状态</th>
-        <th>视频时长</th>
+        <th>状态</th>
+        <th>时长</th>
         <th>排序</th>
         <th>免费</th>
         <th>发布</th>
@@ -37,7 +37,7 @@
     </thead>
     <tbody>
     {% for item in lessons %}
-        {% set show_url = url({'for':'desktop.chapter.show','id':item.id}) %}
+        {% set preview_url = url({'for':'desktop.chapter.show','id':item.id}) %}
         {% set edit_url = url({'for':'admin.chapter.edit','id':item.id}) %}
         {% set update_url = url({'for':'admin.chapter.update','id':item.id}) %}
         {% set delete_url = url({'for':'admin.chapter.delete','id':item.id}) %}
diff --git a/app/Http/Admin/Views/setting/live_notify.volt b/app/Http/Admin/Views/setting/live_notify.volt
index dd74b74a..ae93063d 100644
--- a/app/Http/Admin/Views/setting/live_notify.volt
+++ b/app/Http/Admin/Views/setting/live_notify.volt
@@ -2,37 +2,37 @@
     <div class="layui-form-item">
         <label class="layui-form-label">回调密钥</label>
         <div class="layui-input-block">
-            <input class="layui-input" type="text" name="notify_auth_key" value="{{ live.notify_auth_key }}">
+            <input class="layui-input" type="text" name="auth_key" value="{{ notify.auth_key }}">
         </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="notify_stream_begin_url" value="{{ live.notify_stream_begin_url }}" layui-verify="required">
+            <input class="layui-input" type="text" name="stream_begin_url" value="{{ notify.stream_begin_url }}" layui-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="notify_stream_end_url" value="{{ live.notify_stream_end_url }}" layui-verify="required">
+            <input class="layui-input" type="text" name="stream_end_url" value="{{ notify.stream_end_url }}" layui-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="notify_record_url" value="{{ live.notify_record_url }}" layui-verify="required">
+            <input class="layui-input" type="text" name="record_url" value="{{ notify.record_url }}" layui-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="notify_snapshot_url" value="{{ live.notify_snapshot_url }}" layui-verify="required">
+            <input class="layui-input" type="text" name="snapshot_url" value="{{ notify.snapshot_url }}" layui-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="notify_porn_url" value="{{ live.notify_porn_url }}" layui-verify="required">
+            <input class="layui-input" type="text" name="porn_url" value="{{ notify.porn_url }}" layui-verify="required">
         </div>
     </div>
     <div class="layui-form-item">
@@ -40,6 +40,7 @@
         <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>
+            <input type="hidden" name="section" value="notify">
         </div>
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Http/Admin/Views/setting/live_pull.volt b/app/Http/Admin/Views/setting/live_pull.volt
index f3664fca..85299f4f 100644
--- a/app/Http/Admin/Views/setting/live_pull.volt
+++ b/app/Http/Admin/Views/setting/live_pull.volt
@@ -1,5 +1,5 @@
-{% set pull_auth_display = live.pull_auth_enabled == 0 ? 'style="display:none;"' : '' %}
-{% set ppt_display = live.pull_trans_enabled == 0 ? 'style="display:none;"' : '' %}
+{% set auth_display = pull.auth_enabled == 0 ? 'style="display:none;"' : '' %}
+{% set ppt_display = pull.trans_enabled == 0 ? 'style="display:none;"' : '' %}
 
 <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.live'}) }}">
     <fieldset class="layui-elem-field layui-field-title">
@@ -8,14 +8,14 @@
     <div class="layui-form-item">
         <label class="layui-form-label">拉流协议</label>
         <div class="layui-input-block">
-            <input type="radio" name="pull_protocol" value="http" title="HTTP" {% if live.pull_protocol == "http" %}checked{% endif %}>
-            <input type="radio" name="pull_protocol" value="https" title="HTTPS" {% if live.pull_protocol == "https" %}checked{% endif %}>
+            <input type="radio" name="protocol" value="http" title="HTTP" {% if pull.protocol == "http" %}checked{% endif %}>
+            <input type="radio" name="protocol" value="https" title="HTTPS" {% if pull.protocol == "https" %}checked{% endif %}>
         </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="pull_domain" value="{{ live.pull_domain }}" layui-verify="required">
+            <input class="layui-input" type="text" name="domain" value="{{ pull.domain }}" layui-verify="required">
         </div>
     </div>
     <fieldset class="layui-elem-field layui-field-title">
@@ -24,21 +24,21 @@
     <div class="layui-form-item">
         <label class="layui-form-label">开启鉴权</label>
         <div class="layui-input-block">
-            <input type="radio" name="pull_auth_enabled" value="1" title="是" lay-filter="pull_auth_enabled" {% if live.pull_auth_enabled == 1 %}checked{% endif %}>
-            <input type="radio" name="pull_auth_enabled" value="0" title="否" lay-filter="pull_auth_enabled" {% if live.pull_auth_enabled == 0 %}checked{% endif %}>
+            <input type="radio" name="auth_enabled" value="1" title="是" lay-filter="pull_auth_enabled" {% if pull.auth_enabled == 1 %}checked{% endif %}>
+            <input type="radio" name="auth_enabled" value="0" title="否" lay-filter="pull_auth_enabled" {% if pull.auth_enabled == 0 %}checked{% endif %}>
         </div>
     </div>
-    <div id="pull-auth-block" {{ pull_auth_display }}>
+    <div id="pull-auth-block" {{ auth_display }}>
         <div class="layui-form-item">
             <label class="layui-form-label">鉴权密钥</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="pull_auth_key" value="{{ live.pull_auth_key }}">
+                <input class="layui-input" type="text" name="auth_key" value="{{ pull.auth_key }}">
             </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="pull_auth_delta" value="{{ live.pull_auth_delta }}">
+                <input class="layui-input" type="text" name="auth_delta" value="{{ pull.auth_delta }}">
             </div>
         </div>
     </div>
@@ -48,8 +48,8 @@
     <div class="layui-form-item">
         <label class="layui-form-label">开启转码</label>
         <div class="layui-input-block">
-            <input type="radio" name="pull_trans_enabled" value="1" title="是" lay-filter="pull_trans_enabled" {% if live.pull_trans_enabled == 1 %}checked{% endif %}>
-            <input type="radio" name="pull_trans_enabled" value="0" title="否" lay-filter="pull_trans_enabled" {% if live.pull_trans_enabled == 0 %}checked{% endif %}>
+            <input type="radio" name="trans_enabled" value="1" title="是" lay-filter="pull_trans_enabled" {% if pull.trans_enabled == 1 %}checked{% endif %}>
+            <input type="radio" name="trans_enabled" value="0" title="否" lay-filter="pull_trans_enabled" {% if pull.trans_enabled == 0 %}checked{% endif %}>
         </div>
     </div>
     <div id="ptt-block" {{ ppt_display }}>
@@ -96,6 +96,7 @@
         <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>
+            <input type="hidden" name="section" value="pull">
         </div>
     </div>
 </form>
diff --git a/app/Http/Admin/Views/setting/live_push.volt b/app/Http/Admin/Views/setting/live_push.volt
index 4d069390..1727f086 100644
--- a/app/Http/Admin/Views/setting/live_push.volt
+++ b/app/Http/Admin/Views/setting/live_push.volt
@@ -1,4 +1,4 @@
-{% set push_auth_display = live.push_auth_enabled == 0 ? 'style="display:none;"' : '' %}
+{% set auth_display = push.auth_enabled == 0 ? 'style="display:none;"' : '' %}
 
 <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.live'}) }}">
     <fieldset class="layui-elem-field layui-field-title">
@@ -7,7 +7,7 @@
     <div class="layui-form-item">
         <label class="layui-form-label">推流域名</label>
         <div class="layui-input-block">
-            <input class="layui-input" type="text" name="push_domain" value="{{ live.push_domain }}" layui-verify="required">
+            <input class="layui-input" type="text" name="domain" value="{{ push.domain }}" layui-verify="required">
         </div>
     </div>
     <fieldset class="layui-elem-field layui-field-title">
@@ -16,21 +16,21 @@
     <div class="layui-form-item">
         <label class="layui-form-label">开启鉴权</label>
         <div class="layui-input-block">
-            <input type="radio" name="push_auth_enabled" value="1" title="是" lay-filter="push_auth_enabled" {% if live.push_auth_enabled == 1 %}checked{% endif %}>
-            <input type="radio" name="push_auth_enabled" value="0" title="否" lay-filter="push_auth_enabled" {% if live.push_auth_enabled == 0 %}checked{% endif %}>
+            <input type="radio" name="auth_enabled" value="1" title="是" lay-filter="auth_enabled" {% if push.auth_enabled == 1 %}checked{% endif %}>
+            <input type="radio" name="auth_enabled" value="0" title="否" lay-filter="auth_enabled" {% if push.auth_enabled == 0 %}checked{% endif %}>
         </div>
     </div>
-    <div id="push-auth-block" {{ push_auth_display }}>
+    <div id="push-auth-block" {{ auth_display }}>
         <div class="layui-form-item">
             <label class="layui-form-label">鉴权密钥</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="push_auth_key" value="{{ live.push_auth_key }}">
+                <input class="layui-input" type="text" name="auth_key" value="{{ push.auth_key }}">
             </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="push_auth_delta" value="{{ live.push_auth_delta }}">
+                <input class="layui-input" type="text" name="auth_delta" value="{{ push.auth_delta }}">
             </div>
         </div>
     </div>
@@ -39,6 +39,7 @@
         <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>
+            <input type="hidden" name="section" value="push">
         </div>
     </div>
 </form>
diff --git a/app/Http/Admin/Views/setting/smser.volt b/app/Http/Admin/Views/setting/smser.volt
index 1c34fc03..ce9f9e41 100644
--- a/app/Http/Admin/Views/setting/smser.volt
+++ b/app/Http/Admin/Views/setting/smser.volt
@@ -2,6 +2,8 @@
 
 {% block content %}
 
+    {% set template = smser.template|json_decode %}
+
     <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.smser'}) }}">
         <fieldset class="layui-elem-field layui-field-title">
             <legend>基础配置</legend>
diff --git a/app/Services/Live.php b/app/Services/Live.php
index e4494e95..d9cfc1c4 100644
--- a/app/Services/Live.php
+++ b/app/Services/Live.php
@@ -34,7 +34,9 @@ class Live extends Service
 
     public function __construct()
     {
-        $this->settings = $this->getSectionSettings('live');
+        $this->settings['push'] = $this->getSectionSettings('live.push');
+        $this->settings['pull'] = $this->getSectionSettings('live.pull');
+        $this->settings['notify'] = $this->getSectionSettings('live.notify');
 
         $this->logger = $this->getLogger('live');
 
@@ -55,7 +57,7 @@ class Live extends Service
             $request = new DescribeLiveStreamStateRequest();
 
             $params = json_encode([
-                'DomainName' => $this->settings['push_domain'],
+                'DomainName' => $this->settings['push']['domain'],
                 'AppName' => $appName ?: 'live',
                 'StreamName' => $streamName,
             ]);
@@ -73,7 +75,6 @@ class Live extends Service
         } catch (TencentCloudSDKException $e) {
 
             $this->logger->error('Describe Live Stream State Exception ' . kg_json_encode([
-                    'line' => $e->getLine(),
                     'code' => $e->getErrorCode(),
                     'message' => $e->getMessage(),
                     'requestId' => $e->getRequestId(),
@@ -100,7 +101,7 @@ class Live extends Service
             $request = new ForbidLiveStreamRequest();
 
             $params = json_encode([
-                'DomainName' => $this->settings['push_domain'],
+                'DomainName' => $this->settings['push']['domain'],
                 'AppName' => $appName ?: 'live',
                 'StreamName' => $streamName,
                 'Reason' => $reason,
@@ -119,7 +120,6 @@ class Live extends Service
         } catch (TencentCloudSDKException $e) {
 
             $this->logger->error('Forbid Live Stream Exception ' . kg_json_encode([
-                    'line' => $e->getLine(),
                     'code' => $e->getErrorCode(),
                     'message' => $e->getMessage(),
                     'requestId' => $e->getRequestId(),
@@ -145,7 +145,7 @@ class Live extends Service
             $request = new ResumeLiveStreamRequest();
 
             $params = json_encode([
-                'DomainName' => $this->settings['push_domain'],
+                'DomainName' => $this->settings['push']['domain'],
                 'AppName' => $appName ?: 'live',
                 'StreamName' => $streamName,
             ]);
@@ -163,7 +163,6 @@ class Live extends Service
         } catch (TencentCloudSDKException $e) {
 
             $this->logger->error('Resume Live Stream Exception ' . kg_json_encode([
-                    'line' => $e->getLine(),
                     'code' => $e->getErrorCode(),
                     'message' => $e->getMessage(),
                     'requestId' => $e->getRequestId(),
@@ -186,10 +185,10 @@ class Live extends Service
     {
         $appName = $appName ?: 'live';
 
-        $authEnabled = $this->settings['push_auth_enabled'];
-        $authKey = $this->settings['push_auth_key'];
-        $expireTime = $this->settings['push_auth_delta'] + time();
-        $domain = $this->settings['push_domain'];
+        $authEnabled = $this->settings['push']['auth_enabled'];
+        $authKey = $this->settings['push']['auth_key'];
+        $expireTime = $this->settings['push']['auth_delta'] + time();
+        $domain = $this->settings['push']['domain'];
 
         $authParams = $this->getAuthParams($streamName, $authKey, $expireTime);
 
@@ -210,12 +209,12 @@ class Live extends Service
     {
         $appName = $appName ?: 'live';
 
-        $protocol = $this->settings['pull_protocol'];
-        $domain = $this->settings['pull_domain'];
-        $authEnabled = $this->settings['pull_auth_enabled'];
-        $transEnabled = $this->settings['pull_trans_enabled'];
-        $authKey = $this->settings['pull_auth_key'];
-        $expireTime = $this->settings['pull_auth_delta'] + time();
+        $protocol = $this->settings['pull']['protocol'];
+        $domain = $this->settings['pull']['domain'];
+        $authEnabled = $this->settings['pull']['auth_enabled'];
+        $transEnabled = $this->settings['pull']['trans_enabled'];
+        $authKey = $this->settings['pull']['auth_key'];
+        $expireTime = $this->settings['pull']['auth_delta'] + time();
 
         $formats = ['rtmp', 'flv', 'm3u8'];
 
diff --git a/app/Services/LiveNotify.php b/app/Services/LiveNotify.php
index 52262a00..9ed304f5 100644
--- a/app/Services/LiveNotify.php
+++ b/app/Services/LiveNotify.php
@@ -136,11 +136,11 @@ class LiveNotify extends Service
 
         $redis = $cache->getRedis();
 
-        $keyName = $this->getNotifyKeyName();
+        $key = $this->getNotifyKey();
 
-        $redis->sAdd($keyName, $chapter->id);
+        $redis->sAdd($key, $chapter->id);
 
-        $redis->expire($keyName, 86400);
+        $redis->expire($key, 86400);
     }
 
     protected function getChapter($streamId)
@@ -176,9 +176,9 @@ class LiveNotify extends Service
             return false;
         }
 
-        $live = $this->getSectionSettings('live');
+        $live = $this->getSectionSettings('live.notify');
 
-        $mySign = md5($live['notify_auth_key'] . $time);
+        $mySign = md5($live['auth_key'] . $time);
 
         return $sign == $mySign;
     }
diff --git a/db/migrations/20200827112717_insert_setting_data.php b/db/migrations/20200827112717_insert_setting_data.php
index 79f8c1f1..955feb10 100644
--- a/db/migrations/20200827112717_insert_setting_data.php
+++ b/db/migrations/20200827112717_insert_setting_data.php
@@ -76,53 +76,83 @@ final class InsertSettingData extends AbstractMigration
                 'item_value' => '0',
             ],
             [
-                'section' => 'live',
-                'item_key' => 'push_domain',
-                'item_value' => 'push.abc.com',
+                'section' => 'live.push',
+                'item_key' => 'domain',
+                'item_value' => '',
             ],
             [
-                'section' => 'live',
-                'item_key' => 'pull_trans_enabled',
-                'item_value' => '1',
-            ],
-            [
-                'section' => 'live',
-                'item_key' => 'pull_auth_enabled',
-                'item_value' => '1',
-            ],
-            [
-                'section' => 'live',
+                'section' => 'live.push',
                 'item_key' => 'push_auth_enabled',
                 'item_value' => '1',
             ],
             [
-                'section' => 'live',
-                'item_key' => 'pull_protocol',
-                'item_value' => 'http',
+                'section' => 'live.push',
+                'item_key' => 'push_auth_key',
+                'item_value' => '',
             ],
             [
-                'section' => 'live',
+                'section' => 'live.push',
                 'item_key' => 'push_auth_delta',
                 'item_value' => '18000',
             ],
             [
-                'section' => 'live',
-                'item_key' => 'pull_auth_delta',
-                'item_value' => '18000',
+                'section' => 'live.pull',
+                'item_key' => 'pull_protocol',
+                'item_value' => 'http',
             ],
             [
-                'section' => 'live',
+                'section' => 'live.pull',
+                'item_key' => 'pull_domain',
+                'item_value' => '',
+            ],
+            [
+                'section' => 'live.pull',
+                'item_key' => 'pull_trans_enabled',
+                'item_value' => '0',
+            ],
+            [
+                'section' => 'live.pull',
+                'item_key' => 'pull_auth_enabled',
+                'item_value' => '1',
+            ],
+            [
+                'section' => 'live.pull',
                 'item_key' => 'pull_auth_key',
                 'item_value' => '',
             ],
             [
-                'section' => 'live',
-                'item_key' => 'pull_domain',
-                'item_value' => 'play.abc.com',
+                'section' => 'live.pull',
+                'item_key' => 'pull_auth_delta',
+                'item_value' => '18000',
             ],
             [
-                'section' => 'live',
-                'item_key' => 'push_auth_key',
+                'section' => 'live.notify',
+                'item_key' => 'pull_auth_key',
+                'item_value' => '',
+            ],
+            [
+                'section' => 'live.notify',
+                'item_key' => 'stream_begin_url',
+                'item_value' => '',
+            ],
+            [
+                'section' => 'live.notify',
+                'item_key' => 'stream_end_url',
+                'item_value' => '',
+            ],
+            [
+                'section' => 'live.notify',
+                'item_key' => 'record_url',
+                'item_value' => '',
+            ],
+            [
+                'section' => 'live.notify',
+                'item_key' => 'snapshot_url',
+                'item_value' => '',
+            ],
+            [
+                'section' => 'live.notify',
+                'item_key' => 'porn_url',
                 'item_value' => '',
             ],
             [