From 7e94b95c0525536ca7efa97b69e7832ea2f70c8d Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Mon, 7 Sep 2020 15:56:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Tasks/MaintainTask.php            | 28 +++++++++++++++++--
 app/Http/Admin/Controllers/VodController.php  |  4 +--
 app/Http/Admin/Views/course/edit_sale.volt    |  3 +-
 app/Http/Admin/Views/setting/live.volt        |  2 +-
 app/Http/Admin/Views/setting/live_pull.volt   |  8 +++---
 app/Http/Admin/Views/setting/live_push.volt   |  8 +++---
 app/Http/Admin/Views/setting/site.volt        |  4 +--
 app/Http/Admin/Views/setting/vod.volt         | 16 +++++------
 app/Http/Admin/Views/user/edit.volt           | 20 +++++++------
 app/Services/Vod.php                          |  2 +-
 config/cert/alipay/.gitignore                 |  2 ++
 config/cert/wxpay/.gitignore                  |  2 ++
 .../20200827112717_insert_setting_data.php    |  4 +--
 13 files changed, 67 insertions(+), 36 deletions(-)
 create mode 100644 config/cert/alipay/.gitignore
 create mode 100644 config/cert/wxpay/.gitignore

diff --git a/app/Console/Tasks/MaintainTask.php b/app/Console/Tasks/MaintainTask.php
index 97ac7e1e..f8b1d1e6 100644
--- a/app/Console/Tasks/MaintainTask.php
+++ b/app/Console/Tasks/MaintainTask.php
@@ -2,7 +2,9 @@
 
 namespace App\Console\Tasks;
 
+use App\Caches\Setting as SettingCache;
 use App\Library\Cache\Backend\Redis as RedisCache;
+use App\Models\Setting as SettingModel;
 use Phalcon\Cli\Task;
 use Phalcon\Config;
 
@@ -11,11 +13,31 @@ class MaintainTask extends Task
 
     public function mainAction()
     {
+        $this->resetSettingAction();
         $this->resetAnnotationAction();
         $this->resetMetadataAction();
         $this->resetVoltAction();
     }
 
+    /**
+     * 重置设置
+     *
+     * @command: php console.php maintain reset_setting
+     */
+    public function resetSettingAction()
+    {
+        echo "start reset setting..." . PHP_EOL;
+
+        $rows = SettingModel::query()->columns('section')->distinct(true)->execute();
+
+        foreach ($rows as $row) {
+            $cache = new SettingCache();
+            $cache->rebuild($row->section);
+        }
+
+        echo "end reset setting..." . PHP_EOL;
+    }
+
     /**
      * 重置注解
      *
@@ -38,7 +60,7 @@ class MaintainTask extends Task
 
         if (count($keys) > 0) {
 
-            $keys = $this->handleKeys($keys);
+            $keys = $this->handlePhKeys($keys);
 
             $redis->del(...$keys);
             $redis->del($statsKey);
@@ -69,7 +91,7 @@ class MaintainTask extends Task
 
         if (count($keys) > 0) {
 
-            $keys = $this->handleKeys($keys);
+            $keys = $this->handlePhKeys($keys);
 
             $redis->del(...$keys);
             $redis->del($statsKey);
@@ -118,7 +140,7 @@ class MaintainTask extends Task
         return $cache;
     }
 
-    protected function handleKeys($keys)
+    protected function handlePhKeys($keys)
     {
         return array_map(function ($key) {
             return "_PHCR{$key}";
diff --git a/app/Http/Admin/Controllers/VodController.php b/app/Http/Admin/Controllers/VodController.php
index 91e9a187..72f4c35f 100644
--- a/app/Http/Admin/Controllers/VodController.php
+++ b/app/Http/Admin/Controllers/VodController.php
@@ -14,11 +14,11 @@ class VodController extends Controller
     /**
      * @Post("/upload/sign", name="admin.vod.upload_sign")
      */
-    public function uploadSignAction()
+    public function uploadSignatureAction()
     {
         $service = new VodService();
 
-        $sign = $service->getUploadSign();
+        $sign = $service->getUploadSignature();
 
         return $this->jsonSuccess(['sign' => $sign]);
     }
diff --git a/app/Http/Admin/Views/course/edit_sale.volt b/app/Http/Admin/Views/course/edit_sale.volt
index bffa86cf..071da233 100644
--- a/app/Http/Admin/Views/course/edit_sale.volt
+++ b/app/Http/Admin/Views/course/edit_sale.volt
@@ -1,4 +1,5 @@
 {% set free = course.market_price == 0 %}
+{% set price_display = course.market_price > 0 ? 'display:block' : 'display:none' %}
 
 <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.course.update','id':course.id}) }}">
     <div class="layui-form-item">
@@ -8,7 +9,7 @@
             <input type="radio" name="price_mode" value="charge" title="收费" lay-filter="price_mode" {% if not free %}checked="checked"{% endif %}>
         </div>
     </div>
-    <div id="price-block" {% if free %}style="display:none;"{% endif %}>
+    <div id="price-block" style="{{ price_display }}">
         <div class="layui-form-item">
             <div class="layui-inline">
                 <label class="layui-form-label">市场价格</label>
diff --git a/app/Http/Admin/Views/setting/live.volt b/app/Http/Admin/Views/setting/live.volt
index 81ddc450..91808ff9 100644
--- a/app/Http/Admin/Views/setting/live.volt
+++ b/app/Http/Admin/Views/setting/live.volt
@@ -52,7 +52,7 @@
             });
 
             form.on('radio(pull_trans_enabled)', function (data) {
-                var block = $('#ptt-block');
+                var block = $('#pull-trans-tpl-block');
                 if (data.value === '1') {
                     block.show();
                 } else {
diff --git a/app/Http/Admin/Views/setting/live_pull.volt b/app/Http/Admin/Views/setting/live_pull.volt
index 4b73e7be..3dd4ec32 100644
--- a/app/Http/Admin/Views/setting/live_pull.volt
+++ b/app/Http/Admin/Views/setting/live_pull.volt
@@ -1,5 +1,5 @@
-{% set auth_display = pull.auth_enabled == 0 ? 'style="display:none;"' : '' %}
-{% set ppt_display = pull.trans_enabled == 0 ? 'style="display:none;"' : '' %}
+{% set pull_auth_display = pull.auth_enabled == 1 ? 'display:block' : 'display:none' %}
+{% set pull_trans_tpl_display = pull.trans_enabled == 1 ? 'display:block' : 'display:none' %}
 
 <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.live'}) }}">
     <fieldset class="layui-elem-field layui-field-title">
@@ -28,7 +28,7 @@
             <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" {{ auth_display }}>
+    <div id="pull-auth-block" style="{{ pull_auth_display }}">
         <div class="layui-form-item">
             <label class="layui-form-label">鉴权密钥</label>
             <div class="layui-input-block">
@@ -52,7 +52,7 @@
             <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 }}>
+    <div id="pull-trans-tpl-block" style="{{ pull_trans_tpl_display }}">
         <div class="layui-form-item">
             <table class="layui-table">
                 <colgroup>
diff --git a/app/Http/Admin/Views/setting/live_push.volt b/app/Http/Admin/Views/setting/live_push.volt
index 1727f086..3c1955c3 100644
--- a/app/Http/Admin/Views/setting/live_push.volt
+++ b/app/Http/Admin/Views/setting/live_push.volt
@@ -1,4 +1,4 @@
-{% set auth_display = push.auth_enabled == 0 ? 'style="display:none;"' : '' %}
+{% set push_auth_display = push.auth_enabled == 1 ? 'display:block' : 'display:none' %}
 
 <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.live'}) }}">
     <fieldset class="layui-elem-field layui-field-title">
@@ -16,11 +16,11 @@
     <div class="layui-form-item">
         <label class="layui-form-label">开启鉴权</label>
         <div class="layui-input-block">
-            <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 %}>
+            <input type="radio" name="auth_enabled" value="1" title="是" lay-filter="push_auth_enabled" {% if push.auth_enabled == 1 %}checked{% endif %}>
+            <input type="radio" name="auth_enabled" value="0" title="否" lay-filter="push_auth_enabled" {% if push.auth_enabled == 0 %}checked{% endif %}>
         </div>
     </div>
-    <div id="push-auth-block" {{ auth_display }}>
+    <div id="push-auth-block" style="{{ push_auth_display }}">
         <div class="layui-form-item">
             <label class="layui-form-label">鉴权密钥</label>
             <div class="layui-input-block">
diff --git a/app/Http/Admin/Views/setting/site.volt b/app/Http/Admin/Views/setting/site.volt
index bed80a89..a8e1ffb1 100644
--- a/app/Http/Admin/Views/setting/site.volt
+++ b/app/Http/Admin/Views/setting/site.volt
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    {% set closed_tips_display = site.enabled == 1 ? 'style="display:none;"' : '' %}
+    {% set closed_tips_display = site.enabled == 0 ? 'display:block' : 'display:none' %}
 
     <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.site'}) }}">
         <fieldset class="layui-elem-field layui-field-title">
@@ -15,7 +15,7 @@
                 <input type="radio" name="enabled" value="0" title="关闭" lay-filter="status" {% if site.enabled == 0 %}checked{% endif %}>
             </div>
         </div>
-        <div id="closed-tips-block" {{ closed_tips_display }}>
+        <div id="closed-tips-block" style="{{ closed_tips_display }}">
             <div class="layui-form-item">
                 <label class="layui-form-label">关闭原因</label>
                 <div class="layui-input-block">
diff --git a/app/Http/Admin/Views/setting/vod.volt b/app/Http/Admin/Views/setting/vod.volt
index e900d326..c173a3ae 100644
--- a/app/Http/Admin/Views/setting/vod.volt
+++ b/app/Http/Admin/Views/setting/vod.volt
@@ -2,9 +2,9 @@
 
 {% block content %}
 
-    {% set storage_region_display = vod.storage_type == 'nearby' ? 'style="display:none;"' : '' %}
-    {% set watermark_tpl_display = vod.watermark_enabled == 0 ? 'style="display:none;"' : '' %}
-    {% set key_anti_display = vod.key_anti_enabled == 0 ? 'style="display:none;"' : '' %}
+    {% set storage_region_display = vod.storage_type == 'fixed' ? 'display:block' : 'display:none' %}
+    {% set watermark_template_display = vod.watermark_enabled == 1 ? 'display:block' : 'display:none' %}
+    {% set key_anti_display = vod.key_anti_enabled == 1 ? 'display:block': 'display:none' %}
 
     <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.vod'}) }}">
         <fieldset class="layui-elem-field layui-field-title">
@@ -17,7 +17,7 @@
                 <input type="radio" name="storage_type" value="fixed" title="固定区域" lay-filter="storage_type" {% if vod.storage_type == "fixed" %}checked{% endif %}>
             </div>
         </div>
-        <div id="storage-region-block" {{ storage_region_display }}>
+        <div id="storage-region-block" style="{{ storage_region_display }}">
             <div class="layui-form-item">
                 <label class="layui-form-label">所在区域</label>
                 <div class="layui-input-block">
@@ -49,7 +49,7 @@
                 <input type="radio" name="watermark_enabled" value="0" title="否" lay-filter="watermark_enabled" {% if vod.watermark_enabled == 0 %}checked{% endif %}>
             </div>
         </div>
-        <div id="watermark-template-block" {{ watermark_tpl_display }}>
+        <div id="watermark-template-block" style="{{ watermark_template_display }}">
             <div class="layui-form-item">
                 <label class="layui-form-label">水印模板ID</label>
                 <div class="layui-input-block">
@@ -63,14 +63,14 @@
         <div class="layui-form-item">
             <label class="layui-form-label">分发协议</label>
             <div class="layui-input-block">
-                <input type="radio" name="dist_protocol" value="https" title="HTTPS" {% if vod.dist_protocol == "https" %}checked{% endif %}>
-                <input type="radio" name="dist_protocol" value="http" title="HTTP" {% if vod.dist_protocol == "http" %}checked{% endif %}>
+                <input type="radio" name="protocol" value="https" title="HTTPS" {% if vod.protocol == "https" %}checked{% endif %}>
+                <input type="radio" name="protocol" value="http" title="HTTP" {% if vod.protocol == "http" %}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="dist_domain" value="{{ vod.dist_domain }}" lay-verify="required">
+                <input class="layui-input" type="text" name="domain" value="{{ vod.domain }}" lay-verify="required">
             </div>
         </div>
         <fieldset class="layui-elem-field layui-field-title">
diff --git a/app/Http/Admin/Views/user/edit.volt b/app/Http/Admin/Views/user/edit.volt
index 54f28c32..f10cb96c 100644
--- a/app/Http/Admin/Views/user/edit.volt
+++ b/app/Http/Admin/Views/user/edit.volt
@@ -2,6 +2,8 @@
 
 {% block content %}
 
+    {% set lock_expiry_display = user.locked == 1 ? 'display:block': 'display:none' %}
+
     <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.user.update','id':user.id}) }}">
         <fieldset class="layui-elem-field layui-field-title">
             <legend>编辑用户</legend>
@@ -51,14 +53,16 @@
                 <input type="radio" name="locked" value="0" title="否" lay-filter="locked" {% if user.locked == 0 %}checked="checked"{% endif %}>
             </div>
         </div>
-        <div class="layui-form-item" id="lock-expiry-block" {% if user.locked == 0 %}style="display:none;"{% endif %}>
-            <label class="layui-form-label">锁定期限</label>
-            <div class="layui-input-block">
-                {% if user.lock_expiry_time > 0 %}
-                    <input class="layui-input" type="text" name="lock_expiry_time" autocomplete="off" value="{{ date('Y-m-d H:i:s',user.lock_expiry_time) }}">
-                {% else %}
-                    <input class="layui-input" type="text" name="lock_expiry_time" autocomplete="off">
-                {% endif %}
+        <div id="lock-expiry-block" style="{{ lock_expiry_display }}">
+            <div class="layui-form-item">
+                <label class="layui-form-label">锁定期限</label>
+                <div class="layui-input-block">
+                    {% if user.lock_expiry_time > 0 %}
+                        <input class="layui-input" type="text" name="lock_expiry_time" autocomplete="off" value="{{ date('Y-m-d H:i:s',user.lock_expiry_time) }}">
+                    {% else %}
+                        <input class="layui-input" type="text" name="lock_expiry_time" autocomplete="off">
+                    {% endif %}
+                </div>
             </div>
         </div>
         <div class="layui-form-item">
diff --git a/app/Services/Vod.php b/app/Services/Vod.php
index dd656326..a9c456e7 100644
--- a/app/Services/Vod.php
+++ b/app/Services/Vod.php
@@ -84,7 +84,7 @@ class Vod extends Service
      *
      * @return string
      */
-    public function getUploadSign()
+    public function getUploadSignature()
     {
         $secret = $this->getSectionSettings('secret');
 
diff --git a/config/cert/alipay/.gitignore b/config/cert/alipay/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/config/cert/alipay/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/config/cert/wxpay/.gitignore b/config/cert/wxpay/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/config/cert/wxpay/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/db/migrations/20200827112717_insert_setting_data.php b/db/migrations/20200827112717_insert_setting_data.php
index 485c54e9..a0841441 100644
--- a/db/migrations/20200827112717_insert_setting_data.php
+++ b/db/migrations/20200827112717_insert_setting_data.php
@@ -402,12 +402,12 @@ final class InsertSettingData extends AbstractMigration
             ],
             [
                 'section' => 'vod',
-                'item_key' => 'dist_protocol',
+                'item_key' => 'protocol',
                 'item_value' => 'https',
             ],
             [
                 'section' => 'vod',
-                'item_key' => 'dist_domain',
+                'item_key' => 'domain',
                 'item_value' => '',
             ],
             [