diff --git a/composer.lock b/composer.lock index 118bd0e04..5d437065b 100644 --- a/composer.lock +++ b/composer.lock @@ -783,12 +783,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "7a0ad7fe8fdd6079d8cc856405ac127505ed840b" + "reference": "a01d99bd039989a587fdc0c9d38e300b86a71045" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7a0ad7fe8fdd6079d8cc856405ac127505ed840b", - "reference": "7a0ad7fe8fdd6079d8cc856405ac127505ed840b", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a01d99bd039989a587fdc0c9d38e300b86a71045", + "reference": "a01d99bd039989a587fdc0c9d38e300b86a71045", "shasum": "", "mirrors": [ { @@ -832,7 +832,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-11-23T09:23:18+00:00" + "time": "2019-11-23T10:28:22+00:00" } ], "packages-dev": [], diff --git a/vendor/autoload.php b/vendor/autoload.php index 4ac0e9b5a..addc6a966 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9::getLoader(); +return ComposerAutoloaderInit078c2496db47e2e94f2057948fdfa517::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 632e6ed2c..c0e404fbd 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9 +class ComposerAutoloaderInit078c2496db47e2e94f2057948fdfa517 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit078c2496db47e2e94f2057948fdfa517', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit078c2496db47e2e94f2057948fdfa517', '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\ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit078c2496db47e2e94f2057948fdfa517::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit41e48da7c236026fbb8265abc69af9d9 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit078c2496db47e2e94f2057948fdfa517::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire41e48da7c236026fbb8265abc69af9d9($fileIdentifier, $file); + composerRequire078c2496db47e2e94f2057948fdfa517($fileIdentifier, $file); } return $loader; } } -function composerRequire41e48da7c236026fbb8265abc69af9d9($fileIdentifier, $file) +function composerRequire078c2496db47e2e94f2057948fdfa517($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 6422f8241..dc9de5fe8 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit41e48da7c236026fbb8265abc69af9d9 +class ComposerStaticInit078c2496db47e2e94f2057948fdfa517 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -471,9 +471,9 @@ class ComposerStaticInit41e48da7c236026fbb8265abc69af9d9 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit41e48da7c236026fbb8265abc69af9d9::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit078c2496db47e2e94f2057948fdfa517::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit078c2496db47e2e94f2057948fdfa517::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit078c2496db47e2e94f2057948fdfa517::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 822a5cd6f..f4f01cae5 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": "7a0ad7fe8fdd6079d8cc856405ac127505ed840b" + "reference": "a01d99bd039989a587fdc0c9d38e300b86a71045" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7a0ad7fe8fdd6079d8cc856405ac127505ed840b", - "reference": "7a0ad7fe8fdd6079d8cc856405ac127505ed840b", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a01d99bd039989a587fdc0c9d38e300b86a71045", + "reference": "a01d99bd039989a587fdc0c9d38e300b86a71045", "shasum": "", "mirrors": [ { @@ -826,7 +826,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-11-23T09:23:18+00:00", + "time": "2019-11-23T10:28:22+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 51424e4ae..bc4b58363 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php index a493f96c2..611684ca2 100644 --- a/vendor/zoujingli/think-library/src/Library.php +++ b/vendor/zoujingli/think-library/src/Library.php @@ -32,7 +32,11 @@ class Library extends Service */ public function register() { - if (PHP_SAPI !== 'cli') { + if ($this->app->request->isCli()) { + if (empty($_SERVER['REQUEST_URI']) && isset($_SERVER['argv'][1])) { + $this->app->request->setPathinfo($_SERVER['argv'][1]); + } + } else { // 注册会话中间键 $this->app->middleware->add(SessionInit::class); // 注册访问中间键