From 4eb0d828cbb3b1622aab5747767446d5dd40cd2f Mon Sep 17 00:00:00 2001 From: Anyon Date: Sat, 9 Nov 2019 16:27:22 +0800 Subject: [PATCH] ComposerUpdate --- app/admin/controller/Auth.php | 9 +- app/admin/controller/Config.php | 2 +- app/admin/controller/Index.php | 18 +-- app/admin/controller/Login.php | 12 +- app/admin/controller/Menu.php | 4 +- app/admin/controller/Oplog.php | 1 - app/admin/controller/User.php | 4 +- app/admin/controller/api/Update.php | 4 +- app/admin/sys.php | 19 +-- app/admin/view/config/index.html | 2 +- .../view/config/{config.html => system.html} | 0 app/index/controller/Index.php | 17 +++ composer.json | 2 + composer.lock | 14 +- route/demo.php | 46 ++++++ vendor/autoload.php | 2 +- vendor/composer/autoload_classmap.php | 15 +- vendor/composer/autoload_real.php | 14 +- vendor/composer/autoload_static.php | 23 +-- vendor/composer/installed.json | 8 +- vendor/services.php | 2 +- .../think-library/src/{helper => }/Helper.php | 15 +- .../zoujingli/think-library/src/Service.php | 70 ++++++++++ .../think-library/src/ThinkLibrary.php | 13 +- vendor/zoujingli/think-library/src/common.php | 20 ++- .../think-library/src/helper/DeleteHelper.php | 1 + .../think-library/src/helper/FormHelper.php | 1 + .../think-library/src/helper/PageHelper.php | 1 + .../think-library/src/helper/QueryHelper.php | 1 + .../think-library/src/helper/SaveHelper.php | 1 + .../think-library/src/helper/TokenHelper.php | 9 +- .../src/install/CommandInstall.php | 11 +- .../src}/service/AuthService.php | 51 +++---- .../CaptchaService.php} | 131 +++++++++--------- .../InstallService.php} | 43 ++---- .../src}/service/MenuService.php | 36 +++-- .../NodeService.php} | 43 +++--- .../TokenService.php} | 37 ++--- .../think-library/src/service/bin/font.ttf | Bin 0 -> 34852 bytes 39 files changed, 415 insertions(+), 287 deletions(-) rename app/admin/view/config/{config.html => system.html} (100%) create mode 100644 route/demo.php rename vendor/zoujingli/think-library/src/{helper => }/Helper.php (92%) create mode 100644 vendor/zoujingli/think-library/src/Service.php rename {app/admin => vendor/zoujingli/think-library/src}/service/AuthService.php (68%) rename vendor/zoujingli/think-library/src/{extend/CaptchaExtend.php => service/CaptchaService.php} (88%) rename vendor/zoujingli/think-library/src/{install/ExtendInstall.php => service/InstallService.php} (91%) rename {app/admin => vendor/zoujingli/think-library/src}/service/MenuService.php (77%) rename vendor/zoujingli/think-library/src/{extend/NodeExtend.php => service/NodeService.php} (79%) rename vendor/zoujingli/think-library/src/{extend/TokenExtend.php => service/TokenService.php} (62%) create mode 100644 vendor/zoujingli/think-library/src/service/bin/font.ttf diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php index dcecf53e6..a635d1765 100644 --- a/app/admin/controller/Auth.php +++ b/app/admin/controller/Auth.php @@ -15,11 +15,8 @@ namespace app\admin\controller; -use app\admin\service\AuthService; -use app\admin\service\MenuService; -use app\admin\service\NodeService; use think\admin\Controller; -use think\Db; +use think\admin\service\AuthService; /** * 系统权限管理 @@ -112,7 +109,7 @@ class Auth extends Controller $action = strtolower(input('action', '')); if ($action === 'get') { $checkeds = $this->app->db->name('SystemAuthNode')->where($map)->column('node'); - $this->success('获取权限节点成功！', AuthService::getTree($checkeds)); + $this->success('获取权限节点成功！', AuthService::instance($this->app)->getTree($checkeds)); } elseif ($action === 'save') { list($post, $data) = [$this->request->post(), []]; foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) { @@ -120,7 +117,7 @@ class Auth extends Controller } $this->app->db->name('SystemAuthNode')->where($map)->delete(); $this->app->db->name('SystemAuthNode')->insertAll($data); - AuthService::apply(true); + AuthService::instance($this->app)->apply(true); $this->success('权限授权更新成功！', 'javascript:history.back()'); } else { $this->title = '权限配置节点'; diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php index 1de55bfd9..ef4d6d23f 100644 --- a/app/admin/controller/Config.php +++ b/app/admin/controller/Config.php @@ -48,7 +48,7 @@ class Config extends Controller * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function config() + public function system() { $this->_applyFormToken(); if ($this->request->isGet()) { diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 12ffd80e1..90887a8b3 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -15,10 +15,10 @@ namespace app\admin\controller; -use app\admin\service\AuthService; -use app\admin\service\MenuService; use think\admin\Controller; use think\admin\extend\DataExtend; +use think\admin\service\AuthService; +use think\admin\service\MenuService; /** * 后台界面入口 @@ -38,9 +38,9 @@ class Index extends Controller public function index() { $this->title = '系统管理后台'; - AuthService::apply(true); - $this->menus = MenuService::getTree(); - if (empty($this->menus) && !AuthService::isLogin()) { + AuthService::instance($this->app)->apply(true); + $this->menus = MenuService::instance($this->app)->getTree(); + if (empty($this->menus) && !AuthService::instance($this->app)->isLogin()) { $this->redirect(url('@admin/login')); } else { $this->fetch(); @@ -59,6 +59,7 @@ class Index extends Controller /** * 修改用户资料 + * @login true * @param integer $id 会员ID * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException @@ -66,9 +67,6 @@ class Index extends Controller */ public function info($id = 0) { - if (!AuthService::isLogin()) { - $this->error('需要登录才能操作哦！'); - } $this->_applyFormToken(); if (intval($this->app->session->get('user.id')) === intval($id)) { $this->_form('SystemUser', 'admin@user/form', 'id', [], ['id' => $id]); @@ -79,6 +77,7 @@ class Index extends Controller /** * 修改当前用户密码 + * @login true * @param integer $id * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException @@ -86,9 +85,6 @@ class Index extends Controller */ public function pass($id = 0) { - if (!AuthService::isLogin()) { - $this->error('需要登录才能操作哦！'); - } $this->_applyFormToken(); if (intval($this->app->session->get('user.id')) !== intval($id)) { $this->error('只能修改当前用户的密码！'); diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php index b6a043c79..bfb4e4b9c 100644 --- a/app/admin/controller/Login.php +++ b/app/admin/controller/Login.php @@ -15,9 +15,9 @@ namespace app\admin\controller; -use app\admin\service\AuthService; use think\admin\Controller; -use think\admin\extend\CaptchaExtend; +use think\admin\service\AuthService; +use think\admin\service\CaptchaService; /** * 用户登录管理 @@ -35,21 +35,21 @@ class Login extends Controller public function index() { if ($this->app->request->isGet()) { - if (AuthService::isLogin()) { + if (AuthService::instance($this->app)->isLogin()) { $this->redirect(url('@admin')->suffix(false)->build()); } else { $this->title = '系统登录'; $this->domain = $this->app->request->host(true); $this->devmode = in_array($this->domain, ['127.0.0.1', 'localhost']); $this->devmode = $this->devmode ?: is_numeric(stripos($this->domain, 'thinkadmin.top')); - $this->captcha = CaptchaExtend::instance(); + $this->captcha = CaptchaService::instance($this->app); $this->fetch(); } } elseif ($this->app->request->isPost()) { $data = ['username' => input('username'), 'password' => input('password')]; if (empty($data['username'])) $this->error('登录账号不能为空!'); if (empty($data['password'])) $this->error('登录密码不能为空!'); - if (!CaptchaExtend::check(input('verify'), input('uniqid'))) { + if (!CaptchaService::instance($this->app)->check(input('verify'), input('uniqid'))) { $this->error('图形验证码验证失败，请重新输入!'); } // 用户信息验证 @@ -80,7 +80,7 @@ class Login extends Controller */ public function captcha() { - $image = CaptchaExtend::instance(); + $image = CaptchaService::instance($this->app); $this->success('生成验证码成功', [ 'image' => $image->getData(), 'uniqid' => $image->getUniqid(), diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php index fbde8f4d9..b797c8339 100644 --- a/app/admin/controller/Menu.php +++ b/app/admin/controller/Menu.php @@ -15,9 +15,9 @@ namespace app\admin\controller; -use app\admin\service\MenuService; use think\admin\Controller; use think\admin\extend\DataExtend; +use think\admin\service\MenuService; /** * 系统菜单管理 @@ -111,7 +111,7 @@ class Menu extends Controller $vo['pid'] = $this->request->get('pid', '0'); } // 读取系统功能节点 - $this->nodes = MenuService::getList(); + $this->nodes = MenuService::instance($this->app)->getList(); } } diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php index 8af46eca2..deffbd0df 100644 --- a/app/admin/controller/Oplog.php +++ b/app/admin/controller/Oplog.php @@ -16,7 +16,6 @@ namespace app\admin\controller; use think\admin\Controller; -use think\Db; /** * 系统日志管理 diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index 3563c7ce3..b5a03f109 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -15,9 +15,9 @@ namespace app\admin\controller; -use app\admin\service\AuthService; use think\admin\Controller; use think\admin\extend\DataExtend; +use think\admin\service\AuthService; /** * 系统用户管理 @@ -111,7 +111,7 @@ class User extends Controller { if ($this->request->isPost()) { // 刷新系统授权 - AuthService::apply(); + AuthService::instance($this->app)->apply(); // 用户权限处理 $data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : ''; // 用户账号重复检查 diff --git a/app/admin/controller/api/Update.php b/app/admin/controller/api/Update.php index e88e7a7e1..8703b5f86 100644 --- a/app/admin/controller/api/Update.php +++ b/app/admin/controller/api/Update.php @@ -16,7 +16,7 @@ namespace app\admin\controller\api; use think\admin\Controller; -use think\admin\install\ExtendInstall; +use think\admin\service\InstallService; /** * 安装服务端支持 @@ -32,7 +32,7 @@ class Update extends Controller { $this->rules = unserialize($this->request->post('rules', 'a:0:{}', '')); $this->ignore = unserialize($this->request->post('ignore', 'a:0:{}', '')); - $this->success('获取文件列表成功！', ExtendInstall::instance($this->app)->getList($this->rules, $this->ignore)); + $this->success('获取文件列表成功！', InstallService::instance($this->app)->getList($this->rules, $this->ignore)); } /** diff --git a/app/admin/sys.php b/app/admin/sys.php index 42ce5641a..9e7d6ba64 100644 --- a/app/admin/sys.php +++ b/app/admin/sys.php @@ -1,4 +1,5 @@ db->name('SystemOplog')->insert([ - 'node' => NodeExtend::getCurrent(), + 'node' => NodeService::instance()->getCurrent(), 'action' => $action, 'content' => $content, 'geoip' => PHP_SAPI === 'cli' ? '127.0.0.1' : app()->request->ip(), 'username' => PHP_SAPI === 'cli' ? 'cli' : app()->session->get('user.username'), diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html index 888d2ac00..de2df9f66 100644 --- a/app/admin/view/config/index.html +++ b/app/admin/view/config/index.html @@ -5,7 +5,7 @@ {if auth('config')}
系统参数配置： - 修改系统配置 + 修改系统配置
{/if} diff --git a/app/admin/view/config/config.html b/app/admin/view/config/system.html similarity index 100% rename from app/admin/view/config/config.html rename to app/admin/view/config/system.html diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index b439b4f5e..7a070ebda 100644 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -1,9 +1,26 @@ =7.1.0", "ext-gd": "*", "ext-json": "*", + "ext-curl": "*", + "ext-iconv": "*", "topthink/framework": "^6.0", "topthink/think-view": "^1.0", "topthink/think-multi-app": "^1.0", diff --git a/composer.lock b/composer.lock index e0b7d8692..31d2262f6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "387856954688245acf7e8623d243fb5d", + "content-hash": "44a6bc247971794be9edd9df4f3dd0b9", "packages": [ { "name": "league/flysystem", @@ -783,12 +783,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "8fe807f96681e800b32c5fe775e2b92def2396d3" + "reference": "e561d021e18776a9851646236e6af556c77eec6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8fe807f96681e800b32c5fe775e2b92def2396d3", - "reference": "8fe807f96681e800b32c5fe775e2b92def2396d3", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e561d021e18776a9851646236e6af556c77eec6a", + "reference": "e561d021e18776a9851646236e6af556c77eec6a", "shasum": "", "mirrors": [ { @@ -832,7 +832,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-11-04T11:04:29+00:00" + "time": "2019-11-09T08:03:23+00:00" } ], "packages-dev": [], @@ -846,7 +846,9 @@ "platform": { "php": ">=7.1.0", "ext-gd": "*", - "ext-json": "*" + "ext-json": "*", + "ext-curl": "*", + "ext-iconv": "*" }, "platform-dev": [] } diff --git a/route/demo.php b/route/demo.php new file mode 100644 index 000000000..594ad978e --- /dev/null +++ b/route/demo.php @@ -0,0 +1,46 @@ +rootDomain(), ['ctolog.com', 'thinkadmin.top'])) { + $app = app(); + $app->route->post('admin/user/pass', function () { + return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']); + }); + $app->route->post('admin/index/pass', function () { + return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']); + }); + $app->route->post('admin/config/config', function () { + return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']); + }); + $app->route->post('admin/config/storage', function () { + return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']); + }); + $app->route->post('admin/menu/index', function () { + return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']); + }); + $app->route->post('admin/menu/add', function () { + return json(['code' => 0, 'info' => '演示环境禁止添加菜单！']); + }); + $app->route->post('admin/menu/edit', function () { + return json(['code' => 0, 'info' => '演示环境禁止编辑菜单！']); + }); + $app->route->post('admin/menu/state', function () { + return json(['code' => 0, 'info' => '演示环境禁止禁用菜单！']); + }); + $app->route->post('admin/menu/remove', function () { + return json(['code' => 0, 'info' => '演示环境禁止删除菜单！']); + }); +} diff --git a/vendor/autoload.php b/vendor/autoload.php index 873dc194f..cfa6b03af 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit31a52c657911214987b8ff9fa2a257af::getLoader(); +return ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 67f6c39a0..595f23c20 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -106,8 +106,6 @@ return array( 'app\\admin\\controller\\api\\Plugs' => $baseDir . '/app/admin/controller/api/Plugs.php', 'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => $baseDir . '/app/admin/controller/api/Upload.php', - 'app\\admin\\service\\AuthService' => $baseDir . '/app/admin/service/AuthService.php', - 'app\\admin\\service\\MenuService' => $baseDir . '/app/admin/service/MenuService.php', 'app\\index\\controller\\Index' => $baseDir . '/app/index/controller/Index.php', 'think\\App' => $vendorDir . '/topthink/framework/src/think/App.php', 'think\\Cache' => $vendorDir . '/topthink/framework/src/think/Cache.php', @@ -141,33 +139,36 @@ return array( 'think\\Validate' => $vendorDir . '/topthink/framework/src/think/Validate.php', 'think\\View' => $vendorDir . '/topthink/framework/src/think/View.php', 'think\\admin\\Controller' => $vendorDir . '/zoujingli/think-library/src/Controller.php', + 'think\\admin\\Helper' => $vendorDir . '/zoujingli/think-library/src/Helper.php', 'think\\admin\\Queue' => $vendorDir . '/zoujingli/think-library/src/Queue.php', + 'think\\admin\\Service' => $vendorDir . '/zoujingli/think-library/src/Service.php', 'think\\admin\\Storage' => $vendorDir . '/zoujingli/think-library/src/Storage.php', 'think\\admin\\ThinkLibrary' => $vendorDir . '/zoujingli/think-library/src/ThinkLibrary.php', - 'think\\admin\\extend\\CaptchaExtend' => $vendorDir . '/zoujingli/think-library/src/extend/CaptchaExtend.php', 'think\\admin\\extend\\CodeExtend' => $vendorDir . '/zoujingli/think-library/src/extend/CodeExtend.php', 'think\\admin\\extend\\CsvExtend' => $vendorDir . '/zoujingli/think-library/src/extend/CsvExtend.php', 'think\\admin\\extend\\DataExtend' => $vendorDir . '/zoujingli/think-library/src/extend/DataExtend.php', 'think\\admin\\extend\\ExpressExtend' => $vendorDir . '/zoujingli/think-library/src/extend/ExpressExtend.php', 'think\\admin\\extend\\HttpExtend' => $vendorDir . '/zoujingli/think-library/src/extend/HttpExtend.php', - 'think\\admin\\extend\\NodeExtend' => $vendorDir . '/zoujingli/think-library/src/extend/NodeExtend.php', 'think\\admin\\extend\\ProcessExtend' => $vendorDir . '/zoujingli/think-library/src/extend/ProcessExtend.php', - 'think\\admin\\extend\\TokenExtend' => $vendorDir . '/zoujingli/think-library/src/extend/TokenExtend.php', 'think\\admin\\helper\\DeleteHelper' => $vendorDir . '/zoujingli/think-library/src/helper/DeleteHelper.php', 'think\\admin\\helper\\FormHelper' => $vendorDir . '/zoujingli/think-library/src/helper/FormHelper.php', - 'think\\admin\\helper\\Helper' => $vendorDir . '/zoujingli/think-library/src/helper/Helper.php', 'think\\admin\\helper\\PageHelper' => $vendorDir . '/zoujingli/think-library/src/helper/PageHelper.php', 'think\\admin\\helper\\QueryHelper' => $vendorDir . '/zoujingli/think-library/src/helper/QueryHelper.php', 'think\\admin\\helper\\SaveHelper' => $vendorDir . '/zoujingli/think-library/src/helper/SaveHelper.php', 'think\\admin\\helper\\TokenHelper' => $vendorDir . '/zoujingli/think-library/src/helper/TokenHelper.php', 'think\\admin\\install\\CommandInstall' => $vendorDir . '/zoujingli/think-library/src/install/CommandInstall.php', - 'think\\admin\\install\\ExtendInstall' => $vendorDir . '/zoujingli/think-library/src/install/ExtendInstall.php', 'think\\admin\\queue\\ListenQueue' => $vendorDir . '/zoujingli/think-library/src/queue/ListenQueue.php', 'think\\admin\\queue\\QueryQueue' => $vendorDir . '/zoujingli/think-library/src/queue/QueryQueue.php', 'think\\admin\\queue\\StartQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StartQueue.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\\WorkQueue' => $vendorDir . '/zoujingli/think-library/src/queue/WorkQueue.php', + 'think\\admin\\service\\AuthService' => $vendorDir . '/zoujingli/think-library/src/service/AuthService.php', + 'think\\admin\\service\\CaptchaService' => $vendorDir . '/zoujingli/think-library/src/service/CaptchaService.php', + 'think\\admin\\service\\InstallService' => $vendorDir . '/zoujingli/think-library/src/service/InstallService.php', + 'think\\admin\\service\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php', + 'think\\admin\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php', + 'think\\admin\\service\\TokenService' => $vendorDir . '/zoujingli/think-library/src/service/TokenService.php', 'think\\admin\\storage\\LocalStorage' => $vendorDir . '/zoujingli/think-library/src/storage/LocalStorage.php', 'think\\admin\\storage\\QiniuStorage' => $vendorDir . '/zoujingli/think-library/src/storage/QiniuStorage.php', 'think\\app\\MultiApp' => $vendorDir . '/topthink/think-multi-app/src/MultiApp.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 06d7f7541..fb889ef4a 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit31a52c657911214987b8ff9fa2a257af +class ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit31a52c657911214987b8ff9fa2a257af return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit31a52c657911214987b8ff9fa2a257af', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit31a52c657911214987b8ff9fa2a257af', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit31a52c657911214987b8ff9fa2a257af::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit31a52c657911214987b8ff9fa2a257af $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit31a52c657911214987b8ff9fa2a257af::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire31a52c657911214987b8ff9fa2a257af($fileIdentifier, $file); + composerRequireb8e4029a37bf108c1da00ff988d7544f($fileIdentifier, $file); } return $loader; } } -function composerRequire31a52c657911214987b8ff9fa2a257af($fileIdentifier, $file) +function composerRequireb8e4029a37bf108c1da00ff988d7544f($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 4f51d24c6..4dd0adc26 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit31a52c657911214987b8ff9fa2a257af +class ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -197,8 +197,6 @@ class ComposerStaticInit31a52c657911214987b8ff9fa2a257af 'app\\admin\\controller\\api\\Plugs' => __DIR__ . '/../..' . '/app/admin/controller/api/Plugs.php', 'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => __DIR__ . '/../..' . '/app/admin/controller/api/Upload.php', - 'app\\admin\\service\\AuthService' => __DIR__ . '/../..' . '/app/admin/service/AuthService.php', - 'app\\admin\\service\\MenuService' => __DIR__ . '/../..' . '/app/admin/service/MenuService.php', 'app\\index\\controller\\Index' => __DIR__ . '/../..' . '/app/index/controller/Index.php', 'think\\App' => __DIR__ . '/..' . '/topthink/framework/src/think/App.php', 'think\\Cache' => __DIR__ . '/..' . '/topthink/framework/src/think/Cache.php', @@ -232,33 +230,36 @@ class ComposerStaticInit31a52c657911214987b8ff9fa2a257af 'think\\Validate' => __DIR__ . '/..' . '/topthink/framework/src/think/Validate.php', 'think\\View' => __DIR__ . '/..' . '/topthink/framework/src/think/View.php', 'think\\admin\\Controller' => __DIR__ . '/..' . '/zoujingli/think-library/src/Controller.php', + 'think\\admin\\Helper' => __DIR__ . '/..' . '/zoujingli/think-library/src/Helper.php', 'think\\admin\\Queue' => __DIR__ . '/..' . '/zoujingli/think-library/src/Queue.php', + 'think\\admin\\Service' => __DIR__ . '/..' . '/zoujingli/think-library/src/Service.php', 'think\\admin\\Storage' => __DIR__ . '/..' . '/zoujingli/think-library/src/Storage.php', 'think\\admin\\ThinkLibrary' => __DIR__ . '/..' . '/zoujingli/think-library/src/ThinkLibrary.php', - 'think\\admin\\extend\\CaptchaExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/CaptchaExtend.php', 'think\\admin\\extend\\CodeExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/CodeExtend.php', 'think\\admin\\extend\\CsvExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/CsvExtend.php', 'think\\admin\\extend\\DataExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/DataExtend.php', 'think\\admin\\extend\\ExpressExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/ExpressExtend.php', 'think\\admin\\extend\\HttpExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/HttpExtend.php', - 'think\\admin\\extend\\NodeExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/NodeExtend.php', 'think\\admin\\extend\\ProcessExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/ProcessExtend.php', - 'think\\admin\\extend\\TokenExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/TokenExtend.php', 'think\\admin\\helper\\DeleteHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/DeleteHelper.php', 'think\\admin\\helper\\FormHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/FormHelper.php', - 'think\\admin\\helper\\Helper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/Helper.php', 'think\\admin\\helper\\PageHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/PageHelper.php', 'think\\admin\\helper\\QueryHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/QueryHelper.php', 'think\\admin\\helper\\SaveHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/SaveHelper.php', 'think\\admin\\helper\\TokenHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/TokenHelper.php', 'think\\admin\\install\\CommandInstall' => __DIR__ . '/..' . '/zoujingli/think-library/src/install/CommandInstall.php', - 'think\\admin\\install\\ExtendInstall' => __DIR__ . '/..' . '/zoujingli/think-library/src/install/ExtendInstall.php', 'think\\admin\\queue\\ListenQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/ListenQueue.php', 'think\\admin\\queue\\QueryQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/QueryQueue.php', 'think\\admin\\queue\\StartQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StartQueue.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\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php', + 'think\\admin\\service\\AuthService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AuthService.php', + 'think\\admin\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php', + 'think\\admin\\service\\InstallService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/InstallService.php', + 'think\\admin\\service\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php', + 'think\\admin\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php', + 'think\\admin\\service\\TokenService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/TokenService.php', 'think\\admin\\storage\\LocalStorage' => __DIR__ . '/..' . '/zoujingli/think-library/src/storage/LocalStorage.php', 'think\\admin\\storage\\QiniuStorage' => __DIR__ . '/..' . '/zoujingli/think-library/src/storage/QiniuStorage.php', 'think\\app\\MultiApp' => __DIR__ . '/..' . '/topthink/think-multi-app/src/MultiApp.php', @@ -469,9 +470,9 @@ class ComposerStaticInit31a52c657911214987b8ff9fa2a257af public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit31a52c657911214987b8ff9fa2a257af::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit31a52c657911214987b8ff9fa2a257af::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit31a52c657911214987b8ff9fa2a257af::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 169f57177..ac1301f78 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -805,12 +805,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "8fe807f96681e800b32c5fe775e2b92def2396d3" + "reference": "e561d021e18776a9851646236e6af556c77eec6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8fe807f96681e800b32c5fe775e2b92def2396d3", - "reference": "8fe807f96681e800b32c5fe775e2b92def2396d3", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e561d021e18776a9851646236e6af556c77eec6a", + "reference": "e561d021e18776a9851646236e6af556c77eec6a", "shasum": "", "mirrors": [ { @@ -826,7 +826,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-11-04T11:04:29+00:00", + "time": "2019-11-09T08:03:23+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index efae33319..0f4a2b881 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/helper/Helper.php b/vendor/zoujingli/think-library/src/Helper.php similarity index 92% rename from vendor/zoujingli/think-library/src/helper/Helper.php rename to vendor/zoujingli/think-library/src/Helper.php index ec3c1e773..a1a11792e 100644 --- a/vendor/zoujingli/think-library/src/helper/Helper.php +++ b/vendor/zoujingli/think-library/src/Helper.php @@ -13,20 +13,18 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace think\admin\helper; +namespace think\admin; -use think\admin\Controller; use think\App; use think\db\Query; /** - * 基础管理器 + * 控制器挂件 * Class Helper - * @package think\admin\helper + * @package think\admin */ -class Helper +abstract class Helper { - /** * 当前应用容器 * @var App @@ -70,11 +68,10 @@ class Helper * 实例对象反射 * @param Controller $controller * @param App $app - * @return $this + * @return static */ public static function instance(Controller $controller, App $app) { return new static($controller, $app); } - -} +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/Service.php b/vendor/zoujingli/think-library/src/Service.php new file mode 100644 index 000000000..b756515d5 --- /dev/null +++ b/vendor/zoujingli/think-library/src/Service.php @@ -0,0 +1,70 @@ +app = $app; + $this->init(); + } + + /** + * 服务初始化 + */ + protected function init() + { + } + + /** + * 静态实例对象 + * @param App $app + * @return $this + */ + public static function instance(App $app = null) + { + if (is_null($app)) $app = app(); + $key = md5(get_called_class()); + if (!isset(self::$cache[$key])) { + self::$cache[$key] = new static($app); + } + return self::$cache[$key]; + } +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/ThinkLibrary.php b/vendor/zoujingli/think-library/src/ThinkLibrary.php index 98af01abd..6361ab819 100644 --- a/vendor/zoujingli/think-library/src/ThinkLibrary.php +++ b/vendor/zoujingli/think-library/src/ThinkLibrary.php @@ -15,6 +15,8 @@ namespace think\admin; +use think\admin\service\AuthService; +use think\middleware\SessionInit; use think\Request; use think\Service; @@ -31,7 +33,7 @@ class ThinkLibrary extends Service public function register() { // 注册会话中间键 - $this->app->middleware->add(\think\middleware\SessionInit::class); + $this->app->middleware->add(SessionInit::class); // 动态加入应用函数 foreach (glob($this->app->getAppPath() . '*/sys.php') as $file) { \Composer\Autoload\includeFile($file); @@ -43,7 +45,7 @@ class ThinkLibrary extends Service */ public function boot() { - // 注册访问跨域中间键 + // 注册访问中间键 $this->app->middleware->add(function (Request $request, \Closure $next) { $header = []; if (($origin = $request->header('origin', '*')) !== '*') { @@ -52,10 +54,15 @@ class ThinkLibrary extends Service $header['Access-Control-Allow-Headers'] = 'Authorization,Content-Type,If-Match,If-Modified-Since,If-None-Match,If-Unmodified-Since,X-Requested-With'; $header['Access-Control-Expose-Headers'] = 'User-Form-Token'; } + // 访问模式及访问权限检查 if ($request->isOptions()) { return response()->code(204)->header($header); - } else { + } elseif (AuthService::instance($this->app)->check()) { return $next($request)->header($header); + } elseif (AuthService::instance($this->app)->isLogin()) { + return json(['code' => 0, 'msg' => '抱歉，没有访问该操作的权限！'])->header($header); + } else { + return json(['code' => 0, 'msg' => '抱歉，需要登录获取访问权限！', 'url' => url('@admin/login')])->header($header); } }); // 注册系统任务指令 diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 720f98349..09239da27 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -15,7 +15,8 @@ use think\admin\extend\DataExtend; use think\admin\extend\HttpExtend; -use think\admin\extend\TokenExtend; +use think\admin\service\AuthService; +use think\admin\service\TokenService; use think\db\Query; if (!function_exists('p')) { @@ -27,12 +28,25 @@ if (!function_exists('p')) { */ function p($data, $replace = false, $file = null) { - if (is_null($file)) $file = env('runtime_path') . date('Ymd') . '.txt'; + if (is_null($file)) $file = app()->getRuntimePath() . date('Ymd') . '.txt'; $str = (is_string($data) ? $data : (is_array($data) || is_object($data)) ? print_r($data, true) : var_export($data, true)) . PHP_EOL; $replace ? file_put_contents($file, $str) : file_put_contents($file, $str, FILE_APPEND); } } +if (!function_exists('auth')) { + /** + * 访问权限检查 + * @param string $node + * @return boolean + * @throws ReflectionException + */ + function auth($node) + { + return AuthService::instance()->check($node); + } +} + if (!function_exists('systoken')) { /** * 生成 CSRF-TOKEN 参数 @@ -41,7 +55,7 @@ if (!function_exists('systoken')) { */ function systoken($node = null) { - return TokenExtend::buildFormToken($node)['token']; + return TokenService::instance()->buildFormToken($node)['token']; } } diff --git a/vendor/zoujingli/think-library/src/helper/DeleteHelper.php b/vendor/zoujingli/think-library/src/helper/DeleteHelper.php index fedd013da..722f3c7c7 100644 --- a/vendor/zoujingli/think-library/src/helper/DeleteHelper.php +++ b/vendor/zoujingli/think-library/src/helper/DeleteHelper.php @@ -15,6 +15,7 @@ namespace think\admin\helper; +use think\admin\Helper; use think\db\Query; /** diff --git a/vendor/zoujingli/think-library/src/helper/FormHelper.php b/vendor/zoujingli/think-library/src/helper/FormHelper.php index 9b392f9e8..b3bda10b3 100644 --- a/vendor/zoujingli/think-library/src/helper/FormHelper.php +++ b/vendor/zoujingli/think-library/src/helper/FormHelper.php @@ -16,6 +16,7 @@ namespace think\admin\helper; use think\admin\extend\DataExtend; +use think\admin\Helper; use think\db\Query; /** diff --git a/vendor/zoujingli/think-library/src/helper/PageHelper.php b/vendor/zoujingli/think-library/src/helper/PageHelper.php index f03dd74c2..b198fc48c 100644 --- a/vendor/zoujingli/think-library/src/helper/PageHelper.php +++ b/vendor/zoujingli/think-library/src/helper/PageHelper.php @@ -15,6 +15,7 @@ namespace think\admin\helper; +use think\admin\Helper; use think\db\Query; /** diff --git a/vendor/zoujingli/think-library/src/helper/QueryHelper.php b/vendor/zoujingli/think-library/src/helper/QueryHelper.php index 6c2093d8d..5f049783e 100644 --- a/vendor/zoujingli/think-library/src/helper/QueryHelper.php +++ b/vendor/zoujingli/think-library/src/helper/QueryHelper.php @@ -15,6 +15,7 @@ namespace think\admin\helper; +use think\admin\Helper; use think\db\Query; /** diff --git a/vendor/zoujingli/think-library/src/helper/SaveHelper.php b/vendor/zoujingli/think-library/src/helper/SaveHelper.php index 1f9c8fa46..475fb6223 100644 --- a/vendor/zoujingli/think-library/src/helper/SaveHelper.php +++ b/vendor/zoujingli/think-library/src/helper/SaveHelper.php @@ -15,6 +15,7 @@ namespace think\admin\helper; +use think\admin\Helper; use think\db\Query; /** diff --git a/vendor/zoujingli/think-library/src/helper/TokenHelper.php b/vendor/zoujingli/think-library/src/helper/TokenHelper.php index 548a62063..973d8e834 100644 --- a/vendor/zoujingli/think-library/src/helper/TokenHelper.php +++ b/vendor/zoujingli/think-library/src/helper/TokenHelper.php @@ -15,7 +15,8 @@ namespace think\admin\helper; -use think\admin\extend\TokenExtend; +use think\admin\Helper; +use think\admin\service\TokenService; use think\exception\HttpResponseException; /** @@ -40,7 +41,7 @@ class TokenHelper extends Helper { $this->class->csrf_state = true; $this->token = $this->app->request->header('user-form-token', input('_csrf_', '')); - if ($this->app->request->isPost() && !TokenExtend::checkFormToken($this->token)) { + if ($this->app->request->isPost() && !TokenService::instance($this->app)->checkFormToken($this->token)) { if ($return) return false; $this->class->error($this->class->csrf_message); } else { @@ -54,7 +55,7 @@ class TokenHelper extends Helper public function clear() { $this->token = $this->app->request->header('user-form-token', input('_csrf_', '')); - if (!empty($this->token)) TokenExtend::clearFormToken($this->token); + if (!empty($this->token)) TokenService::instance($this->app)->clearFormToken($this->token); } /** @@ -67,7 +68,7 @@ class TokenHelper extends Helper { throw new HttpResponseException(view($tpl, $vars, 200, function ($html) use ($node) { return preg_replace_callback('/<\/form>/i', function () use ($node) { - $csrf = TokenExtend::buildFormToken($node); + $csrf = TokenService::instance($this->app)->buildFormToken($node); return ""; }, $html); })); diff --git a/vendor/zoujingli/think-library/src/install/CommandInstall.php b/vendor/zoujingli/think-library/src/install/CommandInstall.php index b50851929..eef053ac1 100644 --- a/vendor/zoujingli/think-library/src/install/CommandInstall.php +++ b/vendor/zoujingli/think-library/src/install/CommandInstall.php @@ -15,6 +15,7 @@ namespace think\admin\install; +use think\admin\service\InstallService; use think\console\Command; use think\console\Input; use think\console\input\Argument; @@ -47,9 +48,9 @@ class CommandInstall extends Command /** * 插件工具实例 - * @var ExtendInstall + * @var InstallService */ - protected $extend; + protected $service; /** * 规则配置 @@ -83,7 +84,7 @@ class CommandInstall extends Command if (empty($this->name)) { $this->output->error('在线安装的模块名称不能为空！'); } else { - $this->extend = ExtendInstall::instance($this->app); + $this->service = InstallService::instance($this->app); if (isset($this->bind[$this->name])) { $this->rules = empty($this->bind[$this->name]['rules']) ? [] : $this->bind[$this->name]['rules']; $this->ignore = empty($this->bind[$this->name]['ignore']) ? [] : $this->bind[$this->name]['ignore']; @@ -97,10 +98,10 @@ class CommandInstall extends Command protected function installFile() { - $data = $this->extend->grenerateDifference($this->rules, $this->ignore); + $data = $this->service->grenerateDifference($this->rules, $this->ignore); if (empty($data)) $this->output->info('文件比对一致不需更新文件！'); else foreach ($data as $file) { - list($state, $mode, $name) = $this->extend->fileSynchronization($file); + list($state, $mode, $name) = $this->service->fileSynchronization($file); if ($state) { if ($mode === 'add') $this->output->info("--- 下载 {$name} 添加成功"); if ($mode === 'mod') $this->output->info("--- 下载 {$name} 更新成功"); diff --git a/app/admin/service/AuthService.php b/vendor/zoujingli/think-library/src/service/AuthService.php similarity index 68% rename from app/admin/service/AuthService.php rename to vendor/zoujingli/think-library/src/service/AuthService.php index 155126181..86b06bdc3 100644 --- a/app/admin/service/AuthService.php +++ b/vendor/zoujingli/think-library/src/service/AuthService.php @@ -13,26 +13,26 @@ // | github 代码仓库：https://github.com/zoujingli/ThinkAdmin // +---------------------------------------------------------------------- -namespace app\admin\service; +namespace think\admin\service; -use library\tools\Data; use think\admin\extend\DataExtend; -use think\admin\extend\NodeExtend; +use think\admin\Service; /** - * 系统授权服务 - * Class MenuService - * @package app\admin\service + * 系统权限管理服务 + * Class AuthService + * @package think\admin\service */ -class AuthService +class AuthService extends Service { + /** * 判断是否已经登录 * @return boolean */ - public static function isLogin() + public function isLogin() { - return app()->session->get('user.id') ? true : false; + return $this->app->session->get('user.id') ? true : false; } /** @@ -42,12 +42,13 @@ class AuthService * @return boolean * @throws \ReflectionException */ - public static function check($node = '') + public function check($node = '') { - if (app()->session->get('user.username') === 'admin') return true; - list($real, $nodes) = [NodeExtend::fullnode($node), NodeExtend::getMethods()]; + $service = NodeService::instance($this->app); + if ($this->app->session->get('user.username') === 'admin') return true; + list($real, $nodes) = [$service->fullnode($node), $service->getMethods()]; if (!empty($nodes[$real]['isauth'])) { - return in_array($real, app()->session->get('user.nodes', [])); + return in_array($real, $this->app->session->get('user.nodes', [])); } return !(!empty($nodes[$real]['islogin']) && !self::isLogin()); } @@ -58,9 +59,10 @@ class AuthService * @return array * @throws \ReflectionException */ - public static function getTree($checkeds = []) + public function getTree($checkeds = []) { - list($nodes, $pnodes, $methods) = [[], [], array_reverse(NodeExtend::getMethods())]; + list($nodes, $pnodes) = [[], []]; + $methods = array_reverse(NodeService::instance($this->app)->getMethods()); foreach ($methods as $node => $method) { $count = substr_count($node, '/'); $pnode = substr($node, 0, strripos($node, '/')); @@ -81,25 +83,24 @@ class AuthService /** * 初始化用户权限 - * @param boolean $force 是否重置系统权限 + * @param boolean $force 强刷权限 * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public static function apply($force = false) + public function apply($force = false) { - $app = app(); - if ($force) $app->cache->delete('system_auth_node'); - if (($uid = $app->session->get('user.id'))) { - $user = $app->db->name('SystemUser')->where(['id' => $uid])->find(); + if ($force) $this->app->cache->delete('system_auth_node'); + if (($uid = $this->app->session->get('user.id'))) { + $user = $this->app->db->name('SystemUser')->where(['id' => $uid])->find(); if (($aids = $user['authorize'])) { $where = [['status', 'eq', '1'], ['id', 'in', explode(',', $aids)]]; - $subsql = $app->db->name('SystemAuth')->field('id')->where($where)->buildSql(); - $user['nodes'] = array_unique($app->db->name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node')); - $app->session->set('user', $user); + $subsql = $this->app->db->name('SystemAuth')->field('id')->where($where)->buildSql(); + $user['nodes'] = array_unique($this->app->db->name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node')); + $this->app->session->set('user', $user); } else { $user['nodes'] = []; - $app->session->set('user', $user); + $this->app->session->set('user', $user); } } } diff --git a/vendor/zoujingli/think-library/src/extend/CaptchaExtend.php b/vendor/zoujingli/think-library/src/service/CaptchaService.php similarity index 88% rename from vendor/zoujingli/think-library/src/extend/CaptchaExtend.php rename to vendor/zoujingli/think-library/src/service/CaptchaService.php index d644d2f5e..082d994b8 100644 --- a/vendor/zoujingli/think-library/src/extend/CaptchaExtend.php +++ b/vendor/zoujingli/think-library/src/service/CaptchaService.php @@ -13,14 +13,16 @@ // | github 代码仓库：https://github.com/zoujingli/ThinkAdmin // +---------------------------------------------------------------------- -namespace think\admin\extend; +namespace think\admin\service; + +use think\admin\Service; /** - * 图形验证码扩展 - * Class CaptchaExtend - * @package app\admin\service + * 图形验证码服务 + * Class CaptchaService + * @package think\admin\service */ -class CaptchaExtend +class CaptchaService extends Service { private $code; // 验证码 private $uniqid; // 唯一序号 @@ -34,11 +36,10 @@ class CaptchaExtend private $fontcolor; // 指定字体颜色 /** - * 构造方法初始化 - * CaptchaService constructor. + * 服务初始化 * @param array $config */ - public function __construct($config = []) + protected function init($config = []) { // 动态配置属性 foreach ($config as $k => $v) if (isset($this->$k)) $this->$k = $v; @@ -52,7 +53,58 @@ class CaptchaExtend // 设置字体文件路径 $this->font = __DIR__ . '/bin/font.ttf'; // 缓存验证码字符串 - app()->cache->set($this->uniqid, $this->code, 360); + $this->app->cache->set($this->uniqid, $this->code, 360); + } + + /** + * 获取验证码值 + * @return string + */ + public function getCode() + { + return $this->code; + } + + /** + * 获取图片内容 + * @return string + */ + public function getData() + { + return "data:image/png;base64,{$this->createImage()}"; + } + + /** + * 获取验证码编号 + * @return string + */ + public function getUniqid() + { + return $this->uniqid; + } + + + /** + * 检查验证码是否正确 + * @param string $code 需要验证的值 + * @param string $uniqid 验证码编号 + * @return boolean + */ + public function check($code, $uniqid = null) + { + $_uni = is_string($uniqid) ? $uniqid : input('uniqid', '-'); + $_val = $this->app->cache->get($_uni); + $this->app->cache->delete($_uni); + return is_string($_val) && strtolower($_val) === strtolower($code); + } + + /** + * 输出图形验证码 + * @return string + */ + public function __toString() + { + return $this->getData(); } /** @@ -88,63 +140,4 @@ class CaptchaExtend imagedestroy($this->img); return base64_encode($data); } - - /** - * 获取验证码值 - * @return string - */ - public function getCode() - { - return $this->code; - } - - /** - * 获取图片内容 - * @return string - */ - public function getData() - { - return "data:image/png;base64,{$this->createImage()}"; - } - - /** - * 获取验证码编号 - * @return string - */ - public function getUniqid() - { - return $this->uniqid; - } - - /** - * 输出图形验证码 - * @return string - */ - public function __toString() - { - return $this->getData(); - } - - /** - * 返回当前对象 - * @return static - */ - public static function instance() - { - return new static(); - } - - /** - * 检查验证码是否正确 - * @param string $code 需要验证的值 - * @param string $uniqid 验证码编号 - * @return boolean - */ - public static function check($code, $uniqid = null) - { - $_uni = is_string($uniqid) ? $uniqid : input('uniqid', '-'); - $_val = app()->cache->get($_uni); - app()->cache->delete($_uni); - return is_string($_val) && strtolower($_val) === strtolower($code); - } -} +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/install/ExtendInstall.php b/vendor/zoujingli/think-library/src/service/InstallService.php similarity index 91% rename from vendor/zoujingli/think-library/src/install/ExtendInstall.php rename to vendor/zoujingli/think-library/src/service/InstallService.php index 3458467d0..3814694d5 100644 --- a/vendor/zoujingli/think-library/src/install/ExtendInstall.php +++ b/vendor/zoujingli/think-library/src/service/InstallService.php @@ -13,24 +13,18 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace think\admin\install; +namespace think\admin\service; use think\admin\extend\HttpExtend; -use think\App; +use think\admin\Service; /** - * 模块安装服务扩展 - * Class ExtendInstall - * @package think\admin\install + * 模块安装服务管理 + * Class InstallService + * @package think\admin\service */ -class ExtendInstall +class InstallService extends Service { - /** - * 当前应用 - * @var App - */ - private $app; - /** * 目录地址 * @var string @@ -62,31 +56,10 @@ class ExtendInstall protected $ignore = []; /** - * 当前实例 - * @var $this + * 服务初始化 */ - private static $class; - - /** - * 静态反射对象 - * @param App $app - * @return $this - */ - public static function instance(App $app) + protected function init() { - if (empty(self::$class)) { - self::$class = new static($app); - } - return self::$class; - } - - /** - * PlugsExtend constructor. - * @param App $app - */ - public function __construct(App $app) - { - $this->app = $app; // 应用框架版本 $this->version = $this->app->config->get('app.thinkadmin_ver'); if (empty($this->version)) $this->version = 'v4'; diff --git a/app/admin/service/MenuService.php b/vendor/zoujingli/think-library/src/service/MenuService.php similarity index 77% rename from app/admin/service/MenuService.php rename to vendor/zoujingli/think-library/src/service/MenuService.php index b0216d78c..f67b431cc 100644 --- a/app/admin/service/MenuService.php +++ b/vendor/zoujingli/think-library/src/service/MenuService.php @@ -13,29 +13,45 @@ // | github 代码仓库：https://github.com/zoujingli/ThinkAdmin // +---------------------------------------------------------------------- -namespace app\admin\service; +namespace think\admin\service; use think\admin\extend\DataExtend; -use think\admin\extend\NodeExtend; +use think\admin\Service; /** - * 系统菜单服务 + * 系统菜单管理服务 * Class MenuService * @package app\admin\service */ -class MenuService +class MenuService extends Service { + /** + * 应用节点服务 + * @var NodeService + */ + protected $nodeService; + + /** + * 服务初始化 + * @return $this + */ + protected function init() + { + $this->nodeService = NodeService::instance($this->app); + return $this; + } + /** * 获取可选菜单节点 * @return array * @throws \ReflectionException */ - public static function getList() + public function getList() { static $nodes = []; if (count($nodes) > 0) return $nodes; - foreach (NodeExtend::getMethods() as $node => $method) if ($method['ismenu']) { + foreach ($this->nodeService->getMethods() as $node => $method) if ($method['ismenu']) { $nodes[] = ['node' => $node, 'title' => $method['title']]; } return $nodes; @@ -49,10 +65,10 @@ class MenuService * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public static function getTree() + public function getTree() { $result = app()->db->name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select(); - return self::buildData(DataExtend::arr2tree($result->toArray()), NodeExtend::getMethods()); + return self::buildData(DataExtend::arr2tree($result->toArray()), $this->nodeService->getMethods()); } /** @@ -62,7 +78,7 @@ class MenuService * @return array * @throws \ReflectionException */ - private static function buildData($menus, $nodes) + private function buildData($menus, $nodes) { foreach ($menus as $key => &$menu) { if (!empty($menu['sub'])) { @@ -74,7 +90,7 @@ class MenuService 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::check($node)) unset($menus[$key]); + if (!AuthService::instance($this->app)->check($node)) unset($menus[$key]); } } return $menus; diff --git a/vendor/zoujingli/think-library/src/extend/NodeExtend.php b/vendor/zoujingli/think-library/src/service/NodeService.php similarity index 79% rename from vendor/zoujingli/think-library/src/extend/NodeExtend.php rename to vendor/zoujingli/think-library/src/service/NodeService.php index fc52a083c..d4da68302 100644 --- a/vendor/zoujingli/think-library/src/extend/NodeExtend.php +++ b/vendor/zoujingli/think-library/src/service/NodeService.php @@ -1,7 +1,7 @@ getNamespace(); - $middle = '\\' . self::nameTolower(app()->request->controller()); - $suffix = ($type === 'controller') ? '' : ('\\' . app()->request->action()); + $prefix = $this->app->getNamespace(); + $middle = '\\' . self::nameTolower($this->app->request->controller()); + $suffix = ($type === 'controller') ? '' : ('\\' . $this->app->request->action()); return strtr(substr($prefix, stripos($prefix, '\\') + 1) . $middle . $suffix, '\\', '/'); } @@ -55,7 +56,7 @@ class NodeExtend * @param string $node * @return string */ - public static function fullnode($node) + public function fullnode($node) { if (empty($node)) return self::getCurrent(); if (count($attrs = explode('/', $node)) === 1) { @@ -72,18 +73,18 @@ class NodeExtend * @return array * @throws \ReflectionException */ - public static function getMethods($force = false) + public function getMethods($force = false) { static $data = []; if (empty($force)) { if (count($data) > 0) return $data; - $data = app()->cache->get('system_auth_node', []); + $data = $this->app->cache->get('system_auth_node', []); if (count($data) > 0) return $data; } else { $data = []; } $ignore = get_class_methods('\think\admin\Controller'); - foreach (self::scanDirectory(dirname(app()->getAppPath())) as $file) { + foreach (self::scanDirectory(dirname($this->app->getAppPath())) as $file) { if (preg_match("|/(\w+)/(\w+)/controller/(.+)\.php$|i", $file, $matches)) { list(, $namespace, $application, $baseclass) = $matches; $class = new \ReflectionClass(strtr("{$namespace}/{$application}/controller/{$baseclass}", '/', '\\')); @@ -95,7 +96,7 @@ class NodeExtend } } } - app()->cache->set('system_auth_node', $data); + $this->app->cache->set('system_auth_node', $data); return $data; } @@ -105,7 +106,7 @@ class NodeExtend * @param string $default * @return array */ - private static function parseComment($comment, $default = '') + private function parseComment($comment, $default = '') { $text = strtr($comment, "\n", ' '); $title = preg_replace('/^\/\*\s*\*\s*\*\s*(.*?)\s*\*.*?$/', '$1', $text); @@ -124,7 +125,7 @@ class NodeExtend * @param string $ext 有文件后缀 * @return array */ - private static function scanDirectory($path, $data = [], $ext = 'php') + private function scanDirectory($path, $data = [], $ext = 'php') { foreach (glob("{$path}*") as $item) { if (is_dir($item)) { diff --git a/vendor/zoujingli/think-library/src/extend/TokenExtend.php b/vendor/zoujingli/think-library/src/service/TokenService.php similarity index 62% rename from vendor/zoujingli/think-library/src/extend/TokenExtend.php rename to vendor/zoujingli/think-library/src/service/TokenService.php index 9870832e8..60c01f073 100644 --- a/vendor/zoujingli/think-library/src/extend/TokenExtend.php +++ b/vendor/zoujingli/think-library/src/service/TokenService.php @@ -1,7 +1,7 @@ session->get($token, [])]; + $service = NodeService::instance($this->app); + list($node, $cache) = [$service->getCurrent(), $this->app->session->get($token, [])]; if (empty($cache['node']) || empty($cache['time']) || empty($cache['token'])) return false; if ($cache['token'] !== $token || $cache['time'] + 600 < time() || $cache['node'] !== $node) return false; return true; @@ -41,9 +42,9 @@ class TokenExtend * 清理表单CSRF信息 * @param string $name */ - public static function clearFormToken($name = null) + public function clearFormToken($name = null) { - app()->session->delete($name); + $this->app->session->delete($name); } /** @@ -51,16 +52,16 @@ class TokenExtend * @param null|string $node * @return array */ - public static function buildFormToken($node = null) + public function buildFormToken($node = null) { list($token, $time) = [uniqid('csrf'), time()]; - foreach (app()->session->all() as $key => $item) { + foreach ($this->app->session->all() as $key => $item) { if (stripos($key, 'csrf') === 0 && isset($item['time'])) { if ($item['time'] + 600 < $time) self::clearFormToken($key); } } - $data = ['node' => NodeExtend::fullnode($node), 'token' => $token, 'time' => $time]; - app()->session->set($token, $data); + $data = ['node' => NodeService::instance($this->app)->fullnode($node), 'token' => $token, 'time' => $time]; + $this->app->session->set($token, $data); return $data; } } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/service/bin/font.ttf b/vendor/zoujingli/think-library/src/service/bin/font.ttf new file mode 100644 index 0000000000000000000000000000000000000000..54a14ed1c367db3c2680109c712e15e886b3937c GIT binary patch literal 34852 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 c%R7_2IG>vddcb)xU-zgoC({L12w|r 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