mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-23 09:50:25 +08:00
ComposerUpdate
This commit is contained in:
parent
146b2959b8
commit
5b74270d7c
8
vendor/composer/installed.json
vendored
8
vendor/composer/installed.json
vendored
@ -935,12 +935,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||||
"reference": "e313082651d91f411caf10b77d0b786ef4784445"
|
"reference": "53001a2ea7a733136a2d8264a04a854cbc0f6205"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e313082651d91f411caf10b77d0b786ef4784445",
|
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/53001a2ea7a733136a2d8264a04a854cbc0f6205",
|
||||||
"reference": "e313082651d91f411caf10b77d0b786ef4784445",
|
"reference": "53001a2ea7a733136a2d8264a04a854cbc0f6205",
|
||||||
"shasum": "",
|
"shasum": "",
|
||||||
"mirrors": [
|
"mirrors": [
|
||||||
{
|
{
|
||||||
@ -956,7 +956,7 @@
|
|||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"topthink/framework": "^6.0"
|
"topthink/framework": "^6.0"
|
||||||
},
|
},
|
||||||
"time": "2020-05-06T02:31:00+00:00",
|
"time": "2020-05-06T06:23:28+00:00",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"think": {
|
"think": {
|
||||||
|
2
vendor/services.php
vendored
2
vendor/services.php
vendored
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
// This file is automatically generated at:2020-05-06 10:34:23
|
// This file is automatically generated at:2020-05-07 11:28:21
|
||||||
declare (strict_types = 1);
|
declare (strict_types = 1);
|
||||||
return array (
|
return array (
|
||||||
0 => 'think\\app\\Service',
|
0 => 'think\\app\\Service',
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
namespace think\admin\command;
|
namespace think\admin\command;
|
||||||
|
|
||||||
|
use think\admin\Command;
|
||||||
use think\admin\service\InstallService;
|
use think\admin\service\InstallService;
|
||||||
use think\console\Command;
|
|
||||||
use think\console\Input;
|
use think\console\Input;
|
||||||
use think\console\input\Argument;
|
use think\console\input\Argument;
|
||||||
use think\console\Output;
|
use think\console\Output;
|
||||||
|
@ -15,9 +15,7 @@
|
|||||||
|
|
||||||
namespace think\admin\command;
|
namespace think\admin\command;
|
||||||
|
|
||||||
use think\admin\service\ProcessService;
|
use think\admin\Command;
|
||||||
use think\App;
|
|
||||||
use think\console\Command;
|
|
||||||
use think\console\Input;
|
use think\console\Input;
|
||||||
use think\console\Output;
|
use think\console\Output;
|
||||||
|
|
||||||
@ -36,7 +34,7 @@ class Version extends Command
|
|||||||
|
|
||||||
protected function execute(Input $input, Output $output)
|
protected function execute(Input $input, Output $output)
|
||||||
{
|
{
|
||||||
$output->writeln('ThinkLib ' . ProcessService::instance()->version());
|
$output->writeln('ThinkLib ' . $this->process->version());
|
||||||
$output->writeln('ThinkPHP ' . App::VERSION);
|
$output->writeln('ThinkPHP ' . $this->app->version());
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -74,6 +74,9 @@ class AdminService extends Service
|
|||||||
if ($this->isSuper()) return true;
|
if ($this->isSuper()) return true;
|
||||||
$service = NodeService::instance();
|
$service = NodeService::instance();
|
||||||
list($real, $nodes) = [$service->fullnode($node), $service->getMethods()];
|
list($real, $nodes) = [$service->fullnode($node), $service->getMethods()];
|
||||||
|
foreach ($nodes as $key => $rule) if (stripos($key, '_') !== false) {
|
||||||
|
$nodes[str_replace('_', '', $key)] = $rule;
|
||||||
|
}
|
||||||
if (!empty($nodes[$real]['isauth'])) {
|
if (!empty($nodes[$real]['isauth'])) {
|
||||||
return in_array($real, $this->app->session->get('user.nodes', []));
|
return in_array($real, $this->app->session->get('user.nodes', []));
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user