From 03ee3e3486e73c71597b430e6a7ef8804fbc65fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 2 Mar 2023 21:45:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8F=92=E4=BB=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                               |  1 +
 app/admin/Service.php                    |  8 +----
 app/admin/controller/Auth.php            |  2 +-
 app/admin/controller/Base.php            |  2 +-
 app/admin/controller/Config.php          |  2 +-
 app/admin/controller/File.php            |  2 +-
 app/admin/controller/Index.php           |  2 +-
 app/admin/controller/Login.php           |  2 +-
 app/admin/controller/Menu.php            |  2 +-
 app/admin/controller/Oplog.php           |  2 +-
 app/admin/controller/Queue.php           |  2 +-
 app/admin/controller/User.php            |  2 +-
 app/admin/controller/api/Plugs.php       |  5 ++--
 app/admin/controller/api/Queue.php       |  2 +-
 app/admin/controller/api/System.php      |  2 +-
 app/admin/controller/api/Upload.php      | 38 +-----------------------
 app/admin/route/demo.php                 |  2 +-
 app/admin/view/config/storage-local.html |  2 +-
 app/index/controller/Index.php           |  6 ++--
 public/static/plugs/admin/validate.js    | 10 ++++---
 20 files changed, 30 insertions(+), 66 deletions(-)

diff --git a/.gitignore b/.gitignore
index f3b0ec52d..d49298bc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 /database/migrations/20221215000001_install_center_data.php
 /database/migrations/20230209000001_install_wechat_service.php
 /database/migrations/20230224000001_install_account.php
+database/migrations/20230225000001_install_payment.php
diff --git a/app/admin/Service.php b/app/admin/Service.php
index 0d447a9dc..25155629e 100644
--- a/app/admin/Service.php
+++ b/app/admin/Service.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
@@ -25,12 +25,6 @@ use think\admin\Plugin;
  */
 class Service extends Plugin
 {
-    /**
-     * 定义资源目录
-     * @var string
-     */
-    protected $appCopy = 'app/admin';
-
     /**
      * 定义安装包名称
      * @var string
diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php
index be8e4c2ca..856a04d0a 100644
--- a/app/admin/controller/Auth.php
+++ b/app/admin/controller/Auth.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/Base.php b/app/admin/controller/Base.php
index 1a95b1372..3557a2421 100644
--- a/app/admin/controller/Base.php
+++ b/app/admin/controller/Base.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php
index d638dbd72..5aaa583c0 100644
--- a/app/admin/controller/Config.php
+++ b/app/admin/controller/Config.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/File.php b/app/admin/controller/File.php
index 996899a4f..c380c37ec 100644
--- a/app/admin/controller/File.php
+++ b/app/admin/controller/File.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index 6d67486e0..675ec897c 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php
index 8ab580788..dd66b0869 100644
--- a/app/admin/controller/Login.php
+++ b/app/admin/controller/Login.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php
index 25a493bd1..7e3d1a046 100644
--- a/app/admin/controller/Menu.php
+++ b/app/admin/controller/Menu.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php
index 8693dc30f..e7998acfb 100644
--- a/app/admin/controller/Oplog.php
+++ b/app/admin/controller/Oplog.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index 05591e287..c4ba22096 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index c1c704f66..ef9bf19f0 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php
index c67fb08dd..22f888787 100644
--- a/app/admin/controller/api/Plugs.php
+++ b/app/admin/controller/api/Plugs.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
@@ -18,6 +18,7 @@ namespace app\admin\controller\api;
 
 use think\admin\Controller;
 use think\admin\service\AdminService;
+use think\Response;
 
 /**
  * 通用插件管理
@@ -45,7 +46,7 @@ class Plugs extends Controller
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function script(): \think\Response
+    public function script(): Response
     {
         return response(join("\r\n", [
             sprintf("window.taDebug = %s;", $this->app->isDebug() ? 'true' : 'false'),
diff --git a/app/admin/controller/api/Queue.php b/app/admin/controller/api/Queue.php
index 1aa0cef4e..8fe584a92 100644
--- a/app/admin/controller/api/Queue.php
+++ b/app/admin/controller/api/Queue.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/api/System.php b/app/admin/controller/api/System.php
index bd3d9fa5d..5785f9bb8 100644
--- a/app/admin/controller/api/System.php
+++ b/app/admin/controller/api/System.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php
index c4ab37c21..af96e9817 100644
--- a/app/admin/controller/api/Upload.php
+++ b/app/admin/controller/api/Upload.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
@@ -159,42 +159,6 @@ class Upload extends Controller
         });
     }
 
-    /**
-     * 视频选择器
-     * @login true
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function video()
-    {
-        SystemFile::mQuery()->layTable(function () {
-            $this->title = '文件选择器';
-        }, function (QueryHelper $query) {
-            $query->like('name,hash')->dateBetween('create_at')->order('id desc');
-            $query->where(['status' => 2, 'issafe' => 0, 'uuid' => AdminService::getUserId()]);
-        });
-    }
-
-    /**
-     * 文档选择器
-     * @login true
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function document()
-    {
-        SystemFile::mQuery()->layTable(function () {
-            $this->title = '文件选择器';
-        }, function (QueryHelper $query) {
-            $query->like('name,hash')->dateBetween('create_at')->order('id desc');
-            $query->where(['status' => 2, 'issafe' => 0, 'uuid' => AdminService::getUserId()]);
-        });
-    }
-
     /**
      * 文件上传入口
      * @login true
diff --git a/app/admin/route/demo.php b/app/admin/route/demo.php
index 929d8a7f1..80547e4e0 100644
--- a/app/admin/route/demo.php
+++ b/app/admin/route/demo.php
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 // | Admin Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
diff --git a/app/admin/view/config/storage-local.html b/app/admin/view/config/storage-local.html
index 17f80cc5a..fe12f290f 100644
--- a/app/admin/view/config/storage-local.html
+++ b/app/admin/view/config/storage-local.html
@@ -13,7 +13,7 @@
                 <b class="color-green">访问协议</b><br><span class="nowrap color-desc">Protocol</span>
             </label>
             <div class="layui-input-block">
-                {if !sysconf('storage.local_http_protocol')}{php}sysconf('storage.local_http_protocol','http');{/php}{/if}
+                {if !sysconf('storage.local_http_protocol')}{php}sysconf('storage.local_http_protocol','follow');{/php}{/if}
                 {foreach ['follow'=>'FOLLOW','http'=>'HTTP','https'=>'HTTPS','path'=>'PATH','auto'=>'AUTO'] as $protocol=>$remark}
                 <label class="think-radio">
                     {if sysconf('storage.local_http_protocol') eq $protocol}
diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php
index ea343c450..19e6c5f2a 100644
--- a/app/index/controller/Index.php
+++ b/app/index/controller/Index.php
@@ -3,13 +3,15 @@
 // +----------------------------------------------------------------------
 // | Static Plugin for ThinkAdmin
 // +----------------------------------------------------------------------
-// | 版权所有 2014~2023 Anyon<zoujingli@qq.com>
+// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
 // +----------------------------------------------------------------------
 // | 官方网站: https://thinkadmin.top
 // +----------------------------------------------------------------------
-// | 免费声明 ( https://thinkadmin.top/disclaimer )
+// | 开源协议 ( https://mit-license.org )
+// | 免责声明 ( https://thinkadmin.top/disclaimer )
 // +----------------------------------------------------------------------
 // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static
+// | github 代码仓库：https://github.com/zoujingli/think-plugs-static
 // +----------------------------------------------------------------------
 
 namespace app\index\controller;
diff --git a/public/static/plugs/admin/validate.js b/public/static/plugs/admin/validate.js
index 44e7618b8..093fccfb9 100644
--- a/public/static/plugs/admin/validate.js
+++ b/public/static/plugs/admin/validate.js
@@ -71,16 +71,18 @@ define(function () {
             return this.insertError($(el).removeClass('validate-error')).removeClass('layui-anim-fadein').css({width: '30px'}).html('');
         };
         this.insertError = function (el) {
-            if ($(el).data('input-info')) return $(el).data('input-info');
+            if ($(el).data('input-vali-tags')) return $(el).data('input-vali-tags');
             var $html = $('<span class="absolute block layui-anim text-center font-s12 notselect" style="color:#A44;z-index:2"></span>');
             var $next = $(el).nextAll('.input-right-icon'), right = ($next ? $next.width() + parseFloat($next.css('right') || '0') : 0) + 10;
             var style = {top: $(el).position().top + 'px', right: right + 'px', lineHeight: el.nodeName === 'TEXTAREA' ? '32px' : $(el).css('height')};
-            $(el).data('input-info', $html.css(style).insertAfter(el));
+            $(el).data('input-vali-tags', $html.css(style).insertAfter(el));
             return $html;
         };
         /*! 预埋异常标签*/
-        this.form.find(this.tags).each(function () {
-            that.needCheck(this) && that.hideError(this, '');
+        this.form.find(this.tags).each(function (i, el) {
+            that.needCheck(this) && setTimeout(function () {
+                that.hideError(el, '');
+            }, 500);
         });
         /*! 表单元素验证 */
         this.form.attr({onsubmit: 'return false', novalidate: 'novalidate', autocomplete: 'off'}).on('keydown', this.tags, function () {