blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

CompoesrUpdate

Browse Source
This commit is contained in:
Anyon 2020-09-02 11:49:45 +08:00
parent 55fbc24cb3
commit 94ab5337aa
6 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70::getLoader(); return ComposerAutoloaderInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70 class ComposerAutoloaderInitd21bcdb0e9e0fd6013ffb7c64c8a9d94
{ {
private static $loader; private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70
return self::$loader; 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(); 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()); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) { if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitb55556af42203bcef68382c66bc39c70::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::getInitializer($loader));
} else { } else {
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
@ -51,19 +51,19 @@ class ComposerAutoloaderInitb55556af42203bcef68382c66bc39c70
$loader->register(true); $loader->register(true);
if ($useStaticLoader) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitb55556af42203bcef68382c66bc39c70::$files; $includeFiles = Composer\Autoload\ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
} }
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireb55556af42203bcef68382c66bc39c70($fileIdentifier, $file); composerRequired21bcdb0e9e0fd6013ffb7c64c8a9d94($fileIdentifier, $file);
} }
return $loader; return $loader;
} }
} }
function composerRequireb55556af42203bcef68382c66bc39c70($fileIdentifier, $file) function composerRequired21bcdb0e9e0fd6013ffb7c64c8a9d94($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file; require $file;

10
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInitb55556af42203bcef68382c66bc39c70 class ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94
{ {
public static $files = array ( public static $files = array (
'9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@ -651,10 +651,10 @@ class ComposerStaticInitb55556af42203bcef68382c66bc39c70
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitb55556af42203bcef68382c66bc39c70::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb55556af42203bcef68382c66bc39c70::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$prefixDirsPsr4;
$loader->fallbackDirsPsr0 = ComposerStaticInitb55556af42203bcef68382c66bc39c70::$fallbackDirsPsr0; $loader->fallbackDirsPsr0 = ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$fallbackDirsPsr0;
$loader->classMap = ComposerStaticInitb55556af42203bcef68382c66bc39c70::$classMap; $loader->classMap = ComposerStaticInitd21bcdb0e9e0fd6013ffb7c64c8a9d94::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

8
vendor/composer/installed.json vendored
View File

@ -963,12 +963,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "98f56d2c2a589cfa4074733c655021d38d78b4aa" "reference": "77e7a89a681854da202aa5afa4170279ac6c44c4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/98f56d2c2a589cfa4074733c655021d38d78b4aa", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/77e7a89a681854da202aa5afa4170279ac6c44c4",
"reference": "98f56d2c2a589cfa4074733c655021d38d78b4aa", "reference": "77e7a89a681854da202aa5afa4170279ac6c44c4",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -985,7 +985,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-09-02T03:17:43+00:00", "time": "2020-09-02T03:41:53+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-09-02 11:24:55 // This file is automatically generated at:2020-09-02 11:49:20
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

41
vendor/zoujingli/think-library/src/multiple/Url.php vendored
View File

@ -43,24 +43,27 @@ class Url extends \think\route\Url
// 解析到控制器 // 解析到控制器
$url = substr($url, 1); $url = substr($url, 1);
} elseif ('' === $url) { } elseif ('' === $url) {
$url = $request->controller() . '/' . $request->action(); $url = $this->app->http->getName() . '/' . $request->controller() . '/' . $request->action();
if (!$this->app->http->isBind()) {
$url = $this->getAppName() . '/' . $url;
}
} else { } else {
// 解析到 应用/控制器/操作 // 解析到 应用/控制器/操作
$controller = $request->controller(); $controller = $request->controller();
$app = $this->app->http->getName();
$path = explode('/', $url); $path = explode('/', $url);
$action = array_pop($path); $action = array_pop($path);
$controller = empty($path) ? $controller : 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; $url = Str::snake($controller) . '/' . $action;
$bind = $this->app->config->get('app.domain_bind', []); $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']; isset($bind[$_SERVER['SERVER_NAME']]) && $domain = $_SERVER['SERVER_NAME'];
$domain = is_bool($domain) ? $key : $domain; $domain = is_bool($domain) ? $key : $domain;
} elseif (!$this->app->http->isBind()) { } else {
$url = $app . '/' . $url; $map = $this->app->config->get('app.app_map', []);
if ($key = array_search($app, $map)) {
$url = $key . '/' . $url;
} else {
$url = $app . '/' . $url;
}
} }
} }
return $url; return $url;
@ -104,7 +107,7 @@ class Url extends \think\route\Url
$rule = $this->route->getName($checkName, $checkDomain); $rule = $this->route->getName($checkName, $checkDomain);
if (empty($rule) && isset($info['query'])) { if (empty($rule) && isset($info['query'])) {
$rule = $this->route->getName($url, $checkDomain); $rule = $this->route->getName($url, $checkDomain);
// 解析地址里面参数 合并到vars // 解析地址里面参数 合并到 vars
parse_str($info['query'], $params); parse_str($info['query'], $params);
$vars = array_merge($params, $vars); $vars = array_merge($params, $vars);
unset($info['query']); unset($info['query']);
@ -120,8 +123,7 @@ class Url extends \think\route\Url
$suffix = $match[2]; $suffix = $match[2];
} }
if (!$this->app->http->isBind()) { if (!$this->app->http->isBind()) {
$app = $this->getAppName(); $url = $this->app->http->getName() . '/' . $url;
$url = $app . '/' . $url;
} }
} elseif (!empty($rule) && isset($name)) { } elseif (!empty($rule) && isset($name)) {
throw new \InvalidArgumentException('route name not exists:' . $name); throw new \InvalidArgumentException('route name not exists:' . $name);
@ -148,7 +150,7 @@ class Url extends \think\route\Url
$vars = array_merge($params, $vars); $vars = array_merge($params, $vars);
} }
} }
// 还原URL分隔符 // 还原 URL 分隔符
$depr = $this->route->config('pathinfo_depr'); $depr = $this->route->config('pathinfo_depr');
$url = str_replace('/', $depr, $url); $url = str_replace('/', $depr, $url);
$file = $request->baseFile(); $file = $request->baseFile();
@ -187,19 +189,4 @@ class Url extends \think\route\Url
// URL组装 // URL组装
return $domain . rtrim($this->root, '/') . '/' . ltrim($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;
}
} }