diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php index 6dbddc383..226917a46 100644 --- a/application/admin/controller/Auth.php +++ b/application/admin/controller/Auth.php @@ -16,7 +16,7 @@ namespace app\admin\controller; use library\Controller; -use library\service\AuthService; +use library\service\AdminService; use think\Db; /** @@ -62,7 +62,7 @@ class Auth extends Controller $action = strtolower(input('action', '')); if ($action === 'get') { $checkeds = Db::name('SystemAuthNode')->where($map)->column('node'); - $this->success('获取权限节点成功！', AuthService::instance()->getTree($checkeds)); + $this->success('获取权限节点成功！', AdminService::instance()->getTree($checkeds)); } elseif ($action === 'save') { list($post, $data) = [$this->request->post(), []]; foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) { @@ -70,7 +70,7 @@ class Auth extends Controller } Db::name('SystemAuthNode')->where($map)->delete(); Db::name('SystemAuthNode')->insertAll($data); - AuthService::instance()->apply(true); + AdminService::instance()->apply(true); $this->success('权限授权更新成功！', 'javascript:history.back()'); } else { $this->title = '权限配置节点'; @@ -115,7 +115,7 @@ class Auth extends Controller public function refresh() { try { - AuthService::instance()->apply(true); + AdminService::instance()->apply(true); $this->success('刷新系统授权成功！'); } catch (\think\exception\HttpResponseException $exception) { throw $exception; diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index b6fc7f77e..4de114fe5 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -16,7 +16,7 @@ namespace app\admin\controller; use library\Controller; -use library\service\AuthService; +use library\service\AdminService; use library\service\MenuService; use library\tools\Data; use think\Console; @@ -41,7 +41,7 @@ class Index extends Controller public function index() { $this->title = '系统管理后台'; - $auth = AuthService::instance()->apply(true); + $auth = AdminService::instance()->apply(true); $this->menus = MenuService::instance()->getTree(); if (empty($this->menus) && !$auth->isLogin()) { $this->redirect('@admin/login'); @@ -76,7 +76,7 @@ class Index extends Controller if (intval($id) !== intval(session('user.id'))) { $this->error('只能修改当前用户的密码！'); } - if (!AuthService::instance()->isLogin()) { + if (!AdminService::instance()->isLogin()) { $this->error('需要登录才能操作哦！'); } if ($this->request->isGet()) { @@ -122,7 +122,7 @@ class Index extends Controller */ public function info($id = 0) { - if (!AuthService::instance()->isLogin()) { + if (!AdminService::instance()->isLogin()) { $this->error('需要登录才能操作哦！'); } $this->applyCsrfToken(); diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php index 5893b54eb..2516d3977 100644 --- a/application/admin/controller/Login.php +++ b/application/admin/controller/Login.php @@ -16,7 +16,7 @@ namespace app\admin\controller; use library\Controller; -use library\service\AuthService; +use library\service\AdminService; use library\service\CaptchaService; use library\service\SystemService; use think\Db; @@ -41,7 +41,7 @@ class Login extends Controller public function index() { if (Request::isGet()) { - if (AuthService::instance()->isLogin()) { + if (AdminService::instance()->isLogin()) { $this->redirect('@admin'); } else { $this->title = '系统登录'; @@ -77,7 +77,7 @@ class Login extends Controller ]); session('user', $user); session('loginskey', null); - AuthService::instance()->apply(true); + AdminService::instance()->apply(true); sysoplog('系统管理', '用户登录系统成功'); $this->success('登录成功', url('@admin')); } diff --git a/application/admin/sys.php b/application/admin/sys.php index f594f3b27..a4ac64863 100644 --- a/application/admin/sys.php +++ b/application/admin/sys.php @@ -14,7 +14,7 @@ // +---------------------------------------------------------------------- use library\File; -use library\service\AuthService; +use library\service\AdminService; use library\service\CaptchaService; use library\service\SystemService; use think\Db; @@ -31,7 +31,7 @@ if (!function_exists('auth')) { */ function auth($node) { - return AuthService::instance()->check($node); + return AdminService::instance()->check($node); } } @@ -141,9 +141,9 @@ if (!function_exists('base64_image')) { // 访问权限检查中间键 Middleware::add(function (Request $request, \Closure $next) { - if (AuthService::instance()->check()) { + if (AdminService::instance()->check()) { return $next($request); - } elseif (AuthService::instance()->isLogin()) { + } elseif (AdminService::instance()->isLogin()) { return json(['code' => 0, 'msg' => '抱歉，没有访问该操作的权限！']); } else { return json(['code' => 0, 'msg' => '抱歉，需要登录获取访问权限！', 'url' => url('@admin/login')]); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 78acc6712..8c7bc6871 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -215,7 +215,7 @@ return array( 'library\\queue\\StateQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StateQueue.php', 'library\\queue\\StopQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StopQueue.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\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php', 'library\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 6a1b1e3ab..6027cd855 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -308,7 +308,7 @@ class ComposerStaticInit0ac7cd5b2cda0031cee9c92b2dc93c50 'library\\queue\\StateQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StateQueue.php', 'library\\queue\\StopQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StopQueue.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\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php', 'library\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 23ae1a1c6..c4f9814c1 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -401,12 +401,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "1881f6a468e2c1e4eff5f18f4aa7aafd2752c196" + "reference": "9b520cd35b4c7e9da6b928def3c5ec779e67bc0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1881f6a468e2c1e4eff5f18f4aa7aafd2752c196", - "reference": "1881f6a468e2c1e4eff5f18f4aa7aafd2752c196", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9b520cd35b4c7e9da6b928def3c5ec779e67bc0f", + "reference": "9b520cd35b4c7e9da6b928def3c5ec779e67bc0f", "shasum": "", "mirrors": [ { @@ -426,7 +426,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-11-28T06:50:47+00:00", + "time": "2019-11-28T08:41:39+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/composer.json b/vendor/zoujingli/think-library/composer.json index 9a60c4aaa..0d122a6f3 100644 --- a/vendor/zoujingli/think-library/composer.json +++ b/vendor/zoujingli/think-library/composer.json @@ -22,11 +22,5 @@ "psr-4": { "library\\": "src" } - }, - "repositories": { - "packagist": { - "type": "composer", - "url": "https://mirrors.aliyun.com/composer" - } } } diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 41ac7fd8e..02c40d52d 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -24,7 +24,6 @@ use think\Db; use think\db\Query; use think\facade\Cache; use think\facade\Middleware; -use think\facade\Response; use think\Request; if (!function_exists('p')) { @@ -243,7 +242,7 @@ if (PHP_SAPI !== 'cli') { $header['Access-Control-Expose-Headers'] = 'User-Token-Csrf'; } if ($request->isOptions()) { - return Response::create()->code(204)->header($header); + return response()->code(204)->header($header); } else { return $next($request)->header($header); } diff --git a/vendor/zoujingli/think-library/src/service/AuthService.php b/vendor/zoujingli/think-library/src/service/AdminService.php similarity index 98% rename from vendor/zoujingli/think-library/src/service/AuthService.php rename to vendor/zoujingli/think-library/src/service/AdminService.php index a70d63a12..d5ba6313d 100644 --- a/vendor/zoujingli/think-library/src/service/AuthService.php +++ b/vendor/zoujingli/think-library/src/service/AdminService.php @@ -23,10 +23,10 @@ use think\Db; /** * 系统权限管理服务 - * Class AuthService + * Class AdminService * @package think\admin\service */ -class AuthService extends Service +class AdminService extends Service { /** @@ -88,7 +88,7 @@ class AuthService extends Service /** * 初始化用户权限 * @param boolean $force 强刷权限 - * @return AuthService + * @return AdminService * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\ModelNotFoundException * @throws \think\exception\DbException diff --git a/vendor/zoujingli/think-library/src/service/MenuService.php b/vendor/zoujingli/think-library/src/service/MenuService.php index bb7dfad13..a962540f3 100644 --- a/vendor/zoujingli/think-library/src/service/MenuService.php +++ b/vendor/zoujingli/think-library/src/service/MenuService.php @@ -75,7 +75,7 @@ class MenuService extends Service else { $node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3)); $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;