From 2f68bd3df24fb76eb945a09f34163bafe3bb371e Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 1 Nov 2019 19:23:49 +0800 Subject: [PATCH] composerUpdate --- app/admin/controller/api/Update.php | 4 +-- composer.lock | 18 +++++------ vendor/autoload.php | 2 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_real.php | 14 ++++----- vendor/composer/autoload_static.php | 9 +++--- vendor/composer/installed.json | 20 ++++++------ .../log/Psr/Log/Test/LoggerInterfaceTest.php | 1 + vendor/psr/log/README.md | 6 ++++ vendor/services.php | 2 +- .../think-library/src/ThinkLibrary.php | 1 + .../think-library/src/extend/PlugsExtend.php | 8 +++++ .../think-library/src/plugs/AdminPlugs.php | 1 - .../think-library/src/plugs/StaticPlugs.php | 31 +++++++++++++++++++ 14 files changed, 83 insertions(+), 35 deletions(-) create mode 100644 vendor/zoujingli/think-library/src/plugs/StaticPlugs.php diff --git a/app/admin/controller/api/Update.php b/app/admin/controller/api/Update.php index cccf0bde3..2f30f86d8 100644 --- a/app/admin/controller/api/Update.php +++ b/app/admin/controller/api/Update.php @@ -40,9 +40,9 @@ class Update extends Controller * 读取线上文件数据 * @param string $encode */ - public function get($encode) + public function get() { - $this->file = $this->app->getRootPath() . decode($encode); + $this->file = $this->app->getRootPath() . decode(input('encode', '0')); file_exists($this->file) ? $this->success('读取文件成功！', [ 'format' => 'base64', 'content' => base64_encode(file_get_contents($this->file)), ]) : $this->error('获取文件内容失败！'); diff --git a/composer.lock b/composer.lock index 341c498ed..1d3e15f73 100644 --- a/composer.lock +++ b/composer.lock @@ -325,16 +325,16 @@ }, { "name": "psr/log", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", - "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "", "mirrors": [ { @@ -374,7 +374,7 @@ "psr", "psr-3" ], - "time": "2019-10-25T08:06:51+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "psr/simple-cache", @@ -783,12 +783,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f" + "reference": "73b09c104d9800bbf399742af44c6b5090452e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f", - "reference": "0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/73b09c104d9800bbf399742af44c6b5090452e26", + "reference": "73b09c104d9800bbf399742af44c6b5090452e26", "shasum": "", "mirrors": [ { @@ -832,7 +832,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-11-01T10:39:55+00:00" + "time": "2019-11-01T11:09:48+00:00" } ], "packages-dev": [], diff --git a/vendor/autoload.php b/vendor/autoload.php index 43f4fbcd3..d27a37733 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c::getLoader(); +return ComposerAutoloaderInitffc2be5fa4eeca372758d66dc6beeaae::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 935306fc6..9b3e760f4 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -162,6 +162,7 @@ return array( 'think\\admin\\helper\\TokenHelper' => $vendorDir . '/zoujingli/think-library/src/helper/TokenHelper.php', 'think\\admin\\plugs\\AdminPlugs' => $vendorDir . '/zoujingli/think-library/src/plugs/AdminPlugs.php', 'think\\admin\\plugs\\Plugs' => $vendorDir . '/zoujingli/think-library/src/plugs/Plugs.php', + 'think\\admin\\plugs\\StaticPlugs' => $vendorDir . '/zoujingli/think-library/src/plugs/StaticPlugs.php', 'think\\admin\\queue\\ListenQueue' => $vendorDir . '/zoujingli/think-library/src/queue/ListenQueue.php', 'think\\admin\\queue\\QueryQueue' => $vendorDir . '/zoujingli/think-library/src/queue/QueryQueue.php', 'think\\admin\\queue\\StartQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StartQueue.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index b5f959d93..32bb6156f 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c +class ComposerAutoloaderInitffc2be5fa4eeca372758d66dc6beeaae { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitffc2be5fa4eeca372758d66dc6beeaae', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitffc2be5fa4eeca372758d66dc6beeaae', '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\ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirec7690ef5c13b95d953f61a4e48e6692c($fileIdentifier, $file); + composerRequireffc2be5fa4eeca372758d66dc6beeaae($fileIdentifier, $file); } return $loader; } } -function composerRequirec7690ef5c13b95d953f61a4e48e6692c($fileIdentifier, $file) +function composerRequireffc2be5fa4eeca372758d66dc6beeaae($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 8962fe906..31df93238 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c +class ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -253,6 +253,7 @@ class ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c 'think\\admin\\helper\\TokenHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/TokenHelper.php', 'think\\admin\\plugs\\AdminPlugs' => __DIR__ . '/..' . '/zoujingli/think-library/src/plugs/AdminPlugs.php', 'think\\admin\\plugs\\Plugs' => __DIR__ . '/..' . '/zoujingli/think-library/src/plugs/Plugs.php', + 'think\\admin\\plugs\\StaticPlugs' => __DIR__ . '/..' . '/zoujingli/think-library/src/plugs/StaticPlugs.php', 'think\\admin\\queue\\ListenQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/ListenQueue.php', 'think\\admin\\queue\\QueryQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/QueryQueue.php', 'think\\admin\\queue\\StartQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StartQueue.php', @@ -469,9 +470,9 @@ class ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 0b643c152..0cdcdd612 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -328,17 +328,17 @@ }, { "name": "psr/log", - "version": "1.1.1", - "version_normalized": "1.1.1.0", + "version": "1.1.2", + "version_normalized": "1.1.2.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", - "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "", "mirrors": [ { @@ -350,7 +350,7 @@ "require": { "php": ">=5.3.0" }, - "time": "2019-10-25T08:06:51+00:00", + "time": "2019-11-01T11:05:21+00:00", "type": "library", "extra": { "branch-alias": { @@ -805,12 +805,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f" + "reference": "73b09c104d9800bbf399742af44c6b5090452e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f", - "reference": "0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/73b09c104d9800bbf399742af44c6b5090452e26", + "reference": "73b09c104d9800bbf399742af44c6b5090452e26", "shasum": "", "mirrors": [ { @@ -826,7 +826,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-11-01T10:39:55+00:00", + "time": "2019-11-01T11:09:48+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php index 8e445ee4b..9ecb6c4b0 100644 --- a/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php +++ b/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php @@ -141,5 +141,6 @@ class DummyTest { public function __toString() { + return 'DummyTest'; } } diff --git a/vendor/psr/log/README.md b/vendor/psr/log/README.md index 5571a25e8..a9f20c437 100644 --- a/vendor/psr/log/README.md +++ b/vendor/psr/log/README.md @@ -38,6 +38,12 @@ class Foo if ($this->logger) { $this->logger->info('Doing work'); } + + try { + $this->doSomethingElse(); + } catch (Exception $exception) { + $this->logger->error('Oh no!', array('exception' => $exception)); + } // do something useful } diff --git a/vendor/services.php b/vendor/services.php index d569549c0..f26ad8560 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/ThinkLibrary.php b/vendor/zoujingli/think-library/src/ThinkLibrary.php index 68adcd255..9c5d483e5 100644 --- a/vendor/zoujingli/think-library/src/ThinkLibrary.php +++ b/vendor/zoujingli/think-library/src/ThinkLibrary.php @@ -67,6 +67,7 @@ class ThinkLibrary extends Service 'think\admin\queue\QueryQueue', 'think\admin\queue\ListenQueue', 'think\admin\plugs\AdminPlugs', + 'think\admin\plugs\StaticPlugs', ]); } diff --git a/vendor/zoujingli/think-library/src/extend/PlugsExtend.php b/vendor/zoujingli/think-library/src/extend/PlugsExtend.php index d48fe9e46..7bbc8922b 100644 --- a/vendor/zoujingli/think-library/src/extend/PlugsExtend.php +++ b/vendor/zoujingli/think-library/src/extend/PlugsExtend.php @@ -16,6 +16,7 @@ namespace think\admin\extend; use think\App; +use think\console\Output; /** * Class PlugsExtend @@ -47,6 +48,12 @@ class PlugsExtend */ protected $version; + /** + * 输出对象 + * @var Output + */ + protected $output; + /** * 文件规则 * @var array @@ -85,6 +92,7 @@ class PlugsExtend public function __construct(App $app) { $this->app = $app; + $this->output = new Output(); // 应用框架版本号 $this->version = $this->app->config->get('app.thinkadmin_ver'); if (empty($this->version)) $this->version = 'v4'; diff --git a/vendor/zoujingli/think-library/src/plugs/AdminPlugs.php b/vendor/zoujingli/think-library/src/plugs/AdminPlugs.php index b1c0301e0..2a7b3a2c0 100644 --- a/vendor/zoujingli/think-library/src/plugs/AdminPlugs.php +++ b/vendor/zoujingli/think-library/src/plugs/AdminPlugs.php @@ -29,7 +29,6 @@ class AdminPlugs extends Plugs protected function configure() { - $this->rules = ['application/admin/', 'think']; $this->setName('xplugs:admin')->setDescription('[同步]覆盖本地Admin模块代码'); } diff --git a/vendor/zoujingli/think-library/src/plugs/StaticPlugs.php b/vendor/zoujingli/think-library/src/plugs/StaticPlugs.php new file mode 100644 index 000000000..df6c292c5 --- /dev/null +++ b/vendor/zoujingli/think-library/src/plugs/StaticPlugs.php @@ -0,0 +1,31 @@ +setName('xplugs:static')->setDescription('[同步]覆盖本地Static插件代码'); + } +} \ No newline at end of file