From 966df943a22c7cc5bd36dd67191302744dc875e1 Mon Sep 17 00:00:00 2001 From: Anyon Date: Tue, 27 Mar 2018 10:45:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]ComposerUpdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- thinkphp/library/think/route/Domain.php | 5 +++++ vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 8 ++++---- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/thinkphp/library/think/route/Domain.php b/thinkphp/library/think/route/Domain.php index 12ef39f30..08581908e 100644 --- a/thinkphp/library/think/route/Domain.php +++ b/thinkphp/library/think/route/Domain.php @@ -59,6 +59,11 @@ class Domain extends RuleGroup // 检测URL绑定 $result = $this->checkUrlBind($url, $depr); + if (!empty($this->option['append'])) { + $request->route($this->option['append']); + unset($this->option['append']); + } + if (false !== $result) { return $result; } diff --git a/vendor/autoload.php b/vendor/autoload.php index c79f93016..6d221f7ea 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit9657857727528b30c367a01580bda2a3::getLoader(); +return ComposerAutoloaderInit16a1d698c2cb58308d7cf1296b2e92f9::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 37eb320fe..3013d3746 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit9657857727528b30c367a01580bda2a3 +class ComposerAutoloaderInit16a1d698c2cb58308d7cf1296b2e92f9 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit9657857727528b30c367a01580bda2a3 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit9657857727528b30c367a01580bda2a3', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit16a1d698c2cb58308d7cf1296b2e92f9', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit9657857727528b30c367a01580bda2a3', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit16a1d698c2cb58308d7cf1296b2e92f9', '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\ComposerStaticInit9657857727528b30c367a01580bda2a3::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit16a1d698c2cb58308d7cf1296b2e92f9::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit9657857727528b30c367a01580bda2a3 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit9657857727528b30c367a01580bda2a3::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit16a1d698c2cb58308d7cf1296b2e92f9::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire9657857727528b30c367a01580bda2a3($fileIdentifier, $file); + composerRequire16a1d698c2cb58308d7cf1296b2e92f9($fileIdentifier, $file); } return $loader; } } -function composerRequire9657857727528b30c367a01580bda2a3($fileIdentifier, $file) +function composerRequire16a1d698c2cb58308d7cf1296b2e92f9($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 2d347bd17..2a2ed938e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit9657857727528b30c367a01580bda2a3 +class ComposerStaticInit16a1d698c2cb58308d7cf1296b2e92f9 { public static $files = array ( '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php', @@ -257,9 +257,9 @@ class ComposerStaticInit9657857727528b30c367a01580bda2a3 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit9657857727528b30c367a01580bda2a3::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit9657857727528b30c367a01580bda2a3::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit9657857727528b30c367a01580bda2a3::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit16a1d698c2cb58308d7cf1296b2e92f9::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit16a1d698c2cb58308d7cf1296b2e92f9::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit16a1d698c2cb58308d7cf1296b2e92f9::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 7a88aa00f..3634df492 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -180,12 +180,12 @@ "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "904f54b05e22d811bdf5635587294492a93cfdff" + "reference": "f737a05ec7c21eb77a624478d97a172dade8fa67" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/top-think/framework/904f54b05e22d811bdf5635587294492a93cfdff.zip", - "reference": "904f54b05e22d811bdf5635587294492a93cfdff", + "url": "https://files.phpcomposer.com/files/top-think/framework/f737a05ec7c21eb77a624478d97a172dade8fa67.zip", + "reference": "f737a05ec7c21eb77a624478d97a172dade8fa67", "shasum": "" }, "require": { @@ -201,7 +201,7 @@ "sebastian/phpcpd": "2.*", "squizlabs/php_codesniffer": "2.*" }, - "time": "2018-03-26T08:54:03+00:00", + "time": "2018-03-26T10:43:20+00:00", "type": "think-framework", "installation-source": "dist", "notification-url": "https://packagist.org/downloads/",