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-18 19:37:10 +08:00
parent b63525d8fb
commit 0df129edd9
34 changed files with 103 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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($this->app)->getTree($checkeds)); $this->success('获取权限节点成功！', AuthService::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($this->app)->apply(true); AuthService::instance()->apply(true);
$this->success('权限授权更新成功！', 'javascript:history.back()'); $this->success('权限授权更新成功！', 'javascript:history.back()');
} else { } else {
$this->title = '权限配置节点'; $this->title = '权限配置节点';

7
app/admin/controller/Config.php
View File

@ -54,12 +54,13 @@ class Config extends Controller
if ($this->request->isGet()) { if ($this->request->isGet()) {
$this->title = '修改系统参数'; $this->title = '修改系统参数';
$this->fetch(); $this->fetch();
} } else {
foreach ($this->request->post() as $key => $value) { foreach ($this->request->post() as $name => $value) {
sysconf($key, $value); sysconf($name, $value);
} }
$this->success('修改系统参数成功！'); $this->success('修改系统参数成功！');
} }
}
/** /**
* 修改文件存储 * 修改文件存储

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

@ -38,9 +38,9 @@ class Index extends Controller
public function index() public function index()
{ {
$this->title = '系统管理后台'; $this->title = '系统管理后台';
AuthService::instance($this->app)->apply(true); AuthService::instance()->apply(true);
$this->menus = MenuService::instance($this->app)->getTree(); $this->menus = MenuService::instance()->getTree();
if (empty($this->menus) && !AuthService::instance($this->app)->isLogin()) { if (empty($this->menus) && !AuthService::instance()->isLogin()) {
$this->redirect(url('@admin/login')); $this->redirect(url('@admin/login'));
} else { } else {
$this->fetch(); $this->fetch();
@ -107,7 +107,7 @@ class Index extends Controller
if (md5($data['oldpassword']) !== $user['password']) { if (md5($data['oldpassword']) !== $user['password']) {
$this->error('旧密码验证失败，请重新输入！'); $this->error('旧密码验证失败，请重新输入！');
} }
if (DataExtend::save('SystemUser', ['id' => $user['id'], 'password' => md5($data['password'])])) { if (data_save('SystemUser', ['id' => $user['id'], 'password' => md5($data['password'])])) {
$this->success('密码修改成功，下次请使用新密码登录！', ''); $this->success('密码修改成功，下次请使用新密码登录！', '');
} else { } else {
$this->error('密码修改失败，请稍候再试！'); $this->error('密码修改失败，请稍候再试！');

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

@ -35,21 +35,21 @@ class Login extends Controller
public function index() public function index()
{ {
if ($this->app->request->isGet()) { if ($this->app->request->isGet()) {
if (AuthService::instance($this->app)->isLogin()) { if (AuthService::instance()->isLogin()) {
$this->redirect(url('@admin')->suffix(false)->build()); $this->redirect(url('@admin')->suffix(false)->build());
} else { } else {
$this->title = '系统登录'; $this->title = '系统登录';
$this->domain = $this->app->request->host(true); $this->domain = $this->app->request->host(true);
$this->devmode = in_array($this->domain, ['127.0.0.1', 'localhost']); $this->devmode = in_array($this->domain, ['127.0.0.1', 'localhost']);
$this->devmode = $this->devmode ?: is_numeric(stripos($this->domain, 'thinkadmin.top')); $this->devmode = $this->devmode ?: is_numeric(stripos($this->domain, 'thinkadmin.top'));
$this->captcha = CaptchaService::instance($this->app); $this->captcha = CaptchaService::instance();
$this->fetch(); $this->fetch();
} }
} elseif ($this->app->request->isPost()) { } elseif ($this->app->request->isPost()) {
$data = ['username' => input('username'), 'password' => input('password')]; $data = ['username' => input('username'), 'password' => input('password')];
if (empty($data['username'])) $this->error('登录账号不能为空!'); if (empty($data['username'])) $this->error('登录账号不能为空!');
if (empty($data['password'])) $this->error('登录密码不能为空!'); if (empty($data['password'])) $this->error('登录密码不能为空!');
if (!CaptchaService::instance($this->app)->check(input('verify'), input('uniqid'))) { if (!CaptchaService::instance()->check(input('verify'), input('uniqid'))) {
$this->error('图形验证码验证失败，请重新输入!'); $this->error('图形验证码验证失败，请重新输入!');
} }
// 用户信息验证 // 用户信息验证
@ -80,7 +80,7 @@ class Login extends Controller
*/ */
public function captcha() public function captcha()
{ {
$image = CaptchaService::instance($this->app); $image = CaptchaService::instance();
$this->success('生成验证码成功', [ $this->success('生成验证码成功', [
'image' => $image->getData(), 'image' => $image->getData(),
'uniqid' => $image->getUniqid(), 'uniqid' => $image->getUniqid(),

2
app/admin/controller/Menu.php
View File

@ -111,7 +111,7 @@ class Menu extends Controller
$vo['pid'] = $this->request->get('pid', '0'); $vo['pid'] = $this->request->get('pid', '0');
} }
// 读取系统功能节点 // 读取系统功能节点
$this->nodes = MenuService::instance($this->app)->getList(); $this->nodes = MenuService::instance()->getList();
} }
} }

2
app/admin/controller/Queue.php
View File

@ -44,8 +44,8 @@ class Queue extends Controller
{ {
if ($this->app->session->get('user.username') === 'admin') { if ($this->app->session->get('user.username') === 'admin') {
try { try {
$this->command = ProcessService::instance()->think('xtask:start');
$this->message = $this->app->console->call('xtask:state')->fetch(); $this->message = $this->app->console->call('xtask:state')->fetch();
$this->command = ProcessService::instance($this->app)->think('xtask:start');
} catch (\Exception $exception) { } catch (\Exception $exception) {
$this->message = $exception->getMessage(); $this->message = $exception->getMessage();
} }

3
app/admin/controller/User.php
View File

@ -17,7 +17,6 @@ namespace app\admin\controller;
use think\admin\Controller; use think\admin\Controller;
use think\admin\extend\DataExtend; use think\admin\extend\DataExtend;
use think\admin\service\AuthService;
/** /**
* 系统用户管理 * 系统用户管理
@ -110,8 +109,6 @@ class User extends Controller
protected function _form_filter(&$data) protected function _form_filter(&$data)
{ {
if ($this->request->isPost()) { if ($this->request->isPost()) {
// 刷新系统授权
AuthService::instance($this->app)->apply();
// 用户权限处理 // 用户权限处理
$data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : ''; $data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : '';
// 用户账号重复检查 // 用户账号重复检查

4
app/admin/controller/api/Update.php
View File

@ -32,11 +32,11 @@ class Update extends Controller
{ {
$this->rules = unserialize($this->request->post('rules', 'a:0:{}', '')); $this->rules = unserialize($this->request->post('rules', 'a:0:{}', ''));
$this->ignore = unserialize($this->request->post('ignore', 'a:0:{}', '')); $this->ignore = unserialize($this->request->post('ignore', 'a:0:{}', ''));
$this->success('获取文件列表成功！', InstallService::instance($this->app)->getList($this->rules, $this->ignore)); $this->success('获取文件列表成功！', InstallService::instance()->getList($this->rules, $this->ignore));
} }
/** /**
* 读取线上文件数据 * 读取文件内容
*/ */
public function get() public function get()
{ {

2
app/admin/controller/api/Upload.php
View File

@ -41,7 +41,7 @@ class Upload extends Controller
$exts = array_intersect($diff1, $diff2); $exts = array_intersect($diff1, $diff2);
$this->success('获取文件上传参数', [ $this->success('获取文件上传参数', [
'type' => $this->getType(), 'data' => $this->getData(), 'type' => $this->getType(), 'data' => $this->getData(),
'exts' => join('|', $exts), 'mine' => Storage::mime($exts), 'exts' => join('|', $exts), 'mime' => Storage::mime($exts),
]); ]);
} }

2
app/admin/sys.php
View File

@ -45,7 +45,7 @@ if (!function_exists('sysoplog')) {
{ {
$app = app(); $app = app();
return $app->db->name('SystemOplog')->insert([ return $app->db->name('SystemOplog')->insert([
'node' => \think\admin\service\NodeService::instance($app)->getCurrent(), 'node' => \think\admin\service\NodeService::instance()->getCurrent(),
'geoip' => $app->request->isCli() ? '127.0.0.1' : $app->request->ip(), 'geoip' => $app->request->isCli() ? '127.0.0.1' : $app->request->ip(),
'action' => $action, 'content' => $content, 'action' => $action, 'content' => $content,
'username' => $app->request->isCli() ? 'cli' : $app->session->get('user.username', ''), 'username' => $app->request->isCli() ? 'cli' : $app->session->get('user.username', ''),

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": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd" "reference": "fedc488cd0d8c8799b8e5620945c0d739a58cbd5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c05c1ddf0a710dee48791bb7989b1bb3a79a20cd", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/fedc488cd0d8c8799b8e5620945c0d739a58cbd5",
"reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd", "reference": "fedc488cd0d8c8799b8e5620945c0d739a58cbd5",
"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-13T10:54:48+00:00" "time": "2019-11-18T10:46:44+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],

2
public/static/plugs/jquery/uploader.js vendored
View File

@ -5,7 +5,7 @@ define(function () {
// 检查可以上传的文件后缀 // 检查可以上传的文件后缀
$.form.load('?s=admin/api.upload/check', {exts: exts, uptype: uptype}, 'post', function (ret, options) { $.form.load('?s=admin/api.upload/check', {exts: exts, uptype: uptype}, 'post', function (ret, options) {
options = {url: ret.data.data.url, exts: ret.data.exts, acceptMime: ret.data.mine, data: ret.data.data}; options = {url: ret.data.data.url, exts: ret.data.exts, acceptMime: ret.data.mime, data: ret.data.data};
if (exts.indexOf('*') > -1) delete options.exts, delete options.acceptMime; if (exts.indexOf('*') > -1) delete options.exts, delete options.acceptMime;
return renderUploader(options), false; return renderUploader(options), false;
}, false, false, 0); }, false, false, 0);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b::getLoader(); return ComposerAutoloaderInit5a743c9cd506240941dde8cfe27e723d::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b class ComposerAutoloaderInit5a743c9cd506240941dde8cfe27e723d
{ {
private static $loader; private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInit5a743c9cd506240941dde8cfe27e723d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInit5a743c9cd506240941dde8cfe27e723d', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) { if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit0ebda76f49a312d0931869f268c1812b::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::getInitializer($loader));
} else { } else {
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b
$loader->register(true); $loader->register(true);
if ($useStaticLoader) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$files; $includeFiles = Composer\Autoload\ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
} }
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire0ebda76f49a312d0931869f268c1812b($fileIdentifier, $file); composerRequire5a743c9cd506240941dde8cfe27e723d($fileIdentifier, $file);
} }
return $loader; return $loader;
} }
} }
function composerRequire0ebda76f49a312d0931869f268c1812b($fileIdentifier, $file) function composerRequire5a743c9cd506240941dde8cfe27e723d($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file; require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInit0ebda76f49a312d0931869f268c1812b class ComposerStaticInit5a743c9cd506240941dde8cfe27e723d
{ {
public static $files = array ( public static $files = array (
'9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@ -470,9 +470,9 @@ class ComposerStaticInit0ebda76f49a312d0931869f268c1812b
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$classMap; $loader->classMap = ComposerStaticInit5a743c9cd506240941dde8cfe27e723d::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

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": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd" "reference": "fedc488cd0d8c8799b8e5620945c0d739a58cbd5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c05c1ddf0a710dee48791bb7989b1bb3a79a20cd", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/fedc488cd0d8c8799b8e5620945c0d739a58cbd5",
"reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd", "reference": "fedc488cd0d8c8799b8e5620945c0d739a58cbd5",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -826,7 +826,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2019-11-13T10:54:48+00:00", "time": "2019-11-18T10:46:44+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-14 15:35:17 // This file is automatically generated at:2019-11-18 19:31:02
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

19
vendor/zoujingli/think-library/src/Controller.php vendored
View File

@ -21,6 +21,7 @@ use think\admin\helper\PageHelper;
use think\admin\helper\QueryHelper; use think\admin\helper\QueryHelper;
use think\admin\helper\SaveHelper; use think\admin\helper\SaveHelper;
use think\admin\helper\TokenHelper; use think\admin\helper\TokenHelper;
use think\admin\service\NodeService;
use think\App; use think\App;
use think\db\exception\DataNotFoundException; use think\db\exception\DataNotFoundException;
use think\db\exception\DbException; use think\db\exception\DbException;
@ -69,6 +70,8 @@ class Controller extends \stdClass
{ {
$this->app = $app; $this->app = $app;
$this->request = $app->request; $this->request = $app->request;
$this->app->bind('think\admin\Controller', $this);
TokenHelper::instance();
if (in_array($this->app->request->action(), get_class_methods(__CLASS__))) { if (in_array($this->app->request->action(), get_class_methods(__CLASS__))) {
$this->error('Access without permission.'); $this->error('Access without permission.');
} }
@ -104,7 +107,7 @@ class Controller extends \stdClass
public function success($info, $data = [], $code = 1) public function success($info, $data = [], $code = 1)
{ {
if ($this->csrf_state) { if ($this->csrf_state) {
TokenHelper::instance($this, $this->app)->clear(); TokenHelper::instance()->clear();
} }
throw new HttpResponseException(json([ throw new HttpResponseException(json([
'code' => $code, 'info' => $info, 'data' => $data, 'code' => $code, 'info' => $info, 'data' => $data,
@ -131,7 +134,7 @@ class Controller extends \stdClass
{ {
foreach ($this as $name => $value) $vars[$name] = $value; foreach ($this as $name => $value) $vars[$name] = $value;
if ($this->csrf_state) { if ($this->csrf_state) {
TokenHelper::instance($this, $this->app)->fetchTemplate($tpl, $vars, $node); TokenHelper::instance()->fetchTemplate($tpl, $vars, $node);
} else { } else {
throw new HttpResponseException(view($tpl, $vars)); throw new HttpResponseException(view($tpl, $vars));
} }
@ -182,7 +185,7 @@ class Controller extends \stdClass
*/ */
protected function _query($dbQuery) protected function _query($dbQuery)
{ {
return QueryHelper::instance($this, $this->app)->init($dbQuery); return QueryHelper::instance()->init($dbQuery);
} }
/** /**
@ -199,7 +202,7 @@ class Controller extends \stdClass
*/ */
protected function _page($dbQuery, $page = true, $display = true, $total = false, $limit = 0) protected function _page($dbQuery, $page = true, $display = true, $total = false, $limit = 0)
{ {
return PageHelper::instance($this, $this->app)->init($dbQuery, $page, $display, $total, $limit); return PageHelper::instance()->init($dbQuery, $page, $display, $total, $limit);
} }
/** /**
@ -216,7 +219,7 @@ class Controller extends \stdClass
*/ */
protected function _form($dbQuery, $template = '', $field = '', $where = [], $data = []) protected function _form($dbQuery, $template = '', $field = '', $where = [], $data = [])
{ {
return FormHelper::instance($this, $this->app)->init($dbQuery, $template, $field, $where, $data); return FormHelper::instance()->init($dbQuery, $template, $field, $where, $data);
} }
/** /**
@ -230,7 +233,7 @@ class Controller extends \stdClass
*/ */
protected function _save($dbQuery, $data = [], $field = '', $where = []) protected function _save($dbQuery, $data = [], $field = '', $where = [])
{ {
return SaveHelper::instance($this, $this->app)->init($dbQuery, $data, $field, $where); return SaveHelper::instance()->init($dbQuery, $data, $field, $where);
} }
/** /**
@ -243,7 +246,7 @@ class Controller extends \stdClass
*/ */
protected function _delete($dbQuery, $field = '', $where = []) protected function _delete($dbQuery, $field = '', $where = [])
{ {
return DeleteHelper::instance($this, $this->app)->init($dbQuery, $field, $where); return DeleteHelper::instance()->init($dbQuery, $field, $where);
} }
/** /**
@ -253,7 +256,7 @@ class Controller extends \stdClass
*/ */
protected function _applyFormToken($return = false) protected function _applyFormToken($return = false)
{ {
return TokenHelper::instance($this, $this->app)->init($return); return TokenHelper::instance()->init($return);
} }
} }

8
vendor/zoujingli/think-library/src/Helper.php vendored
View File

@ -16,6 +16,7 @@
namespace think\admin; namespace think\admin;
use think\App; use think\App;
use think\Container;
use think\db\Query; use think\db\Query;
/** /**
@ -66,12 +67,11 @@ abstract class Helper
/** /**
* 实例对象反射 * 实例对象反射
* @param Controller $controller * @param array $args 额外参数
* @param App $app
* @return static * @return static
*/ */
public static function instance(Controller $controller, App $app) public static function instance($args = [])
{ {
return new static($controller, $app); return Container::getInstance()->invokeClass(static::class, $args);
} }
} }

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

@ -46,7 +46,7 @@ class Library extends Service
public function boot() public function boot()
{ {
// 注册访问中间键 // 注册访问中间键
if (stripos('get,post,options', $this->app->request->method()) !== false) { if (!$this->app->request->isCli()) {
$this->app->middleware->add(function (Request $request, \Closure $next) { $this->app->middleware->add(function (Request $request, \Closure $next) {
$header = []; $header = [];
if (($origin = $request->header('origin', '*')) !== '*') { if (($origin = $request->header('origin', '*')) !== '*') {
@ -58,9 +58,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($this->app)->check()) { } elseif (AuthService::instance()->check()) {
return $next($request)->code(200)->header($header); return $next($request)->code(200)->header($header);
} elseif (AuthService::instance($this->app)->isLogin()) { } elseif (AuthService::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);

16
vendor/zoujingli/think-library/src/Service.php vendored
View File

@ -16,6 +16,7 @@
namespace think\admin; namespace think\admin;
use think\App; use think\App;
use think\Container;
/** /**
* 自定义服务接口 * 自定义服务接口
@ -42,29 +43,24 @@ abstract class Service
*/ */
public function __construct(App $app) public function __construct(App $app)
{ {
$this->app = $app; $this->app = $app;
$this->init(); $this->initialize();
} }
/** /**
* 服务初始化 * 服务初始化
*/ */
protected function init() protected function initialize()
{ {
} }
/** /**
* 静态实例对象 * 静态实例对象
* @param App $app
* @return static * @return static
*/ */
public static function instance(App $app = null) public static function instance()
{ {
if (is_null($app)) $app = app(); return Container::getInstance()->make(static::class);
$key = md5(get_called_class());
if (!isset(self::$cache[$key])) {
self::$cache[$key] = new static($app);
}
return self::$cache[$key];
} }
} }

43
vendor/zoujingli/think-library/src/Storage.php vendored
View File

@ -18,6 +18,8 @@ namespace think\admin;
use think\admin\storage\LocalStorage; use think\admin\storage\LocalStorage;
use think\admin\storage\QiniuStorage; use think\admin\storage\QiniuStorage;
use think\App; use think\App;
use think\Container;
use think\Exception;
/** /**
* 文件存储引擎管理 * 文件存储引擎管理
@ -32,7 +34,7 @@ use think\App;
* @method string set($name, $content, $safe = false) static 文件储存 * @method string set($name, $content, $safe = false) static 文件储存
* @method string upload() static 上传目录地址 * @method string upload() static 上传目录地址
*/ */
class Storage abstract class Storage
{ {
/** /**
* 应用实例 * 应用实例
@ -46,18 +48,13 @@ class Storage
*/ */
protected $prefix; protected $prefix;
/**
* 存储对象缓存
* @var array
*/
protected static $object = [];
/** /**
* Storage constructor. * Storage constructor.
* @param App $app
*/ */
public function __construct() public function __construct(App $app)
{ {
$this->app = app(); $this->app = $app;
$this->initialize(); $this->initialize();
} }
@ -69,41 +66,41 @@ class Storage
} }
/** /**
* 静态访问 * 静态访问启用
* @param string $method 方法名称 * @param string $method 方法名称
* @param array $arguments 调用参数 * @param array $arguments 调用参数
* @return mixed * @return mixed
* @throws \think\Exception * @throws Exception
* @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
*/ */
public static function __callStatic($method, $arguments) public static function __callStatic($method, $arguments)
{ {
$class = self::instance(); if (method_exists($class = self::instance(), $method)) {
if (method_exists($class, $method)) return call_user_func_array([$class, $method], $arguments); return call_user_func_array([$class, $method], $arguments);
throw new \think\Exception("method not exists: " . get_class($class) . "->{$method}()"); } else {
throw new Exception("method not exists: " . get_class($class) . "->{$method}()");
}
} }
/** /**
* 设置文件驱动名称 * 设置文件驱动名称
* @param string $name 驱动名称 * @param string $name 驱动名称
* @return LocalStorage|QiniuStorage|static * @return LocalStorage|QiniuStorage|static
* @throws \think\Exception * @throws Exception
* @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
*/ */
public static function instance($name = null) public static function instance($name = null)
{ {
if (is_null($name)) $name = sysconf('storage.type'); $class = ucfirst(strtolower(is_null($name) ? sysconf('storage.type') : $name));
if (isset(self::$object[$class = ucfirst(strtolower($name))])) { if (class_exists($object = "think\\admin\\storage\\{$class}Storage")) {
return self::$object[$class]; return Container::getInstance()->make($object);
} else {
throw new Exception("File driver [{$class}] does not exist.");
} }
if (class_exists($object = __NAMESPACE__ . "\\storage\\{$class}Storage")) {
return self::$object[$class] = new $object;
}
throw new \think\Exception("File driver [{$class}] does not exist.");
} }
/** /**
@ -133,7 +130,7 @@ class Storage
{ {
$mimes = self::mimes(); $mimes = self::mimes();
foreach (is_string($exts) ? explode(',', $exts) : $exts as $e) { foreach (is_string($exts) ? explode(',', $exts) : $exts as $e) {
$mime[] = isset($mimes[strtolower($e)]) ? $mimes[strtolower($e)] : 'application/octet-stream'; $mime[] = isset($mimes[strtolower($e)]) ? $mimes[strtolower($e)] : '';
} }
return join(',', array_unique($mime)); return join(',', array_unique($mime));
} }

2
vendor/zoujingli/think-library/src/command/Install.php vendored
View File

@ -92,7 +92,7 @@ class Install extends Command
protected function installFile() protected function installFile()
{ {
$service = InstallService::instance($this->app); $service = InstallService::instance();
$data = $service->grenerateDifference($this->rules, $this->ignore); $data = $service->grenerateDifference($this->rules, $this->ignore);
if (empty($data)) $this->output->info('文件比对一致不需更新文件！'); if (empty($data)) $this->output->info('文件比对一致不需更新文件！');
else foreach ($data as $file) { else foreach ($data as $file) {

2
vendor/zoujingli/think-library/src/helper/QueryHelper.php vendored
View File

@ -222,6 +222,6 @@ class QueryHelper extends Helper
*/ */
public function page($isPage = true, $isDisplay = true, $total = false, $limit = 0) public function page($isPage = true, $isDisplay = true, $total = false, $limit = 0)
{ {
return PageHelper::instance($this->class, $this->app)->init($this->query, $isPage, $isDisplay, $total, $limit); return PageHelper::instance()->init($this->query, $isPage, $isDisplay, $total, $limit);
} }
} }

2
vendor/zoujingli/think-library/src/helper/TokenHelper.php vendored
View File

@ -35,7 +35,7 @@ class TokenHelper extends Helper
public function init($return = false) public function init($return = false)
{ {
$this->class->csrf_state = true; $this->class->csrf_state = true;
if ($this->app->request->isPost() && !TokenService::instance($this->app)->checkFormToken()) { if ($this->app->request->isPost() && !TokenService::instance()->checkFormToken()) {
if ($return) return false; if ($return) return false;
$this->class->error($this->class->csrf_message); $this->class->error($this->class->csrf_message);
} else { } else {

2
vendor/zoujingli/think-library/src/queue/QueryQueue.php vendored
View File

@ -42,7 +42,7 @@ class QueryQueue extends Command
*/ */
protected function execute(Input $input, Output $output) protected function execute(Input $input, Output $output)
{ {
$process = ProcessService::instance($this->app); $process = ProcessService::instance();
$result = $process->query($process->think("xtask:")); $result = $process->query($process->think("xtask:"));
if (count($result) > 0) foreach ($result as $item) { if (count($result) > 0) foreach ($result as $item) {
$output->writeln("{$item['pid']}\t{$item['cmd']}"); $output->writeln("{$item['pid']}\t{$item['cmd']}");

2
vendor/zoujingli/think-library/src/queue/StartQueue.php vendored
View File

@ -44,7 +44,7 @@ class StartQueue extends Command
protected function execute(Input $input, Output $output) protected function execute(Input $input, Output $output)
{ {
$this->app->db->name('SystemQueue')->count(); $this->app->db->name('SystemQueue')->count();
$process = ProcessService::instance($this->app); $process = ProcessService::instance();
$command = $process->think("xtask:listen"); $command = $process->think("xtask:listen");
if (count($result = $process->query($command)) > 0) { if (count($result = $process->query($command)) > 0) {
$output->info("异步任务监听主进程{$result['0']['pid']}已经启动！"); $output->info("异步任务监听主进程{$result['0']['pid']}已经启动！");

2
vendor/zoujingli/think-library/src/queue/StateQueue.php vendored
View File

@ -42,7 +42,7 @@ class StateQueue extends Command
*/ */
protected function execute(Input $input, Output $output) protected function execute(Input $input, Output $output)
{ {
$process = ProcessService::instance($this->app); $process = ProcessService::instance();
$command = $process->think('xtask:listen'); $command = $process->think('xtask:listen');
if (count($result = $process->query($command)) > 0) { if (count($result = $process->query($command)) > 0) {
$output->info("异步任务监听主进程{$result[0]['pid']}正在运行..."); $output->info("异步任务监听主进程{$result[0]['pid']}正在运行...");

2
vendor/zoujingli/think-library/src/queue/StopQueue.php vendored
View File

@ -43,7 +43,7 @@ class StopQueue extends Command
*/ */
protected function execute(Input $input, Output $output) protected function execute(Input $input, Output $output)
{ {
$process = ProcessService::instance($this->app); $process = ProcessService::instance();
$command = $process->think('xtask:'); $command = $process->think('xtask:');
if (count($result = $process->query($command)) < 1) { if (count($result = $process->query($command)) < 1) {
$output->writeln("没有需要结束的任务进程哦！"); $output->writeln("没有需要结束的任务进程哦！");

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

@ -21,6 +21,7 @@ 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;
use think\Container;
/** /**
* 启动独立执行进程 * 启动独立执行进程
@ -66,7 +67,7 @@ class WorkQueue extends Command
$queue = $this->app->db->name('SystemQueue')->where(['code' => $this->code, 'status' => '2'])->find(); $queue = $this->app->db->name('SystemQueue')->where(['code' => $this->code, 'status' => '2'])->find();
if (empty($queue)) throw new \think\Exception("执行任务{$this->code}的信息或状态异常！");; if (empty($queue)) throw new \think\Exception("执行任务{$this->code}的信息或状态异常！");;
// 设置进程标题 // 设置进程标题
if (($process = ProcessService::instance($this->app))->iswin()) { if (($process = ProcessService::instance())->iswin()) {
$this->setProcessTitle("ThinkAdmin {$process->version()} 执行任务 - {$queue['title']}"); $this->setProcessTitle("ThinkAdmin {$process->version()} 执行任务 - {$queue['title']}");
} }
// 执行任务内容 // 执行任务内容

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

@ -44,7 +44,7 @@ class AuthService extends Service
*/ */
public function check($node = '') public function check($node = '')
{ {
$service = NodeService::instance($this->app); $service = NodeService::instance();
if ($this->app->session->get('user.username') === 'admin') return true; if ($this->app->session->get('user.username') === 'admin') return true;
list($real, $nodes) = [$service->fullnode($node), $service->getMethods()]; list($real, $nodes) = [$service->fullnode($node), $service->getMethods()];
if (!empty($nodes[$real]['isauth'])) { if (!empty($nodes[$real]['isauth'])) {
@ -63,7 +63,7 @@ class AuthService extends Service
public function getTree($checkeds = []) public function getTree($checkeds = [])
{ {
list($nodes, $pnodes) = [[], []]; list($nodes, $pnodes) = [[], []];
$methods = array_reverse(NodeService::instance($this->app)->getMethods()); $methods = array_reverse(NodeService::instance()->getMethods());
foreach ($methods as $node => $method) { foreach ($methods as $node => $method) {
$count = substr_count($node, '/'); $count = substr_count($node, '/');
$pnode = substr($node, 0, strripos($node, '/')); $pnode = substr($node, 0, strripos($node, '/'));

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

@ -39,7 +39,7 @@ class CaptchaService extends Service
* 服务初始化 * 服务初始化
* @param array $config * @param array $config
*/ */
protected function init($config = []) protected function initialize($config = [])
{ {
// 动态配置属性 // 动态配置属性
foreach ($config as $k => $v) if (isset($this->$k)) $this->$k = $v; foreach ($config as $k => $v) if (isset($this->$k)) $this->$k = $v;
@ -83,7 +83,6 @@ class CaptchaService extends Service
return $this->uniqid; return $this->uniqid;
} }
/** /**
* 检查验证码是否正确 * 检查验证码是否正确
* @param string $code 需要验证的值 * @param string $code 需要验证的值

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

@ -58,7 +58,7 @@ class InstallService extends Service
/** /**
* 服务初始化 * 服务初始化
*/ */
protected function init() protected function initialize()
{ {
// 应用框架版本 // 应用框架版本
$this->version = $this->app->config->get('app.thinkadmin_ver'); $this->version = $this->app->config->get('app.thinkadmin_ver');

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

@ -36,9 +36,9 @@ class MenuService extends Service
* 服务初始化 * 服务初始化
* @return $this * @return $this
*/ */
protected function init() protected function initialize()
{ {
$this->nodeService = NodeService::instance($this->app); $this->nodeService = NodeService::instance();
return $this; return $this;
} }
@ -67,7 +67,7 @@ class MenuService extends Service
*/ */
public function getTree() public function getTree()
{ {
$result = app()->db->name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select(); $result = $this->app->db->name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select();
return $this->buildData(DataExtend::arr2tree($result->toArray()), $this->nodeService->getMethods()); return $this->buildData(DataExtend::arr2tree($result->toArray()), $this->nodeService->getMethods());
} }