From 69efe07359c706aecd85a1dce76363be1d87c98f Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 1 Nov 2019 18:59:18 +0800 Subject: [PATCH] ComposerUpdate --- app/admin/controller/api/Plugs.php | 7 ++++--- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/services.php | 2 +- .../think-library/src/plugs/AdminPlugs.php | 7 +++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php index 431e02e11..8541fb6f0 100644 --- a/app/admin/controller/api/Plugs.php +++ b/app/admin/controller/api/Plugs.php @@ -105,7 +105,8 @@ class Plugs extends Controller $file = Storage::instance('qiniu'); return ['url' => $file->upload(), 'token' => $file->buildUploadToken(), 'uptype' => $this->getUploadType()]; } else { - return ['url' => '?s=admin/api.plugs/upload', 'token' => uniqid('local_upload_'), 'uptype' => $this->getUploadType()]; + $file = Storage::instance('local'); + return ['url' => $file->upload(), 'token' => uniqid('local_upload_'), 'uptype' => $this->getUploadType()]; } } @@ -119,9 +120,9 @@ class Plugs extends Controller private function getUploadType() { $this->uptype = input('uptype'); - if (!in_array($this->uptype, ['local', 'oss', 'qiniu'])) { + if (!in_array($this->uptype, ['local', 'qiniu'])) { $this->uptype = sysconf('storage.type'); - }2 + } return $this->uptype; } diff --git a/vendor/autoload.php b/vendor/autoload.php index f9005ba94..53c729d0f 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit0b662654c649e6d1b22f688c84d1a1fb::getLoader(); +return ComposerAutoloaderInit04cda99c86e0d1e594810d779a40708c::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 25facc87b..d5b53cec4 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit0b662654c649e6d1b22f688c84d1a1fb +class ComposerAutoloaderInit04cda99c86e0d1e594810d779a40708c { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit0b662654c649e6d1b22f688c84d1a1fb return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit0b662654c649e6d1b22f688c84d1a1fb', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit04cda99c86e0d1e594810d779a40708c', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit0b662654c649e6d1b22f688c84d1a1fb', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit04cda99c86e0d1e594810d779a40708c', '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\ComposerStaticInit0b662654c649e6d1b22f688c84d1a1fb::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit04cda99c86e0d1e594810d779a40708c::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit0b662654c649e6d1b22f688c84d1a1fb $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit0b662654c649e6d1b22f688c84d1a1fb::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit04cda99c86e0d1e594810d779a40708c::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire0b662654c649e6d1b22f688c84d1a1fb($fileIdentifier, $file); + composerRequire04cda99c86e0d1e594810d779a40708c($fileIdentifier, $file); } return $loader; } } -function composerRequire0b662654c649e6d1b22f688c84d1a1fb($fileIdentifier, $file) +function composerRequire04cda99c86e0d1e594810d779a40708c($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 22389b6ba..76c54557c 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit0b662654c649e6d1b22f688c84d1a1fb +class ComposerStaticInit04cda99c86e0d1e594810d779a40708c { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -469,9 +469,9 @@ class ComposerStaticInit0b662654c649e6d1b22f688c84d1a1fb public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit0b662654c649e6d1b22f688c84d1a1fb::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit0b662654c649e6d1b22f688c84d1a1fb::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit0b662654c649e6d1b22f688c84d1a1fb::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit04cda99c86e0d1e594810d779a40708c::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit04cda99c86e0d1e594810d779a40708c::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit04cda99c86e0d1e594810d779a40708c::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/services.php b/vendor/services.php index 38d931d32..5afd00890 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/plugs/AdminPlugs.php b/vendor/zoujingli/think-library/src/plugs/AdminPlugs.php index 849f3aa27..b1c0301e0 100644 --- a/vendor/zoujingli/think-library/src/plugs/AdminPlugs.php +++ b/vendor/zoujingli/think-library/src/plugs/AdminPlugs.php @@ -16,22 +16,21 @@ namespace think\admin\plugs; /** - * 后台Admin模块更新 * Class AdminPlugs * @package think\admin\plugs */ class AdminPlugs extends Plugs { /** - * 查询规则 + * 文件规则 * @var array */ protected $rules = ['think', 'app/admin']; protected function configure() { - $this->setName('xplugs:admin'); - $this->setDescription('[同步]覆盖本地Admin模块代码'); + $this->rules = ['application/admin/', 'think']; + $this->setName('xplugs:admin')->setDescription('[同步]覆盖本地Admin模块代码'); } } \ No newline at end of file