From a06e60353dd9a5996fcaae8b931acc33e85127ed Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 17 Mar 2020 13:37:58 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E6=B7=BB=E5=8A=A0=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E5=85=AC=E7=BD=91=E5=AE=89=E5=A4=87=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/config/index.html              |  9 ++-
 app/admin/view/config/system.html             | 31 ++++---
 app/admin/view/login/index.html               |  1 +
 composer.lock                                 | 10 +--
 vendor/composer/autoload_classmap.php         |  2 +
 vendor/composer/autoload_static.php           |  2 +
 vendor/composer/installed.json                | 12 +--
 vendor/services.php                           |  2 +-
 .../wechat-developer/AliPay/Trade.php         | 80 +++++++++++++++++++
 vendor/zoujingli/wechat-developer/We.php      |  2 +-
 .../wechat-developer/WeMini/Live.php          | 56 +++++++++++++
 11 files changed, 180 insertions(+), 27 deletions(-)
 create mode 100644 vendor/zoujingli/wechat-developer/AliPay/Trade.php
 create mode 100644 vendor/zoujingli/wechat-developer/WeMini/Live.php

diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html
index 28832b63d..962f0e140 100644
--- a/app/admin/view/config/index.html
+++ b/app/admin/view/config/index.html
@@ -50,7 +50,14 @@
         </label>
         <div class="help-block">管理程序版本，将显示在后台左上角标题</div>
     </div>
-
+    <div class="layui-form-item">
+        <span class="color-green font-w7">公网备案号 Baian</span>
+        <label class="relative block">
+            <input readonly value="{:sysconf('beian')}" placeholder="请输入公网备案号" class="layui-input layui-bg-gray">
+            <a data-copy="{:sysconf('beian')}" class="fa fa-copy input-right-icon"></a>
+        </label>
+        <p class="help-block">公网备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将在登录页面下面显示</p>
+    </div>
     <div class="layui-form-item">
         <div class="color-green font-w7">网站备案号 Miitbeian</div>
         <label class="relative block">
diff --git a/app/admin/view/config/system.html b/app/admin/view/config/system.html
index 92cb5a5ff..80565e8f4 100644
--- a/app/admin/view/config/system.html
+++ b/app/admin/view/config/system.html
@@ -1,27 +1,24 @@
 <form onsubmit="return false" data-auto="true" action="{:request()->url()}" method="post" class='layui-form layui-card' autocomplete="off">
     <div class="layui-card-body padding-left-40">
 
-        <div class="layui-form-item">
-            <label class="relative block">
+        <div class="layui-form-item layui-row layui-col-space10">
+            <label class="layui-col-xs4 relative block">
                 <span class="color-green font-w7">网站名称 Website</span>
                 <input name="site_name" required placeholder="请输入网站名称" value="{:sysconf('site_name')}" class="layui-input">
+                <span class="help-block">网站名称将显示在浏览器的标签上</span>
             </label>
-            <p class="help-block">网站名称，将在浏览器的标签上显示名称</p>
-        </div>
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">管理程序名称 Name</span>
+            <label class="layui-col-xs4 relative block">
+                <span class="color-green font-w7">后台程序名称 Name</span>
                 <input name="app_name" required placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input">
+                <span class="help-block">管理程序名称显示在后台左上标题处</span>
             </label>
-            <p class="help-block">管理程序名称，在后台左上角标题处理显示</p>
-        </div>
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">管理程序版本 Version</span>
+            <label class="layui-col-xs4 relative block">
+                <span class="color-green font-w7">后台程序版本 Version</span>
                 <input name="app_version" placeholder="请输入程序版本" value="{:sysconf('app_version')}" class="layui-input">
+                <span class="help-block">管理程序版本显示在后台左上标题处</span>
             </label>
-            <p class="help-block">管理程序版本，在后台左上角标题处理显示</p>
         </div>
+
         <div class="layui-form-item">
             <span class="color-green font-w7">浏览器图标 Browser</span>
             <div class="relative block">
@@ -31,6 +28,14 @@
                 <p class="help-block">建议上传 ICO 图标的尺寸为 128x128 <a href="http://www.favicon-icon-generator.com" target="_blank">ICON在线制作</a></p>
             </div>
         </div>
+
+        <div class="layui-form-item">
+            <label class="relative block">
+                <span class="color-green font-w7">公网备案号 Baian</span>
+                <input name="beian" required placeholder="请输入公网备案号" value="{:sysconf('beian')}" class="layui-input">
+            </label>
+            <p class="help-block">公网备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将在登录页面下面显示</p>
+        </div>
         <div class="layui-form-item">
             <label class="relative block">
                 <span class="color-green font-w7">网站备案号 Miitbeian</span>
diff --git a/app/admin/view/login/index.html b/app/admin/view/login/index.html
index 888602712..8bb7395c0 100644
--- a/app/admin/view/login/index.html
+++ b/app/admin/view/login/index.html
@@ -40,6 +40,7 @@
     <div class="footer notselect">
         <p class="layui-hide-xs"><a target="_blank" href="https://www.google.cn/chrome">推荐使用谷歌浏览器</a></p>
         {:sysconf('site_copy')}
+        {if sysconf('beian')}<span class="padding-5">|</span><a target="_blank" href="http://beian.miit.gov.cn">{:sysconf('beian')}</a>{/if}
         {if sysconf('miitbeian')}<span class="padding-5">|</span><a target="_blank" href="http://beian.miit.gov.cn">{:sysconf('miitbeian')}</a>{/if}
     </div>
 </div>
diff --git a/composer.lock b/composer.lock
index f4cfb4ed3..60754104f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -962,16 +962,16 @@
         },
         {
             "name": "zoujingli/wechat-developer",
-            "version": "v1.2.19",
+            "version": "v1.2.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/WeChatDeveloper.git",
-                "reference": "c30e880bf70709a50e9b73c9dc574ed6ca2d6156"
+                "reference": "9afb0a29c658d52dc7b9d46d2f848602124936b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/c30e880bf70709a50e9b73c9dc574ed6ca2d6156",
-                "reference": "c30e880bf70709a50e9b73c9dc574ed6ca2d6156",
+                "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/9afb0a29c658d52dc7b9d46d2f848602124936b7",
+                "reference": "9afb0a29c658d52dc7b9d46d2f848602124936b7",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1023,7 +1023,7 @@
                 "wechatpay",
                 "wepay"
             ],
-            "time": "2020-03-11T09:50:03+00:00"
+            "time": "2020-03-14T06:58:18+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 625a6a63a..6f72bd145 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -10,6 +10,7 @@ return array(
     'AliPay\\Bill' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Bill.php',
     'AliPay\\Pos' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Pos.php',
     'AliPay\\Scan' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Scan.php',
+    'AliPay\\Trade' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Trade.php',
     'AliPay\\Transfer' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Transfer.php',
     'AliPay\\Wap' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Wap.php',
     'AliPay\\Web' => $vendorDir . '/zoujingli/wechat-developer/AliPay/Web.php',
@@ -167,6 +168,7 @@ return array(
     'WeMini\\Delivery' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Delivery.php',
     'WeMini\\Guide' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Guide.php',
     'WeMini\\Image' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Image.php',
+    'WeMini\\Live' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Live.php',
     'WeMini\\Logistics' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Logistics.php',
     'WeMini\\Message' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Message.php',
     'WeMini\\Newtmpl' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Newtmpl.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index a8a7c62af..dbe0dfb18 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -143,6 +143,7 @@ class ComposerStaticInit9eebf462f38fc6a0db482795c8caf813
         'AliPay\\Bill' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Bill.php',
         'AliPay\\Pos' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Pos.php',
         'AliPay\\Scan' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Scan.php',
+        'AliPay\\Trade' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Trade.php',
         'AliPay\\Transfer' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Transfer.php',
         'AliPay\\Wap' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Wap.php',
         'AliPay\\Web' => __DIR__ . '/..' . '/zoujingli/wechat-developer/AliPay/Web.php',
@@ -300,6 +301,7 @@ class ComposerStaticInit9eebf462f38fc6a0db482795c8caf813
         'WeMini\\Delivery' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Delivery.php',
         'WeMini\\Guide' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Guide.php',
         'WeMini\\Image' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Image.php',
+        'WeMini\\Live' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Live.php',
         'WeMini\\Logistics' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Logistics.php',
         'WeMini\\Message' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Message.php',
         'WeMini\\Newtmpl' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Newtmpl.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index d46740205..26824e6df 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -989,17 +989,17 @@
     },
     {
         "name": "zoujingli/wechat-developer",
-        "version": "v1.2.19",
-        "version_normalized": "1.2.19.0",
+        "version": "v1.2.20",
+        "version_normalized": "1.2.20.0",
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/WeChatDeveloper.git",
-            "reference": "c30e880bf70709a50e9b73c9dc574ed6ca2d6156"
+            "reference": "9afb0a29c658d52dc7b9d46d2f848602124936b7"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/c30e880bf70709a50e9b73c9dc574ed6ca2d6156",
-            "reference": "c30e880bf70709a50e9b73c9dc574ed6ca2d6156",
+            "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/9afb0a29c658d52dc7b9d46d2f848602124936b7",
+            "reference": "9afb0a29c658d52dc7b9d46d2f848602124936b7",
             "shasum": "",
             "mirrors": [
                 {
@@ -1018,7 +1018,7 @@
             "ext-simplexml": "*",
             "php": ">=5.4"
         },
-        "time": "2020-03-11T09:50:03+00:00",
+        "time": "2020-03-14T06:58:18+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
diff --git a/vendor/services.php b/vendor/services.php
index b00e83a3d..77e7c1784 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-03-13 14:10:34
+// This file is automatically generated at:2020-03-17 13:25:46
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',
diff --git a/vendor/zoujingli/wechat-developer/AliPay/Trade.php b/vendor/zoujingli/wechat-developer/AliPay/Trade.php
new file mode 100644
index 000000000..aa289c953
--- /dev/null
+++ b/vendor/zoujingli/wechat-developer/AliPay/Trade.php
@@ -0,0 +1,80 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay;
+
+use WeChat\Contracts\BasicAliPay;
+
+/**
+ * 支付宝标准接口
+ * Class Trade
+ * @package AliPay
+ */
+class Trade extends BasicAliPay
+{
+
+    /**
+     * 设置交易接口地址
+     * @param string $method
+     * @return $this
+     */
+    public function setMethod($method)
+    {
+        $this->options->set('method', $method);
+        return $this;
+    }
+
+    /**
+     * 获取交易接口地址
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->options->get('method');
+    }
+
+    /**
+     * 设置接口公共参数
+     * @param array $option
+     * @return Trade
+     */
+    public function setOption($option = [])
+    {
+        foreach ($option as $key => $vo) {
+            $this->options->set($key, $vo);
+        }
+        return $this;
+    }
+
+    /**
+     * 获取接口公共参数
+     * @return array|string|null
+     */
+    public function getOption()
+    {
+        return $this->options->get();
+    }
+
+    /**
+     * 执行通过接口
+     * @param array $options
+     * @return array|boolean|mixed
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function apply($options)
+    {
+        return $this->getResult($options);
+    }
+}
\ No newline at end of file
diff --git a/vendor/zoujingli/wechat-developer/We.php b/vendor/zoujingli/wechat-developer/We.php
index 83da261bc..fb3e69145 100644
--- a/vendor/zoujingli/wechat-developer/We.php
+++ b/vendor/zoujingli/wechat-developer/We.php
@@ -85,7 +85,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.19';
+    const VERSION = '1.2.20';
 
     /**
      * 静态配置
diff --git a/vendor/zoujingli/wechat-developer/WeMini/Live.php b/vendor/zoujingli/wechat-developer/WeMini/Live.php
new file mode 100644
index 000000000..a7ff7a03f
--- /dev/null
+++ b/vendor/zoujingli/wechat-developer/WeMini/Live.php
@@ -0,0 +1,56 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 小程序直播接口
+ * Class Live
+ * @package WeMini
+ */
+class Live extends BasicWeChat
+{
+
+    /**
+     * 获取直播房间列表
+     * @param integer $start 起始拉取房间
+     * @param integer $limit 每次拉取的个数上限
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getLiveList($start = 0, $limit = 10)
+    {
+        $url = 'http://api.weixin.qq.com/wxa/business/getliveinfo?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['start' => $start, 'limit' => $limit], true);
+    }
+
+    /**
+     * 获取回放源视频
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getLiveInfo($data = [])
+    {
+        $url = 'http://api.weixin.qq.com/wxa/business/getliveinfo?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+}
\ No newline at end of file