From 43af29ec1cec64529d0221dff120371cecdec040 Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 30 Apr 2020 14:42:21 +0800 Subject: [PATCH] ComposerUpdate --- app/admin/controller/api/Plugs.php | 34 +++++++++++-------- composer.lock | 12 +++---- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 ++++---- vendor/composer/autoload_static.php | 8 ++--- vendor/composer/installed.json | 14 ++++---- vendor/services.php | 2 +- .../Debug/OptionsResolverIntrospectorTest.php | 8 ++--- .../WeChat/Contracts/Tools.php | 9 ++--- 9 files changed, 52 insertions(+), 51 deletions(-) diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php index cda02fa0e..f1bf718fb 100644 --- a/app/admin/controller/api/Plugs.php +++ b/app/admin/controller/api/Plugs.php @@ -46,11 +46,12 @@ class Plugs extends Controller { try { if (AdminService::instance()->isSuper()) { + $this->app->console->call('optimize:route'); + $this->app->console->call('optimize:schema'); + $this->success('网站缓存加速成功！'); + } else { $this->error('只有超级管理员才能操作！'); } - $this->app->console->call('optimize:route'); - $this->app->console->call('optimize:schema'); - $this->success('网站缓存加速成功！'); } catch (HttpResponseException $exception) { throw $exception; } catch (\Exception $exception) { @@ -66,12 +67,13 @@ class Plugs extends Controller { try { if (AdminService::instance()->isSuper()) { + $data = SystemService::instance()->getRuntime(); + $this->app->console->call('clear'); + SystemService::instance()->setRuntime($data['app_map'], $data['app_run']); + $this->success('清理网站缓存成功！'); + } else { $this->error('只有超级管理员才能操作！'); } - $data = SystemService::instance()->getRuntime(); - $this->app->console->call('clear'); - SystemService::instance()->setRuntime($data['app_map'], $data['app_run']); - $this->success('清理网站缓存成功！'); } catch (HttpResponseException $exception) { throw $exception; } catch (\Exception $exception) { @@ -85,15 +87,16 @@ class Plugs extends Controller */ public function debug() { - if (input('state')) { - if (AdminService::instance()->isSuper()) { - $this->error('只有超级管理员才能操作！'); + if (AdminService::instance()->isSuper()) { + if (input('state')) { + SystemService::instance()->productMode(true); + $this->success('已切换为生产模式！'); + } else { + SystemService::instance()->productMode(false); + $this->success('已切换为开发模式！'); } - SystemService::instance()->productMode(true); - $this->success('已切换为生产模式！'); } else { - SystemService::instance()->productMode(false); - $this->success('已切换为开发模式！'); + $this->error('只有超级管理员才能操作！'); } } @@ -104,9 +107,10 @@ class Plugs extends Controller public function optimize() { if (AdminService::instance()->isSuper()) { + $this->_queue('优化数据库所有数据表', 'xadmin:dbOptimize', 0, [], 0, 0); + } else { $this->error('只有超级管理员才能操作！'); } - $this->_queue('优化数据库所有数据表', 'xadmin:dbOptimize', 0, [], 0, 0); } } diff --git a/composer.lock b/composer.lock index 80b8fa5af..e9254937b 100644 --- a/composer.lock +++ b/composer.lock @@ -498,16 +498,16 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.39", + "version": "v3.4.40", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed" + "reference": "79701529391f802604ec92080364d617f029974b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/730ef56164ed6c9356c159e9f5ff2b84d753b9ed", - "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/79701529391f802604ec92080364d617f029974b", + "reference": "79701529391f802604ec92080364d617f029974b", "shasum": "", "mirrors": [ { @@ -554,7 +554,7 @@ "configuration", "options" ], - "time": "2020-01-01T11:03:25+00:00" + "time": "2020-04-06T08:30:32+00:00" }, { "name": "topthink/framework", @@ -1024,7 +1024,7 @@ "wechatpay", "wepay" ], - "time": "2020-04-26T03:12:37+00:00" + "time": "2020-04-26T03:22:09+00:00" } ], "packages-dev": [], diff --git a/vendor/autoload.php b/vendor/autoload.php index 4e125c113..6e2f5f1e7 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96::getLoader(); +return ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 428e98d05..105a2e9b6 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96 +class ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0', '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\ComposerStaticInit4ceee63a2cdf20349907f5909444af96::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit4ceee63a2cdf20349907f5909444af96::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire4ceee63a2cdf20349907f5909444af96($fileIdentifier, $file); + composerRequiref41e9df38a61a147f539b835fbd021f0($fileIdentifier, $file); } return $loader; } } -function composerRequire4ceee63a2cdf20349907f5909444af96($fileIdentifier, $file) +function composerRequiref41e9df38a61a147f539b835fbd021f0($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 cdfafe600..189159d8e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit4ceee63a2cdf20349907f5909444af96 +class ComposerStaticInitf41e9df38a61a147f539b835fbd021f0 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -636,9 +636,9 @@ class ComposerStaticInit4ceee63a2cdf20349907f5909444af96 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit4ceee63a2cdf20349907f5909444af96::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit4ceee63a2cdf20349907f5909444af96::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit4ceee63a2cdf20349907f5909444af96::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index a6b55fdc7..61715dad3 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -507,17 +507,17 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.39", - "version_normalized": "3.4.39.0", + "version": "v3.4.40", + "version_normalized": "3.4.40.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed" + "reference": "79701529391f802604ec92080364d617f029974b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/730ef56164ed6c9356c159e9f5ff2b84d753b9ed", - "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/79701529391f802604ec92080364d617f029974b", + "reference": "79701529391f802604ec92080364d617f029974b", "shasum": "", "mirrors": [ { @@ -529,7 +529,7 @@ "require": { "php": "^5.5.9|>=7.0.8" }, - "time": "2020-01-01T11:03:25+00:00", + "time": "2020-04-06T08:30:32+00:00", "type": "library", "extra": { "branch-alias": { @@ -1019,7 +1019,7 @@ "ext-xml": "*", "php": ">=5.4" }, - "time": "2020-04-26T03:12:37+00:00", + "time": "2020-04-26T03:22:09+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/services.php b/vendor/services.php index 8ba6abf87..2a7ef5d49 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php b/vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php index 8d6e9f63f..5fdb9e265 100644 --- a/vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php +++ b/vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php @@ -44,7 +44,7 @@ class OptionsResolverIntrospectorTest extends TestCase $resolver->setDefined($option = 'foo'); $debug = new OptionsResolverIntrospector($resolver); - $this->assertSame('bar', $debug->getDefault($option)); + $debug->getDefault($option); } public function testGetDefaultThrowsOnNotDefinedOption() @@ -54,7 +54,7 @@ class OptionsResolverIntrospectorTest extends TestCase $resolver = new OptionsResolver(); $debug = new OptionsResolverIntrospector($resolver); - $this->assertSame('bar', $debug->getDefault('foo')); + $debug->getDefault('foo'); } public function testGetLazyClosures() @@ -75,7 +75,7 @@ class OptionsResolverIntrospectorTest extends TestCase $resolver->setDefined($option = 'foo'); $debug = new OptionsResolverIntrospector($resolver); - $this->assertSame('bar', $debug->getLazyClosures($option)); + $debug->getLazyClosures($option); } public function testGetLazyClosuresThrowsOnNotDefinedOption() @@ -85,7 +85,7 @@ class OptionsResolverIntrospectorTest extends TestCase $resolver = new OptionsResolver(); $debug = new OptionsResolverIntrospector($resolver); - $this->assertSame('bar', $debug->getLazyClosures('foo')); + $debug->getLazyClosures('foo'); } public function testGetAllowedTypes() diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php index ce353f6e9..fe3882e90 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php @@ -171,17 +171,14 @@ class Tools */ public static function xml3arr($xml) { - if (xml_parse($parser = xml_parser_create(), $xml, true)) { - return json_decode(json_encode(simplexml_load_string($xml)), true); - } - if (is_resource($parser)) xml_parser_free($parser); - return false; + $state = xml_parse($parser = xml_parser_create(), $xml, true); + return xml_parser_free($parser) && $state ? self::xml2arr($xml) : false; } /** * 数组转xml内容 * @param array $data - * @return null|string|string + * @return null|string */ public static function arr2json($data) {