From 0df129edd9acf37b90bb7756c7893cf8ed7974f9 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 18 Nov 2019 19:37:10 +0800
Subject: [PATCH] ComposerUpdate

---
 app/admin/controller/Auth.php                 |  4 +-
 app/admin/controller/Config.php               |  9 ++--
 app/admin/controller/Index.php                |  8 ++--
 app/admin/controller/Login.php                |  8 ++--
 app/admin/controller/Menu.php                 |  2 +-
 app/admin/controller/Queue.php                |  2 +-
 app/admin/controller/User.php                 |  3 --
 app/admin/controller/api/Update.php           |  4 +-
 app/admin/controller/api/Upload.php           |  2 +-
 app/admin/sys.php                             |  2 +-
 composer.lock                                 |  8 ++--
 public/static/plugs/jquery/uploader.js        |  2 +-
 vendor/autoload.php                           |  2 +-
 vendor/composer/autoload_real.php             | 14 +++---
 vendor/composer/autoload_static.php           |  8 ++--
 vendor/composer/installed.json                |  8 ++--
 vendor/services.php                           |  2 +-
 .../think-library/src/Controller.php          | 19 ++++----
 vendor/zoujingli/think-library/src/Helper.php |  8 ++--
 .../zoujingli/think-library/src/Library.php   |  6 +--
 .../zoujingli/think-library/src/Service.php   | 16 +++----
 .../zoujingli/think-library/src/Storage.php   | 43 +++++++++----------
 .../think-library/src/command/Install.php     |  2 +-
 .../think-library/src/helper/QueryHelper.php  |  2 +-
 .../think-library/src/helper/TokenHelper.php  |  2 +-
 .../think-library/src/queue/QueryQueue.php    |  2 +-
 .../think-library/src/queue/StartQueue.php    |  2 +-
 .../think-library/src/queue/StateQueue.php    |  2 +-
 .../think-library/src/queue/StopQueue.php     |  2 +-
 .../think-library/src/queue/WorkQueue.php     |  3 +-
 .../think-library/src/service/AuthService.php |  4 +-
 .../src/service/CaptchaService.php            |  3 +-
 .../src/service/InstallService.php            |  2 +-
 .../think-library/src/service/MenuService.php |  6 +--
 34 files changed, 103 insertions(+), 109 deletions(-)

diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php
index a5d675785..f9b95acaa 100644
--- a/app/admin/controller/Auth.php
+++ b/app/admin/controller/Auth.php
@@ -98,7 +98,7 @@ class Auth extends Controller
         $action = strtolower(input('action', ''));
         if ($action === 'get') {
             $checkeds = $this->app->db->name('SystemAuthNode')->where($map)->column('node');
-            $this->success('获取权限节点成功！', AuthService::instance($this->app)->getTree($checkeds));
+            $this->success('获取权限节点成功！', AuthService::instance()->getTree($checkeds));
         } elseif ($action === 'save') {
             list($post, $data) = [$this->request->post(), []];
             foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) {
@@ -106,7 +106,7 @@ class Auth extends Controller
             }
             $this->app->db->name('SystemAuthNode')->where($map)->delete();
             $this->app->db->name('SystemAuthNode')->insertAll($data);
-            AuthService::instance($this->app)->apply(true);
+            AuthService::instance()->apply(true);
             $this->success('权限授权更新成功！', 'javascript:history.back()');
         } else {
             $this->title = '权限配置节点';
diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php
index 27a7ab6d0..5666b7730 100644
--- a/app/admin/controller/Config.php
+++ b/app/admin/controller/Config.php
@@ -54,11 +54,12 @@ class Config extends Controller
         if ($this->request->isGet()) {
             $this->title = '修改系统参数';
             $this->fetch();
+        } else {
+            foreach ($this->request->post() as $name => $value) {
+                sysconf($name, $value);
+            }
+            $this->success('修改系统参数成功！');
         }
-        foreach ($this->request->post() as $key => $value) {
-            sysconf($key, $value);
-        }
-        $this->success('修改系统参数成功！');
     }
 
     /**
diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index 90887a8b3..1e8f02584 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -38,9 +38,9 @@ class Index extends Controller
     public function index()
     {
         $this->title = '系统管理后台';
-        AuthService::instance($this->app)->apply(true);
-        $this->menus = MenuService::instance($this->app)->getTree();
-        if (empty($this->menus) && !AuthService::instance($this->app)->isLogin()) {
+        AuthService::instance()->apply(true);
+        $this->menus = MenuService::instance()->getTree();
+        if (empty($this->menus) && !AuthService::instance()->isLogin()) {
             $this->redirect(url('@admin/login'));
         } else {
             $this->fetch();
@@ -107,7 +107,7 @@ class Index extends Controller
             if (md5($data['oldpassword']) !== $user['password']) {
                 $this->error('旧密码验证失败，请重新输入！');
             }
-            if (DataExtend::save('SystemUser', ['id' => $user['id'], 'password' => md5($data['password'])])) {
+            if (data_save('SystemUser', ['id' => $user['id'], 'password' => md5($data['password'])])) {
                 $this->success('密码修改成功，下次请使用新密码登录！', '');
             } else {
                 $this->error('密码修改失败，请稍候再试！');
diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php
index bfb4e4b9c..84ede00d5 100644
--- a/app/admin/controller/Login.php
+++ b/app/admin/controller/Login.php
@@ -35,21 +35,21 @@ class Login extends Controller
     public function index()
     {
         if ($this->app->request->isGet()) {
-            if (AuthService::instance($this->app)->isLogin()) {
+            if (AuthService::instance()->isLogin()) {
                 $this->redirect(url('@admin')->suffix(false)->build());
             } else {
                 $this->title = '系统登录';
                 $this->domain = $this->app->request->host(true);
                 $this->devmode = in_array($this->domain, ['127.0.0.1', 'localhost']);
                 $this->devmode = $this->devmode ?: is_numeric(stripos($this->domain, 'thinkadmin.top'));
-                $this->captcha = CaptchaService::instance($this->app);
+                $this->captcha = CaptchaService::instance();
                 $this->fetch();
             }
         } elseif ($this->app->request->isPost()) {
             $data = ['username' => input('username'), 'password' => input('password')];
             if (empty($data['username'])) $this->error('登录账号不能为空!');
             if (empty($data['password'])) $this->error('登录密码不能为空!');
-            if (!CaptchaService::instance($this->app)->check(input('verify'), input('uniqid'))) {
+            if (!CaptchaService::instance()->check(input('verify'), input('uniqid'))) {
                 $this->error('图形验证码验证失败，请重新输入!');
             }
             // 用户信息验证
@@ -80,7 +80,7 @@ class Login extends Controller
      */
     public function captcha()
     {
-        $image = CaptchaService::instance($this->app);
+        $image = CaptchaService::instance();
         $this->success('生成验证码成功', [
             'image'  => $image->getData(),
             'uniqid' => $image->getUniqid(),
diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php
index 8fc92dd4b..4258a78e2 100644
--- a/app/admin/controller/Menu.php
+++ b/app/admin/controller/Menu.php
@@ -111,7 +111,7 @@ class Menu extends Controller
                 $vo['pid'] = $this->request->get('pid', '0');
             }
             // 读取系统功能节点
-            $this->nodes = MenuService::instance($this->app)->getList();
+            $this->nodes = MenuService::instance()->getList();
         }
     }
 
diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index bba9d8880..56a211f3a 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -44,8 +44,8 @@ class Queue extends Controller
     {
         if ($this->app->session->get('user.username') === 'admin') {
             try {
+                $this->command = ProcessService::instance()->think('xtask:start');
                 $this->message = $this->app->console->call('xtask:state')->fetch();
-                $this->command = ProcessService::instance($this->app)->think('xtask:start');
             } catch (\Exception $exception) {
                 $this->message = $exception->getMessage();
             }
diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index c3c54af3e..fd006f457 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -17,7 +17,6 @@ namespace app\admin\controller;
 
 use think\admin\Controller;
 use think\admin\extend\DataExtend;
-use think\admin\service\AuthService;
 
 /**
  * 系统用户管理
@@ -110,8 +109,6 @@ class User extends Controller
     protected function _form_filter(&$data)
     {
         if ($this->request->isPost()) {
-            // 刷新系统授权
-            AuthService::instance($this->app)->apply();
             // 用户权限处理
             $data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : '';
             // 用户账号重复检查
diff --git a/app/admin/controller/api/Update.php b/app/admin/controller/api/Update.php
index 8703b5f86..11111c0ed 100644
--- a/app/admin/controller/api/Update.php
+++ b/app/admin/controller/api/Update.php
@@ -32,11 +32,11 @@ class Update extends Controller
     {
         $this->rules = unserialize($this->request->post('rules', 'a:0:{}', ''));
         $this->ignore = unserialize($this->request->post('ignore', 'a:0:{}', ''));
-        $this->success('获取文件列表成功！', InstallService::instance($this->app)->getList($this->rules, $this->ignore));
+        $this->success('获取文件列表成功！', InstallService::instance()->getList($this->rules, $this->ignore));
     }
 
     /**
-     * 读取线上文件数据
+     * 读取文件内容
      */
     public function get()
     {
diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php
index cd4c3143a..2112db8fe 100644
--- a/app/admin/controller/api/Upload.php
+++ b/app/admin/controller/api/Upload.php
@@ -41,7 +41,7 @@ class Upload extends Controller
         $exts = array_intersect($diff1, $diff2);
         $this->success('获取文件上传参数', [
             'type' => $this->getType(), 'data' => $this->getData(),
-            'exts' => join('|', $exts), 'mine' => Storage::mime($exts),
+            'exts' => join('|', $exts), 'mime' => Storage::mime($exts),
         ]);
     }
 
diff --git a/app/admin/sys.php b/app/admin/sys.php
index 3da9f72f6..58046bd11 100644
--- a/app/admin/sys.php
+++ b/app/admin/sys.php
@@ -45,7 +45,7 @@ if (!function_exists('sysoplog')) {
     {
         $app = app();
         return $app->db->name('SystemOplog')->insert([
-            'node'     => \think\admin\service\NodeService::instance($app)->getCurrent(),
+            'node'     => \think\admin\service\NodeService::instance()->getCurrent(),
             'geoip'    => $app->request->isCli() ? '127.0.0.1' : $app->request->ip(),
             'action'   => $action, 'content' => $content,
             'username' => $app->request->isCli() ? 'cli' : $app->session->get('user.username', ''),
diff --git a/composer.lock b/composer.lock
index e552acab2..e9e7452a5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -783,12 +783,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd"
+                "reference": "fedc488cd0d8c8799b8e5620945c0d739a58cbd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c05c1ddf0a710dee48791bb7989b1bb3a79a20cd",
-                "reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/fedc488cd0d8c8799b8e5620945c0d739a58cbd5",
+                "reference": "fedc488cd0d8c8799b8e5620945c0d739a58cbd5",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -832,7 +832,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2019-11-13T10:54:48+00:00"
+            "time": "2019-11-18T10:46:44+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/public/static/plugs/jquery/uploader.js b/public/static/plugs/jquery/uploader.js
index 1c6ff6b24..44cd21e39 100644
--- a/public/static/plugs/jquery/uploader.js
+++ b/public/static/plugs/jquery/uploader.js
@@ -5,7 +5,7 @@ define(function () {
 
         // 检查可以上传的文件后缀
         $.form.load('?s=admin/api.upload/check', {exts: exts, uptype: uptype}, 'post', function (ret, options) {
-            options = {url: ret.data.data.url, exts: ret.data.exts, acceptMime: ret.data.mine, data: ret.data.data};
+            options = {url: ret.data.data.url, exts: ret.data.exts, acceptMime: ret.data.mime, data: ret.data.data};
             if (exts.indexOf('*') > -1) delete options.exts, delete options.acceptMime;
             return renderUploader(options), false;
         }, false, false, 0);
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 60eae2aa1..3ec7d209b 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b::getLoader();
+return ComposerAutoloaderInit5a743c9cd506240941dde8cfe27e723d::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 7c89e0d49..628270eb6 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b
+class ComposerAutoloaderInit5a743c9cd506240941dde8cfe27e723d
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit5a743c9cd506240941dde8cfe27e723d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit5a743c9cd506240941dde8cfe27e723d', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit0ebda76f49a312d0931869f268c1812b::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire0ebda76f49a312d0931869f268c1812b($fileIdentifier, $file);
+            composerRequire5a743c9cd506240941dde8cfe27e723d($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire0ebda76f49a312d0931869f268c1812b($fileIdentifier, $file)
+function composerRequire5a743c9cd506240941dde8cfe27e723d($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 62f2df924..050ed09c9 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit0ebda76f49a312d0931869f268c1812b
+class ComposerStaticInit5a743c9cd506240941dde8cfe27e723d
 {
     public static $files = array (
         '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@@ -470,9 +470,9 @@ class ComposerStaticInit0ebda76f49a312d0931869f268c1812b
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 77ac83dfe..192e5f702 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -805,12 +805,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd"
+            "reference": "fedc488cd0d8c8799b8e5620945c0d739a58cbd5"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c05c1ddf0a710dee48791bb7989b1bb3a79a20cd",
-            "reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/fedc488cd0d8c8799b8e5620945c0d739a58cbd5",
+            "reference": "fedc488cd0d8c8799b8e5620945c0d739a58cbd5",
             "shasum": "",
             "mirrors": [
                 {
@@ -826,7 +826,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2019-11-13T10:54:48+00:00",
+        "time": "2019-11-18T10:46:44+00:00",
         "type": "library",
         "extra": {
             "think": {
diff --git a/vendor/services.php b/vendor/services.php
index af267bf64..c118f9f0a 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2019-11-14 15:35:17
+// This file is automatically generated at:2019-11-18 19:31:02
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',
diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php
index 74f2ad216..afb461daf 100644
--- a/vendor/zoujingli/think-library/src/Controller.php
+++ b/vendor/zoujingli/think-library/src/Controller.php
@@ -21,6 +21,7 @@ use think\admin\helper\PageHelper;
 use think\admin\helper\QueryHelper;
 use think\admin\helper\SaveHelper;
 use think\admin\helper\TokenHelper;
+use think\admin\service\NodeService;
 use think\App;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -69,6 +70,8 @@ class Controller extends \stdClass
     {
         $this->app = $app;
         $this->request = $app->request;
+        $this->app->bind('think\admin\Controller', $this);
+        TokenHelper::instance();
         if (in_array($this->app->request->action(), get_class_methods(__CLASS__))) {
             $this->error('Access without permission.');
         }
@@ -104,7 +107,7 @@ class Controller extends \stdClass
     public function success($info, $data = [], $code = 1)
     {
         if ($this->csrf_state) {
-            TokenHelper::instance($this, $this->app)->clear();
+            TokenHelper::instance()->clear();
         }
         throw new HttpResponseException(json([
             'code' => $code, 'info' => $info, 'data' => $data,
@@ -131,7 +134,7 @@ class Controller extends \stdClass
     {
         foreach ($this as $name => $value) $vars[$name] = $value;
         if ($this->csrf_state) {
-            TokenHelper::instance($this, $this->app)->fetchTemplate($tpl, $vars, $node);
+            TokenHelper::instance()->fetchTemplate($tpl, $vars, $node);
         } else {
             throw new HttpResponseException(view($tpl, $vars));
         }
@@ -182,7 +185,7 @@ class Controller extends \stdClass
      */
     protected function _query($dbQuery)
     {
-        return QueryHelper::instance($this, $this->app)->init($dbQuery);
+        return QueryHelper::instance()->init($dbQuery);
     }
 
     /**
@@ -199,7 +202,7 @@ class Controller extends \stdClass
      */
     protected function _page($dbQuery, $page = true, $display = true, $total = false, $limit = 0)
     {
-        return PageHelper::instance($this, $this->app)->init($dbQuery, $page, $display, $total, $limit);
+        return PageHelper::instance()->init($dbQuery, $page, $display, $total, $limit);
     }
 
     /**
@@ -216,7 +219,7 @@ class Controller extends \stdClass
      */
     protected function _form($dbQuery, $template = '', $field = '', $where = [], $data = [])
     {
-        return FormHelper::instance($this, $this->app)->init($dbQuery, $template, $field, $where, $data);
+        return FormHelper::instance()->init($dbQuery, $template, $field, $where, $data);
     }
 
     /**
@@ -230,7 +233,7 @@ class Controller extends \stdClass
      */
     protected function _save($dbQuery, $data = [], $field = '', $where = [])
     {
-        return SaveHelper::instance($this, $this->app)->init($dbQuery, $data, $field, $where);
+        return SaveHelper::instance()->init($dbQuery, $data, $field, $where);
     }
 
     /**
@@ -243,7 +246,7 @@ class Controller extends \stdClass
      */
     protected function _delete($dbQuery, $field = '', $where = [])
     {
-        return DeleteHelper::instance($this, $this->app)->init($dbQuery, $field, $where);
+        return DeleteHelper::instance()->init($dbQuery, $field, $where);
     }
 
     /**
@@ -253,7 +256,7 @@ class Controller extends \stdClass
      */
     protected function _applyFormToken($return = false)
     {
-        return TokenHelper::instance($this, $this->app)->init($return);
+        return TokenHelper::instance()->init($return);
     }
 
 }
diff --git a/vendor/zoujingli/think-library/src/Helper.php b/vendor/zoujingli/think-library/src/Helper.php
index a1a11792e..7504981ac 100644
--- a/vendor/zoujingli/think-library/src/Helper.php
+++ b/vendor/zoujingli/think-library/src/Helper.php
@@ -16,6 +16,7 @@
 namespace think\admin;
 
 use think\App;
+use think\Container;
 use think\db\Query;
 
 /**
@@ -66,12 +67,11 @@ abstract class Helper
 
     /**
      * 实例对象反射
-     * @param Controller $controller
-     * @param App $app
+     * @param array $args 额外参数
      * @return static
      */
-    public static function instance(Controller $controller, App $app)
+    public static function instance($args = [])
     {
-        return new static($controller, $app);
+        return Container::getInstance()->invokeClass(static::class, $args);
     }
 }
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php
index f7450c60d..f1cb01d4b 100644
--- a/vendor/zoujingli/think-library/src/Library.php
+++ b/vendor/zoujingli/think-library/src/Library.php
@@ -46,7 +46,7 @@ class Library extends Service
     public function boot()
     {
         // 注册访问中间键
-        if (stripos('get,post,options', $this->app->request->method()) !== false) {
+        if (!$this->app->request->isCli()) {
             $this->app->middleware->add(function (Request $request, \Closure $next) {
                 $header = [];
                 if (($origin = $request->header('origin', '*')) !== '*') {
@@ -58,9 +58,9 @@ class Library extends Service
                 // 访问模式及访问权限检查
                 if ($request->isOptions()) {
                     return response()->code(204)->header($header);
-                } elseif (AuthService::instance($this->app)->check()) {
+                } elseif (AuthService::instance()->check()) {
                     return $next($request)->code(200)->header($header);
-                } elseif (AuthService::instance($this->app)->isLogin()) {
+                } elseif (AuthService::instance()->isLogin()) {
                     return json(['code' => 0, 'msg' => '抱歉，没有访问该操作的权限！'])->header($header);
                 } else {
                     return json(['code' => 0, 'msg' => '抱歉，需要登录获取访问权限！', 'url' => url('@admin/login')->build()])->header($header);
diff --git a/vendor/zoujingli/think-library/src/Service.php b/vendor/zoujingli/think-library/src/Service.php
index d5413bb2a..e7854337b 100644
--- a/vendor/zoujingli/think-library/src/Service.php
+++ b/vendor/zoujingli/think-library/src/Service.php
@@ -16,6 +16,7 @@
 namespace think\admin;
 
 use think\App;
+use think\Container;
 
 /**
  * 自定义服务接口
@@ -42,29 +43,24 @@ abstract class Service
      */
     public function __construct(App $app)
     {
+
         $this->app = $app;
-        $this->init();
+        $this->initialize();
     }
 
     /**
      * 服务初始化
      */
-    protected function init()
+    protected function initialize()
     {
     }
 
     /**
      * 静态实例对象
-     * @param App $app
      * @return static
      */
-    public static function instance(App $app = null)
+    public static function instance()
     {
-        if (is_null($app)) $app = app();
-        $key = md5(get_called_class());
-        if (!isset(self::$cache[$key])) {
-            self::$cache[$key] = new static($app);
-        }
-        return self::$cache[$key];
+        return Container::getInstance()->make(static::class);
     }
 }
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/Storage.php b/vendor/zoujingli/think-library/src/Storage.php
index 349253b10..b42b60533 100644
--- a/vendor/zoujingli/think-library/src/Storage.php
+++ b/vendor/zoujingli/think-library/src/Storage.php
@@ -18,6 +18,8 @@ namespace think\admin;
 use think\admin\storage\LocalStorage;
 use think\admin\storage\QiniuStorage;
 use think\App;
+use think\Container;
+use think\Exception;
 
 /**
  * 文件存储引擎管理
@@ -32,7 +34,7 @@ use think\App;
  * @method string set($name, $content, $safe = false) static 文件储存
  * @method string upload() static 上传目录地址
  */
-class Storage
+abstract class Storage
 {
     /**
      * 应用实例
@@ -46,18 +48,13 @@ class Storage
      */
     protected $prefix;
 
-    /**
-     * 存储对象缓存
-     * @var array
-     */
-    protected static $object = [];
-
     /**
      * Storage constructor.
+     * @param App $app
      */
-    public function __construct()
+    public function __construct(App $app)
     {
-        $this->app = app();
+        $this->app = $app;
         $this->initialize();
     }
 
@@ -69,41 +66,41 @@ class Storage
     }
 
     /**
-     * 静态访问
+     * 静态访问启用
      * @param string $method 方法名称
      * @param array $arguments 调用参数
      * @return mixed
-     * @throws \think\Exception
+     * @throws Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
     public static function __callStatic($method, $arguments)
     {
-        $class = self::instance();
-        if (method_exists($class, $method)) return call_user_func_array([$class, $method], $arguments);
-        throw new \think\Exception("method not exists: " . get_class($class) . "->{$method}()");
+        if (method_exists($class = self::instance(), $method)) {
+            return call_user_func_array([$class, $method], $arguments);
+        } else {
+            throw new Exception("method not exists: " . get_class($class) . "->{$method}()");
+        }
     }
 
     /**
      * 设置文件驱动名称
      * @param string $name 驱动名称
      * @return LocalStorage|QiniuStorage|static
-     * @throws \think\Exception
+     * @throws Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
     public static function instance($name = null)
     {
-        if (is_null($name)) $name = sysconf('storage.type');
-        if (isset(self::$object[$class = ucfirst(strtolower($name))])) {
-            return self::$object[$class];
+        $class = ucfirst(strtolower(is_null($name) ? sysconf('storage.type') : $name));
+        if (class_exists($object = "think\\admin\\storage\\{$class}Storage")) {
+            return Container::getInstance()->make($object);
+        } else {
+            throw new Exception("File driver [{$class}] does not exist.");
         }
-        if (class_exists($object = __NAMESPACE__ . "\\storage\\{$class}Storage")) {
-            return self::$object[$class] = new $object;
-        }
-        throw new \think\Exception("File driver [{$class}] does not exist.");
     }
 
     /**
@@ -133,7 +130,7 @@ class Storage
     {
         $mimes = self::mimes();
         foreach (is_string($exts) ? explode(',', $exts) : $exts as $e) {
-            $mime[] = isset($mimes[strtolower($e)]) ? $mimes[strtolower($e)] : 'application/octet-stream';
+            $mime[] = isset($mimes[strtolower($e)]) ? $mimes[strtolower($e)] : '';
         }
         return join(',', array_unique($mime));
     }
diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php
index b3e7f0047..e13b0768b 100644
--- a/vendor/zoujingli/think-library/src/command/Install.php
+++ b/vendor/zoujingli/think-library/src/command/Install.php
@@ -92,7 +92,7 @@ class Install extends Command
 
     protected function installFile()
     {
-        $service = InstallService::instance($this->app);
+        $service = InstallService::instance();
         $data = $service->grenerateDifference($this->rules, $this->ignore);
         if (empty($data)) $this->output->info('文件比对一致不需更新文件！');
         else foreach ($data as $file) {
diff --git a/vendor/zoujingli/think-library/src/helper/QueryHelper.php b/vendor/zoujingli/think-library/src/helper/QueryHelper.php
index 5f049783e..1621ed13e 100644
--- a/vendor/zoujingli/think-library/src/helper/QueryHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/QueryHelper.php
@@ -222,6 +222,6 @@ class QueryHelper extends Helper
      */
     public function page($isPage = true, $isDisplay = true, $total = false, $limit = 0)
     {
-        return PageHelper::instance($this->class, $this->app)->init($this->query, $isPage, $isDisplay, $total, $limit);
+        return PageHelper::instance()->init($this->query, $isPage, $isDisplay, $total, $limit);
     }
 }
diff --git a/vendor/zoujingli/think-library/src/helper/TokenHelper.php b/vendor/zoujingli/think-library/src/helper/TokenHelper.php
index b3545bb36..1bcf7622a 100644
--- a/vendor/zoujingli/think-library/src/helper/TokenHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/TokenHelper.php
@@ -35,7 +35,7 @@ class TokenHelper extends Helper
     public function init($return = false)
     {
         $this->class->csrf_state = true;
-        if ($this->app->request->isPost() && !TokenService::instance($this->app)->checkFormToken()) {
+        if ($this->app->request->isPost() && !TokenService::instance()->checkFormToken()) {
             if ($return) return false;
             $this->class->error($this->class->csrf_message);
         } else {
diff --git a/vendor/zoujingli/think-library/src/queue/QueryQueue.php b/vendor/zoujingli/think-library/src/queue/QueryQueue.php
index 0c6fc8129..6e94f3504 100644
--- a/vendor/zoujingli/think-library/src/queue/QueryQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/QueryQueue.php
@@ -42,7 +42,7 @@ class QueryQueue extends Command
      */
     protected function execute(Input $input, Output $output)
     {
-        $process = ProcessService::instance($this->app);
+        $process = ProcessService::instance();
         $result = $process->query($process->think("xtask:"));
         if (count($result) > 0) foreach ($result as $item) {
             $output->writeln("{$item['pid']}\t{$item['cmd']}");
diff --git a/vendor/zoujingli/think-library/src/queue/StartQueue.php b/vendor/zoujingli/think-library/src/queue/StartQueue.php
index 2e915f1e9..dcb04a737 100644
--- a/vendor/zoujingli/think-library/src/queue/StartQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/StartQueue.php
@@ -44,7 +44,7 @@ class StartQueue extends Command
     protected function execute(Input $input, Output $output)
     {
         $this->app->db->name('SystemQueue')->count();
-        $process = ProcessService::instance($this->app);
+        $process = ProcessService::instance();
         $command = $process->think("xtask:listen");
         if (count($result = $process->query($command)) > 0) {
             $output->info("异步任务监听主进程{$result['0']['pid']}已经启动！");
diff --git a/vendor/zoujingli/think-library/src/queue/StateQueue.php b/vendor/zoujingli/think-library/src/queue/StateQueue.php
index b54996061..496996c1f 100644
--- a/vendor/zoujingli/think-library/src/queue/StateQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/StateQueue.php
@@ -42,7 +42,7 @@ class StateQueue extends Command
      */
     protected function execute(Input $input, Output $output)
     {
-        $process = ProcessService::instance($this->app);
+        $process = ProcessService::instance();
         $command = $process->think('xtask:listen');
         if (count($result = $process->query($command)) > 0) {
             $output->info("异步任务监听主进程{$result[0]['pid']}正在运行...");
diff --git a/vendor/zoujingli/think-library/src/queue/StopQueue.php b/vendor/zoujingli/think-library/src/queue/StopQueue.php
index 9d2ff69f0..15301b14f 100644
--- a/vendor/zoujingli/think-library/src/queue/StopQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/StopQueue.php
@@ -43,7 +43,7 @@ class StopQueue extends Command
      */
     protected function execute(Input $input, Output $output)
     {
-        $process = ProcessService::instance($this->app);
+        $process = ProcessService::instance();
         $command = $process->think('xtask:');
         if (count($result = $process->query($command)) < 1) {
             $output->writeln("没有需要结束的任务进程哦！");
diff --git a/vendor/zoujingli/think-library/src/queue/WorkQueue.php b/vendor/zoujingli/think-library/src/queue/WorkQueue.php
index e1971d4f0..da7b22674 100644
--- a/vendor/zoujingli/think-library/src/queue/WorkQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/WorkQueue.php
@@ -21,6 +21,7 @@ use think\console\Command;
 use think\console\Input;
 use think\console\input\Argument;
 use think\console\Output;
+use think\Container;
 
 /**
  * 启动独立执行进程
@@ -66,7 +67,7 @@ class WorkQueue extends Command
             $queue = $this->app->db->name('SystemQueue')->where(['code' => $this->code, 'status' => '2'])->find();
             if (empty($queue)) throw new \think\Exception("执行任务{$this->code}的信息或状态异常！");;
             // 设置进程标题
-            if (($process = ProcessService::instance($this->app))->iswin()) {
+            if (($process = ProcessService::instance())->iswin()) {
                 $this->setProcessTitle("ThinkAdmin {$process->version()} 执行任务 - {$queue['title']}");
             }
             // 执行任务内容
diff --git a/vendor/zoujingli/think-library/src/service/AuthService.php b/vendor/zoujingli/think-library/src/service/AuthService.php
index d42c6dec3..03d222471 100644
--- a/vendor/zoujingli/think-library/src/service/AuthService.php
+++ b/vendor/zoujingli/think-library/src/service/AuthService.php
@@ -44,7 +44,7 @@ class AuthService extends Service
      */
     public function check($node = '')
     {
-        $service = NodeService::instance($this->app);
+        $service = NodeService::instance();
         if ($this->app->session->get('user.username') === 'admin') return true;
         list($real, $nodes) = [$service->fullnode($node), $service->getMethods()];
         if (!empty($nodes[$real]['isauth'])) {
@@ -63,7 +63,7 @@ class AuthService extends Service
     public function getTree($checkeds = [])
     {
         list($nodes, $pnodes) = [[], []];
-        $methods = array_reverse(NodeService::instance($this->app)->getMethods());
+        $methods = array_reverse(NodeService::instance()->getMethods());
         foreach ($methods as $node => $method) {
             $count = substr_count($node, '/');
             $pnode = substr($node, 0, strripos($node, '/'));
diff --git a/vendor/zoujingli/think-library/src/service/CaptchaService.php b/vendor/zoujingli/think-library/src/service/CaptchaService.php
index 61f576970..6a8811295 100644
--- a/vendor/zoujingli/think-library/src/service/CaptchaService.php
+++ b/vendor/zoujingli/think-library/src/service/CaptchaService.php
@@ -39,7 +39,7 @@ class CaptchaService extends Service
      * 服务初始化
      * @param array $config
      */
-    protected function init($config = [])
+    protected function initialize($config = [])
     {
         // 动态配置属性
         foreach ($config as $k => $v) if (isset($this->$k)) $this->$k = $v;
@@ -83,7 +83,6 @@ class CaptchaService extends Service
         return $this->uniqid;
     }
 
-
     /**
      * 检查验证码是否正确
      * @param string $code 需要验证的值
diff --git a/vendor/zoujingli/think-library/src/service/InstallService.php b/vendor/zoujingli/think-library/src/service/InstallService.php
index 3814694d5..b9d2803fc 100644
--- a/vendor/zoujingli/think-library/src/service/InstallService.php
+++ b/vendor/zoujingli/think-library/src/service/InstallService.php
@@ -58,7 +58,7 @@ class InstallService extends Service
     /**
      * 服务初始化
      */
-    protected function init()
+    protected function initialize()
     {
         // 应用框架版本
         $this->version = $this->app->config->get('app.thinkadmin_ver');
diff --git a/vendor/zoujingli/think-library/src/service/MenuService.php b/vendor/zoujingli/think-library/src/service/MenuService.php
index a0e888e4d..d4f8dfc2e 100644
--- a/vendor/zoujingli/think-library/src/service/MenuService.php
+++ b/vendor/zoujingli/think-library/src/service/MenuService.php
@@ -36,9 +36,9 @@ class MenuService extends Service
      * 服务初始化
      * @return $this
      */
-    protected function init()
+    protected function initialize()
     {
-        $this->nodeService = NodeService::instance($this->app);
+        $this->nodeService = NodeService::instance();
         return $this;
     }
 
@@ -67,7 +67,7 @@ class MenuService extends Service
      */
     public function getTree()
     {
-        $result = app()->db->name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select();
+        $result = $this->app->db->name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select();
         return $this->buildData(DataExtend::arr2tree($result->toArray()), $this->nodeService->getMethods());
     }