diff --git a/vendor/autoload.php b/vendor/autoload.php index d56f4ea12..bebe77724 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70::getLoader(); +return ComposerAutoloaderInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index e05d8a6f4..c89c4fdf2 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70 +class ComposerAutoloaderInitd21bcdb0e9e0fd6013ffb7c64c8a9d94 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd21bcdb0e9e0fd6013ffb7c64c8a9d94', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd21bcdb0e9e0fd6013ffb7c64c8a9d94', '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\ComposerStaticInitb55556af42203bcef68382c66bc39c70::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -51,19 +51,19 @@ class ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitb55556af42203bcef68382c66bc39c70::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequireb55556af42203bcef68382c66bc39c70($fileIdentifier, $file); + composerRequired21bcdb0e9e0fd6013ffb7c64c8a9d94($fileIdentifier, $file); } return $loader; } } -function composerRequireb55556af42203bcef68382c66bc39c70($fileIdentifier, $file) +function composerRequired21bcdb0e9e0fd6013ffb7c64c8a9d94($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 2764cc804..6fceaa668 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitb55556af42203bcef68382c66bc39c70 +class ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -651,10 +651,10 @@ class ComposerStaticInitb55556af42203bcef68382c66bc39c70 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitb55556af42203bcef68382c66bc39c70::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitb55556af42203bcef68382c66bc39c70::$prefixDirsPsr4; - $loader->fallbackDirsPsr0 = ComposerStaticInitb55556af42203bcef68382c66bc39c70::$fallbackDirsPsr0; - $loader->classMap = ComposerStaticInitb55556af42203bcef68382c66bc39c70::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$prefixDirsPsr4; + $loader->fallbackDirsPsr0 = ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$fallbackDirsPsr0; + $loader->classMap = ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 0c5cc383c..383840cc7 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -963,12 +963,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "98f56d2c2a589cfa4074733c655021d38d78b4aa" + "reference": "77e7a89a681854da202aa5afa4170279ac6c44c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/98f56d2c2a589cfa4074733c655021d38d78b4aa", - "reference": "98f56d2c2a589cfa4074733c655021d38d78b4aa", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/77e7a89a681854da202aa5afa4170279ac6c44c4", + "reference": "77e7a89a681854da202aa5afa4170279ac6c44c4", "shasum": "", "mirrors": [ { @@ -985,7 +985,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-09-02T03:17:43+00:00", + "time": "2020-09-02T03:41:53+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index e546d4c68..99fe21732 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/multiple/Url.php b/vendor/zoujingli/think-library/src/multiple/Url.php index 04e619bac..56b8878b1 100644 --- a/vendor/zoujingli/think-library/src/multiple/Url.php +++ b/vendor/zoujingli/think-library/src/multiple/Url.php @@ -43,24 +43,27 @@ class Url extends \think\route\Url // 解析到控制器 $url = substr($url, 1); } elseif ('' === $url) { - $url = $request->controller() . '/' . $request->action(); - if (!$this->app->http->isBind()) { - $url = $this->getAppName() . '/' . $url; - } + $url = $this->app->http->getName() . '/' . $request->controller() . '/' . $request->action(); } else { // 解析到 应用/控制器/操作 $controller = $request->controller(); + $app = $this->app->http->getName(); $path = explode('/', $url); $action = array_pop($path); $controller = empty($path) ? $controller : array_pop($path); - $app = empty($path) ? $this->getAppName() : array_pop($path); + $app = empty($path) ? $app : array_pop($path); $url = Str::snake($controller) . '/' . $action; $bind = $this->app->config->get('app.domain_bind', []); - if ($key = array_search($this->app->http->getName(), $bind)) { + if ($key = array_search($app, $bind)) { isset($bind[$_SERVER['SERVER_NAME']]) && $domain = $_SERVER['SERVER_NAME']; $domain = is_bool($domain) ? $key : $domain; - } elseif (!$this->app->http->isBind()) { - $url = $app . '/' . $url; + } else { + $map = $this->app->config->get('app.app_map', []); + if ($key = array_search($app, $map)) { + $url = $key . '/' . $url; + } else { + $url = $app . '/' . $url; + } } } return $url; @@ -104,7 +107,7 @@ class Url extends \think\route\Url $rule = $this->route->getName($checkName, $checkDomain); if (empty($rule) && isset($info['query'])) { $rule = $this->route->getName($url, $checkDomain); - // 解析地址里面参数 合并到vars + // 解析地址里面参数 合并到 vars parse_str($info['query'], $params); $vars = array_merge($params, $vars); unset($info['query']); @@ -120,8 +123,7 @@ class Url extends \think\route\Url $suffix = $match[2]; } if (!$this->app->http->isBind()) { - $app = $this->getAppName(); - $url = $app . '/' . $url; + $url = $this->app->http->getName() . '/' . $url; } } elseif (!empty($rule) && isset($name)) { throw new \InvalidArgumentException('route name not exists:' . $name); @@ -148,7 +150,7 @@ class Url extends \think\route\Url $vars = array_merge($params, $vars); } } - // 还原URL分隔符 + // 还原 URL 分隔符 $depr = $this->route->config('pathinfo_depr'); $url = str_replace('/', $depr, $url); $file = $request->baseFile(); @@ -187,19 +189,4 @@ class Url extends \think\route\Url // URL组装 return $domain . rtrim($this->root, '/') . '/' . ltrim($url, '/'); } - - /** - * 获取URL的应用名 - * @access protected - * @return string - */ - protected function getAppName() - { - $app = $this->app->http->getName(); - $map = $this->app->config->get('app.app_map', []); - if ($key = array_search($app, $map)) { - $app = $key; - } - return $app; - } } \ No newline at end of file