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:14:20 +08:00
parent 705483ef58
commit 8b4e80f63a
13 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/admin/controller/Auth.php
View File

@ -16,7 +16,7 @@
namespace app\admin\controller; namespace app\admin\controller;
use think\admin\Controller; use think\admin\Controller;
use think\admin\service\AuthService; use think\admin\service\AdminService;
/** /**
* 系统权限管理 * 系统权限管理
@ -98,7 +98,7 @@ class Auth extends Controller
$action = strtolower(input('action', '')); $action = strtolower(input('action', ''));
if ($action === 'get') { if ($action === 'get') {
$checkeds = $this->app->db->name('SystemAuthNode')->where($map)->column('node'); $checkeds = $this->app->db->name('SystemAuthNode')->where($map)->column('node');
$this->success('获取权限节点成功！', AuthService::instance()->getTree($checkeds)); $this->success('获取权限节点成功！', AdminService::instance()->getTree($checkeds));
} elseif ($action === 'save') { } elseif ($action === 'save') {
list($post, $data) = [$this->request->post(), []]; list($post, $data) = [$this->request->post(), []];
foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) { foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) {
@ -106,7 +106,7 @@ class Auth extends Controller
} }
$this->app->db->name('SystemAuthNode')->where($map)->delete(); $this->app->db->name('SystemAuthNode')->where($map)->delete();
$this->app->db->name('SystemAuthNode')->insertAll($data); $this->app->db->name('SystemAuthNode')->insertAll($data);
AuthService::instance()->apply(true); AdminService::instance()->apply(true);
$this->success('权限授权更新成功！', 'javascript:history.back()'); $this->success('权限授权更新成功！', 'javascript:history.back()');
} else { } else {
$this->title = '权限配置节点'; $this->title = '权限配置节点';

4
app/admin/controller/Index.php
View File

@ -16,7 +16,7 @@
namespace app\admin\controller; namespace app\admin\controller;
use think\admin\Controller; use think\admin\Controller;
use think\admin\service\AuthService; use think\admin\service\AdminService;
use think\admin\service\MenuService; use think\admin\service\MenuService;
/** /**
@ -37,7 +37,7 @@ class Index extends Controller
public function index() public function index()
{ {
$this->title = '系统管理后台'; $this->title = '系统管理后台';
$auth = AuthService::instance()->apply(true); $auth = AdminService::instance()->apply(true);
$this->menus = MenuService::instance()->getTree(); $this->menus = MenuService::instance()->getTree();
if (empty($this->menus) && !$auth->isLogin()) { if (empty($this->menus) && !$auth->isLogin()) {
$this->redirect(url('@admin/login')); $this->redirect(url('@admin/login'));

4
app/admin/controller/Login.php
View File

@ -16,7 +16,7 @@
namespace app\admin\controller; namespace app\admin\controller;
use think\admin\Controller; use think\admin\Controller;
use think\admin\service\AuthService; use think\admin\service\AdminService;
use think\admin\service\CaptchaService; use think\admin\service\CaptchaService;
use think\admin\service\SystemService; use think\admin\service\SystemService;
@ -36,7 +36,7 @@ class Login extends Controller
public function index() public function index()
{ {
if ($this->app->request->isGet()) { if ($this->app->request->isGet()) {
if (AuthService::instance()->isLogin()) { if (AdminService::instance()->isLogin()) {
$this->redirect(url('@admin')->build()); $this->redirect(url('@admin')->build());
} else { } else {
$this->title = '系统登录'; $this->title = '系统登录';

8
composer.lock generated
View File

@ -783,12 +783,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "32904c53ced38e3fbe5de93fa074b53cf6b35c6b" "reference": "4a616d7c4852a46b4d4038a6715c9d62303e5d99"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/32904c53ced38e3fbe5de93fa074b53cf6b35c6b", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/4a616d7c4852a46b4d4038a6715c9d62303e5d99",
"reference": "32904c53ced38e3fbe5de93fa074b53cf6b35c6b", "reference": "4a616d7c4852a46b4d4038a6715c9d62303e5d99",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -832,7 +832,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2019-11-28T03:18:03+00:00" "time": "2019-11-28T08:04:45+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],

2
vendor/composer/autoload_classmap.php vendored
View File

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

2
vendor/composer/autoload_static.php vendored
View File

@ -253,7 +253,7 @@ class ComposerStaticInit078c2496db47e2e94f2057948fdfa517
'think\\admin\\queue\\StateQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StateQueue.php', 'think\\admin\\queue\\StateQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StateQueue.php',
'think\\admin\\queue\\StopQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StopQueue.php', 'think\\admin\\queue\\StopQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StopQueue.php',
'think\\admin\\queue\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php', 'think\\admin\\queue\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php',
'think\\admin\\service\\AuthService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AuthService.php', 'think\\admin\\service\\AdminService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AdminService.php',
'think\\admin\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php', 'think\\admin\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php',
'think\\admin\\service\\ExpressService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/ExpressService.php', 'think\\admin\\service\\ExpressService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/ExpressService.php',
'think\\admin\\service\\InstallService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/InstallService.php', 'think\\admin\\service\\InstallService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/InstallService.php',

8
vendor/composer/installed.json vendored
View File

@ -805,12 +805,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "32904c53ced38e3fbe5de93fa074b53cf6b35c6b" "reference": "4a616d7c4852a46b4d4038a6715c9d62303e5d99"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/32904c53ced38e3fbe5de93fa074b53cf6b35c6b", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/4a616d7c4852a46b4d4038a6715c9d62303e5d99",
"reference": "32904c53ced38e3fbe5de93fa074b53cf6b35c6b", "reference": "4a616d7c4852a46b4d4038a6715c9d62303e5d99",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -826,7 +826,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2019-11-28T03:18:03+00:00", "time": "2019-11-28T08:04:45+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:2019-11-28 14:30:17 // This file is automatically generated at:2019-11-28 16:10:35
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

6
vendor/zoujingli/think-library/src/Library.php vendored
View File

@ -15,7 +15,7 @@
namespace think\admin; namespace think\admin;
use think\admin\service\AuthService; use think\admin\service\AdminService;
use think\middleware\SessionInit; use think\middleware\SessionInit;
use think\Request; use think\Request;
use think\Service; use think\Service;
@ -51,9 +51,9 @@ class Library extends Service
// 访问模式及访问权限检查 // 访问模式及访问权限检查
if ($request->isOptions()) { if ($request->isOptions()) {
return response()->code(204)->header($header); return response()->code(204)->header($header);
} elseif (AuthService::instance()->check()) { } elseif (AdminService::instance()->check()) {
return $next($request)->code(200)->header($header); return $next($request)->code(200)->header($header);
} elseif (AuthService::instance()->isLogin()) { } elseif (AdminService::instance()->isLogin()) {
return json(['code' => 0, 'msg' => '抱歉，没有访问该操作的权限！'])->header($header); return json(['code' => 0, 'msg' => '抱歉，没有访问该操作的权限！'])->header($header);
} else { } else {
return json(['code' => 0, 'msg' => '抱歉，需要登录获取访问权限！', 'url' => url('@admin/login')->build()])->header($header); return json(['code' => 0, 'msg' => '抱歉，需要登录获取访问权限！', 'url' => url('@admin/login')->build()])->header($header);

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

@ -14,7 +14,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
use think\admin\extend\HttpExtend; use think\admin\extend\HttpExtend;
use think\admin\service\AuthService; use think\admin\service\AdminService;
use think\admin\service\QueueService; use think\admin\service\QueueService;
use think\admin\service\SystemService; use think\admin\service\SystemService;
use think\admin\service\TokenService; use think\admin\service\TokenService;
@ -42,7 +42,7 @@ if (!function_exists('auth')) {
*/ */
function auth($node) function auth($node)
{ {
return AuthService::instance()->check($node); return AdminService::instance()->check($node);
} }
} }

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

@ -20,10 +20,10 @@ use think\admin\Service;
/** /**
* 系统权限管理服务 * 系统权限管理服务
* Class AuthService * Class AdminService
* @package think\admin\service * @package think\admin\service
*/ */
class AuthService extends Service class AdminService extends Service
{ {
/** /**
@ -85,7 +85,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\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException

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

@ -74,7 +74,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;

11
vendor/zoujingli/think-library/src/service/SystemService.php vendored
View File

@ -124,7 +124,7 @@ class SystemService extends Service
/** /**
* 保存数据内容 * 保存数据内容
* @param string $name * @param string $name
* @param array $value * @param mixed $value
* @return boolean * @return boolean
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
@ -132,19 +132,20 @@ class SystemService extends Service
*/ */
public function setData($name, $value) public function setData($name, $value)
{ {
$data = ['name' => $name, 'value' => json_encode($value, 256)]; $data = ['name' => $name, 'value' => serialize($value)];
return $this->save('SystemData', $data, 'name'); return $this->save('SystemData', $data, 'name');
} }
/** /**
* 读取数据内容 * 读取数据内容
* @param string $name * @param string $name
* @param string $default
* @return mixed * @return mixed
*/ */
public function getData($name) public function getData($name, $default = null)
{ {
$value = $this->app->db->name('SystemData')->where(['name' => $name])->value('value'); $value = $this->app->db->name('SystemData')->where(['name' => $name])->value('value', null);
return empty($value) ? '' : json_encode($value, true); return is_null($value) ? $default : unserialize($value);
} }
/** /**