升级同步插件

app/admin/controller/Auth.php

@@ -115,7 +115,7 @@ class Auth extends Controller
      * 表单后置数据处理
      * @param array $data
      */
-    protected function _apply_form_filter(array &$data)
+    protected function _apply_form_filter(array $data)
     {
         if ($this->request->isGet()) {
             $this->title = "编辑【{$data['title']}】授权";

app/admin/controller/Base.php

@@ -70,7 +70,7 @@ class Base extends Controller
      * @param array $data
      * @throws \think\db\exception\DbException
      */
-    protected function _form_filter(array &$data)
+    protected function _form_filter(array $data)
     {
         if ($this->request->isGet()) {
             $this->types = SystemBase::types();

app/admin/controller/Config.php

@@ -61,9 +61,7 @@ class Config extends Controller
     /**
      * 修改系统参数
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\admin\Exception
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function system()
     {
@@ -100,9 +98,7 @@ class Config extends Controller
     /**
      * 修改文件存储
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\admin\Exception
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function storage()
     {

app/admin/controller/api/System.php

@@ -90,9 +90,7 @@ class System extends Controller
     /**
      * 修改富文本编辑器
      * @return void
-     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\admin\Exception
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function editor()
     {

app/admin/view/api/upload.js

@@ -145,6 +145,7 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) {
                         uploader.form.append('Content-Disposition', 'inline;filename=' + encodeURIComponent(file.name));
                     }
                     uploader.form.append('file', file, file.name), jQuery.ajax({
+                        xhrFields: {withCredentials: ret.data.uptype === 'local'},
                         url: uploader.url, data: uploader.form, type: 'post', xhr: function (xhr) {
                             xhr = new XMLHttpRequest();
                             return xhr.upload.addEventListener('progress', function (event) {

app/admin/view/config/index.html

@@ -64,7 +64,7 @@
     {if !sysconf('storage.link_type')}{php}sysconf('storage.link_type','none');{/php}{/if}
     {if !sysconf('storage.name_type')}{php}sysconf('storage.name_type','xmd5');{/php}{/if}
     {if !sysconf('storage.allow_exts')}{php}sysconf('storage.allow_exts','doc,gif,ico,jpg,mp3,mp4,p12,pem,png,rar,xls,xlsx');{/php}{/if}
-    {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}
     <div class="layui-card-body layui-clear">
         <div class="layui-btn-group shadow-mini nowrap">
             {foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储','upyun'=>'又拍云USS存储','alioss'=>'阿里云OSS存储','txcos'=>'腾讯云COS存储'] as $k => $v}{if sysconf('storage.type') eq $k}

app/index/controller/Index.php

@@ -17,11 +17,12 @@
 namespace app\index\controller;
 
 use think\admin\Controller;
+use think\admin\extend\ToolsExtend;
 
 class Index extends Controller
 {
     public function index()
     {
-        $this->redirect(sysuri('admin/login/index'));
+        ToolsExtend::removeEmptyDirectory(syspath('database'), true);
     }
 }

composer.json

@@ -30,6 +30,7 @@
     }
   },
   "config": {
+    "sort-packages": true,
     "allow-plugins": {
       "zoujingli/think-install": true
     }

public/static/plugs/admin/queue.js

@@ -14,26 +14,26 @@
 
 define(function () {
 
-    var doAjax = true, doReload = false;
     var template = '<div class="padding-30 padding-bottom-0" data-queue-load="{{d.code}}"><div class="layui-elip notselect nowrap" data-message-title><b class="color-desc">...</b></div><div class="margin-top-15 layui-progress layui-progress-big" lay-showPercent="yes"><div class="layui-progress-bar transition" lay-percent="0.00%"></div></div>' + '<div class="margin-top-15"><code class="layui-textarea layui-bg-black border-0" style="resize:none;overflow:hidden;height:190px"></code></div></div>';
 
     return Queue;
 
     function Queue(code, doScript, element) {
-        layer.open({
+        let queue = this;
+        (this.doAjax = true) && (this.doReload = false) || layer.open({
             type: 1, title: false, area: ['560px', '315px'], anim: 2, shadeClose: false, end: function () {
-                doAjax = doReload && doScript && $.layTable.reload(((element || {}).dataset || {}).tableId || true)
+                queue.doAjax = queue.doReload && doScript && $.layTable.reload(((element || {}).dataset || {}).tableId || true) && false;
             }, content: laytpl(template).render({code: code}), success: function ($elem) {
-                new Progress($elem, code, doScript);
+                new Progress($elem, code, queue, doScript);
             }
         });
     }
 
-    function Progress($elem, code, doScript) {
+    function Progress($elem, code, queue, doScript) {
         var that = this;
 
         this.$box = $elem.find('[data-queue-load=' + code + ']');
-        if (doAjax === false || this.$box.length < 1) return false;
+        if (queue.doAjax === false || this.$box.length < 1) return false;
 
         this.$code = this.$box.find('code');
         this.$title = this.$box.find('[data-message-title]');
@@ -58,7 +58,7 @@ define(function () {
                 }
                 that.$percent.addClass('layui-bg-blue').removeClass('layui-bg-green layui-bg-red');
             } else if (status === 3) {
-                doReload = true;
+                queue.doReload = true;
                 that.$title.html('<b class="color-green">' + message + '</b>').addClass('text-center');
                 that.$percent.addClass('layui-bg-green').removeClass('layui-bg-blue layui-bg-red');
             } else if (status === 4) {
@@ -69,7 +69,7 @@ define(function () {
 
         // 读取任务进度信息
         this.LoadProgress = function () {
-            if (doAjax === false || that.$box.length < 1) return false;
+            if (queue.doAjax === false || that.$box.length < 1) return false;
             $.form.load(tapiRoot + '/api.queue/progress', {code: code}, 'post', function (ret) {
                 if (ret.code) {
                     var lines = [];

public/static/theme/css/_custom.less

@@ -508,6 +508,11 @@ table[data-line='3'] + div tbody .layui-table-cell {
         text-overflow: ellipsis;
         text-decoration: none;
 
+        span:after {
+          content: '';
+          display: inline-block;
+        }
+
         &:after {
           top: -1px;
           left: 0;
@@ -951,10 +956,10 @@ input:not(.layui-hide,[type=hidden]) {
 
 .submit-button-loading {
   cursor: default;
+  overflow: hidden;
   position: relative;
   transform: scale(1);
   text-align: center;
-  overflow: hidden;
 
   &::before {
     top: 0;
@@ -966,7 +971,7 @@ input:not(.layui-hide,[type=hidden]) {
     content: '';
     display: block;
     position: absolute;
-    background: rgba(0, 0, 0, .3);
+    background: rgba(0, 0, 0, .1);
   }
 
   &::after {
@@ -1118,25 +1123,46 @@ input:not(.layui-hide,[type=hidden]) {
 
   .portal-block {
     &-icon {
-      top: 45%;
+      top: 25%;
-      right: 8%;
+      right: 30px;
-      font-size: 65px;
       position: absolute;
-      color: rgba(255, 255, 255, 0.4);
+      font-size: 65px;
+      color: rgba(255, 255, 255, 0.2);
     }
 
     &-item {
       color: #fff;
       padding: 15px 25px;
       position: relative;
-      line-height: 3em;
       box-shadow: @ShadowOuterMax;
+      line-height: 3em;
+      text-shadow: 1px 1px 2px rgba(50, 50, 50, 0.8);
       border-radius: @BoxBorderRadius;
+      #notSelect();
 
-      > div:nth-child(2) {
+      > div:nth-child(1), &-name {
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      > div:nth-child(2), &-numb {
+        display: inline;
         font-size: 46px;
         line-height: 46px;
       }
+
+      &-unit {
+        display: inline;
+        position: absolute;
+        font-size: 12px;
+        margin-top: 10px;
+        margin-left: 10px;
+      }
+
+      &-desc {
+        font-size: 13px;
+        line-height: 2em;
+      }
     }
   }
 }