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

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2019-11-28 16:47:18 +08:00
parent 79f23769cc
commit 0d4d15d130
7 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/composer/autoload_classmap.php vendored
View File

@ -215,7 +215,7 @@ return array(
'library\\queue\\StateQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StateQueue.php', 'library\\queue\\StateQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StateQueue.php',
'library\\queue\\StopQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StopQueue.php', 'library\\queue\\StopQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StopQueue.php',
'library\\queue\\WorkQueue' => $vendorDir . '/zoujingli/think-library/src/queue/WorkQueue.php', 'library\\queue\\WorkQueue' => $vendorDir . '/zoujingli/think-library/src/queue/WorkQueue.php',
'library\\service\\AuthService' => $vendorDir . '/zoujingli/think-library/src/service/AuthService.php', 'library\\service\\AdminService' => $vendorDir . '/zoujingli/think-library/src/service/AdminService.php',
'library\\service\\CaptchaService' => $vendorDir . '/zoujingli/think-library/src/service/CaptchaService.php', 'library\\service\\CaptchaService' => $vendorDir . '/zoujingli/think-library/src/service/CaptchaService.php',
'library\\service\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php', 'library\\service\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php',
'library\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php', 'library\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php',

2
vendor/composer/autoload_static.php vendored
View File

@ -316,7 +316,7 @@ class ComposerStaticInitbf5dd43c242f2a86b1513b16fb281176
'library\\queue\\StateQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StateQueue.php', 'library\\queue\\StateQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StateQueue.php',
'library\\queue\\StopQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StopQueue.php', 'library\\queue\\StopQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StopQueue.php',
'library\\queue\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php', 'library\\queue\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php',
'library\\service\\AuthService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AuthService.php', 'library\\service\\AdminService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AdminService.php',
'library\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php', 'library\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php',
'library\\service\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php', 'library\\service\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php',
'library\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php', 'library\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php',

8
vendor/composer/installed.json vendored
View File

@ -502,12 +502,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "1881f6a468e2c1e4eff5f18f4aa7aafd2752c196" "reference": "9b520cd35b4c7e9da6b928def3c5ec779e67bc0f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1881f6a468e2c1e4eff5f18f4aa7aafd2752c196", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9b520cd35b4c7e9da6b928def3c5ec779e67bc0f",
"reference": "1881f6a468e2c1e4eff5f18f4aa7aafd2752c196", "reference": "9b520cd35b4c7e9da6b928def3c5ec779e67bc0f",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -527,7 +527,7 @@
"qiniu/php-sdk": "^7.2", "qiniu/php-sdk": "^7.2",
"topthink/framework": "5.1.*" "topthink/framework": "5.1.*"
}, },
"time": "2019-11-28T06:50:47+00:00", "time": "2019-11-28T08:41:39+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

6
vendor/zoujingli/think-library/composer.json vendored
View File

@ -22,11 +22,5 @@
"psr-4": { "psr-4": {
"library\\": "src" "library\\": "src"
} }
},
"repositories": {
"packagist": {
"type": "composer",
"url": "https://mirrors.aliyun.com/composer"
}
} }
} }

3
vendor/zoujingli/think-library/src/common.php vendored
View File

@ -24,7 +24,6 @@ use think\Db;
use think\db\Query; use think\db\Query;
use think\facade\Cache; use think\facade\Cache;
use think\facade\Middleware; use think\facade\Middleware;
use think\facade\Response;
use think\Request; use think\Request;
if (!function_exists('p')) { if (!function_exists('p')) {
@ -243,7 +242,7 @@ if (PHP_SAPI !== 'cli') {
$header['Access-Control-Expose-Headers'] = 'User-Token-Csrf'; $header['Access-Control-Expose-Headers'] = 'User-Token-Csrf';
} }
if ($request->isOptions()) { if ($request->isOptions()) {
return Response::create()->code(204)->header($header); return response()->code(204)->header($header);
} else { } else {
return $next($request)->header($header); return $next($request)->header($header);
} }

6
vendor/zoujingli/think-library/src/service/AuthService.php → vendor/zoujingli/think-library/src/service/AdminService.php vendored
View File

@ -23,10 +23,10 @@ use think\Db;
/** /**
* 系统权限管理服务 * 系统权限管理服务
* Class AuthService * Class AdminService
* @package think\admin\service * @package think\admin\service
*/ */
class AuthService extends Service class AdminService extends Service
{ {
/** /**
@ -88,7 +88,7 @@ class AuthService extends Service
/** /**
* 初始化用户权限 * 初始化用户权限
* @param boolean $force 强刷权限 * @param boolean $force 强刷权限
* @return AuthService * @return AdminService
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException

2
vendor/zoujingli/think-library/src/service/MenuService.php vendored
View File

@ -75,7 +75,7 @@ class MenuService extends Service
else { else {
$node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3)); $node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3));
$menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}"); $menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}");
if (!AuthService::instance()->check($node)) unset($menus[$key]); if (!AdminService::instance()->check($node)) unset($menus[$key]);
} }
} }
return $menus; return $menus;