diff --git a/application/admin/view/menu/index.html b/application/admin/view/menu/index.html index e30a24ad0..3a274567f 100644 --- a/application/admin/view/menu/index.html +++ b/application/admin/view/menu/index.html @@ -13,7 +13,7 @@ {/block} {block name="content"} -
+
{empty name='list'}
没 有 记 录 哦！
{else} diff --git a/composer.json b/composer.json index 357929f04..a29311e1f 100644 --- a/composer.json +++ b/composer.json @@ -22,5 +22,11 @@ "zoujingli/ip2region": "^1.0", "zoujingli/think-library": "5.1.*-dev", "zoujingli/weopen-developer": "dev-master" + }, + "repositories": { + "packagist": { + "type": "composer", + "url": "https://mirrors.aliyun.com/composer" + } } } diff --git a/config/database.php b/config/database.php index aec3af1b8..a0e7bb4fd 100644 --- a/config/database.php +++ b/config/database.php @@ -19,7 +19,7 @@ return [ // 数据库类型 'type' => 'mysql', // 服务器地址 - 'hostname' => '127.0.0.1', + 'hostname' => 'server.cuci.cc', // 数据库名 'database' => 'admin_v5', // 用户名 diff --git a/vendor/autoload.php b/vendor/autoload.php index 07fed98fe..b6fad30b2 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitb049d9827cf74891bcac9ffe3dae65b9::getLoader(); +return ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 4b6e17f8c..17313be5a 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -188,6 +188,8 @@ return array( 'WePay\\TransfersBank' => $vendorDir . '/zoujingli/wechat-developer/WePay/TransfersBank.php', 'library\\Controller' => $vendorDir . '/zoujingli/think-library/src/Controller.php', 'library\\File' => $vendorDir . '/zoujingli/think-library/src/File.php', + 'library\\Helper' => $vendorDir . '/zoujingli/think-library/src/Helper.php', + 'library\\Service' => $vendorDir . '/zoujingli/think-library/src/Service.php', 'library\\command\\Sess' => $vendorDir . '/zoujingli/think-library/src/command/Sess.php', 'library\\command\\Sync' => $vendorDir . '/zoujingli/think-library/src/command/Sync.php', 'library\\command\\Task' => $vendorDir . '/zoujingli/think-library/src/command/Task.php', @@ -203,13 +205,15 @@ return array( 'library\\driver\\Local' => $vendorDir . '/zoujingli/think-library/src/driver/Local.php', 'library\\driver\\Oss' => $vendorDir . '/zoujingli/think-library/src/driver/Oss.php', 'library\\driver\\Qiniu' => $vendorDir . '/zoujingli/think-library/src/driver/Qiniu.php', - 'library\\logic\\Delete' => $vendorDir . '/zoujingli/think-library/src/logic/Delete.php', - 'library\\logic\\Form' => $vendorDir . '/zoujingli/think-library/src/logic/Form.php', - 'library\\logic\\Input' => $vendorDir . '/zoujingli/think-library/src/logic/Input.php', - 'library\\logic\\Logic' => $vendorDir . '/zoujingli/think-library/src/logic/Logic.php', - 'library\\logic\\Page' => $vendorDir . '/zoujingli/think-library/src/logic/Page.php', - 'library\\logic\\Query' => $vendorDir . '/zoujingli/think-library/src/logic/Query.php', - 'library\\logic\\Save' => $vendorDir . '/zoujingli/think-library/src/logic/Save.php', + 'library\\helper\\DeleteHelper' => $vendorDir . '/zoujingli/think-library/src/helper/DeleteHelper.php', + 'library\\helper\\FormHelper' => $vendorDir . '/zoujingli/think-library/src/helper/FormHelper.php', + 'library\\helper\\InputHelper' => $vendorDir . '/zoujingli/think-library/src/helper/InputHelper.php', + 'library\\helper\\PageHelper' => $vendorDir . '/zoujingli/think-library/src/helper/PageHelper.php', + 'library\\helper\\QueryHelper' => $vendorDir . '/zoujingli/think-library/src/helper/QueryHelper.php', + 'library\\helper\\SaveHelper' => $vendorDir . '/zoujingli/think-library/src/helper/SaveHelper.php', + 'library\\helper\\TokenHelper' => $vendorDir . '/zoujingli/think-library/src/helper/TokenHelper.php', + 'library\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php', + 'library\\service\\TokenService' => $vendorDir . '/zoujingli/think-library/src/service/TokenService.php', 'library\\tools\\Crypt' => $vendorDir . '/zoujingli/think-library/src/tools/Crypt.php', 'library\\tools\\Csrf' => $vendorDir . '/zoujingli/think-library/src/tools/Csrf.php', 'library\\tools\\Csv' => $vendorDir . '/zoujingli/think-library/src/tools/Csv.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 9d10b1f00..00a263e99 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitb049d9827cf74891bcac9ffe3dae65b9 +class ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitb049d9827cf74891bcac9ffe3dae65b9 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitb049d9827cf74891bcac9ffe3dae65b9', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitb049d9827cf74891bcac9ffe3dae65b9', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitf6b2a415c4f4503704bb8d12031deb95', '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\ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitb049d9827cf74891bcac9ffe3dae65b9 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequireb049d9827cf74891bcac9ffe3dae65b9($fileIdentifier, $file); + composerRequiref6b2a415c4f4503704bb8d12031deb95($fileIdentifier, $file); } return $loader; } } -function composerRequireb049d9827cf74891bcac9ffe3dae65b9($fileIdentifier, $file) +function composerRequiref6b2a415c4f4503704bb8d12031deb95($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 a89df4742..66fed5087 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9 +class ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -281,6 +281,8 @@ class ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9 'WePay\\TransfersBank' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/TransfersBank.php', 'library\\Controller' => __DIR__ . '/..' . '/zoujingli/think-library/src/Controller.php', 'library\\File' => __DIR__ . '/..' . '/zoujingli/think-library/src/File.php', + 'library\\Helper' => __DIR__ . '/..' . '/zoujingli/think-library/src/Helper.php', + 'library\\Service' => __DIR__ . '/..' . '/zoujingli/think-library/src/Service.php', 'library\\command\\Sess' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/Sess.php', 'library\\command\\Sync' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/Sync.php', 'library\\command\\Task' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/Task.php', @@ -296,13 +298,15 @@ class ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9 'library\\driver\\Local' => __DIR__ . '/..' . '/zoujingli/think-library/src/driver/Local.php', 'library\\driver\\Oss' => __DIR__ . '/..' . '/zoujingli/think-library/src/driver/Oss.php', 'library\\driver\\Qiniu' => __DIR__ . '/..' . '/zoujingli/think-library/src/driver/Qiniu.php', - 'library\\logic\\Delete' => __DIR__ . '/..' . '/zoujingli/think-library/src/logic/Delete.php', - 'library\\logic\\Form' => __DIR__ . '/..' . '/zoujingli/think-library/src/logic/Form.php', - 'library\\logic\\Input' => __DIR__ . '/..' . '/zoujingli/think-library/src/logic/Input.php', - 'library\\logic\\Logic' => __DIR__ . '/..' . '/zoujingli/think-library/src/logic/Logic.php', - 'library\\logic\\Page' => __DIR__ . '/..' . '/zoujingli/think-library/src/logic/Page.php', - 'library\\logic\\Query' => __DIR__ . '/..' . '/zoujingli/think-library/src/logic/Query.php', - 'library\\logic\\Save' => __DIR__ . '/..' . '/zoujingli/think-library/src/logic/Save.php', + 'library\\helper\\DeleteHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/DeleteHelper.php', + 'library\\helper\\FormHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/FormHelper.php', + 'library\\helper\\InputHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/InputHelper.php', + 'library\\helper\\PageHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/PageHelper.php', + 'library\\helper\\QueryHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/QueryHelper.php', + 'library\\helper\\SaveHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/SaveHelper.php', + 'library\\helper\\TokenHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/TokenHelper.php', + 'library\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php', + 'library\\service\\TokenService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/TokenService.php', 'library\\tools\\Crypt' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Crypt.php', 'library\\tools\\Csrf' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Csrf.php', 'library\\tools\\Csv' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Csv.php', @@ -321,9 +325,9 @@ class ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitb049d9827cf74891bcac9ffe3dae65b9::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitf6b2a415c4f4503704bb8d12031deb95::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 5c68788d3..4726fdc2f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -12,7 +12,13 @@ "type": "zip", "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/053d7ba9e798e4c09b9c5c1edab153d25ea9643a", "reference": "053d7ba9e798e4c09b9c5c1edab153d25ea9643a", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3" @@ -55,7 +61,13 @@ "type": "zip", "url": "https://api.github.com/repos/endroid/qr-code/zipball/c9644bec2a9cc9318e98d1437de3c628dcd1ef93", "reference": "c9644bec2a9cc9318e98d1437de3c628dcd1ef93", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-gd": "*", @@ -117,7 +129,13 @@ "type": "zip", "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8", "reference": "d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3" @@ -170,7 +188,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b224d20be60e6f7b55cd66914379a13a0b28651a", "reference": "b224d20be60e6f7b55cd66914379a13a0b28651a", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^5.5.9|>=7.0.8" @@ -226,7 +250,13 @@ "type": "zip", "url": "https://api.github.com/repos/top-think/framework/zipball/5762858f3d58faafb3a39427f8788884b2927007", "reference": "5762858f3d58faafb3a39427f8788884b2927007", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.6.0", @@ -279,7 +309,13 @@ "type": "zip", "url": "https://api.github.com/repos/top-think/think-installer/zipball/f5400a12c60e513911aef41fe443fa6920952675", "reference": "f5400a12c60e513911aef41fe443fa6920952675", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "composer-plugin-api": "^1.0" @@ -322,7 +358,13 @@ "type": "zip", "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/f898a7d90cfacd54433de4028190c336164f2ae4", "reference": "f898a7d90cfacd54433de4028190c336164f2ae4", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3" @@ -359,13 +401,19 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "6dbcbc8ae1bcca6b18db58085deaa8f918b242da" + "reference": "dc8e618ca3f06652f402a67fc80e8fd8b775a7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6dbcbc8ae1bcca6b18db58085deaa8f918b242da", - "reference": "6dbcbc8ae1bcca6b18db58085deaa8f918b242da", - "shasum": "" + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/dc8e618ca3f06652f402a67fc80e8fd8b775a7ed", + "reference": "dc8e618ca3f06652f402a67fc80e8fd8b775a7ed", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "aliyuncs/oss-sdk-php": "^2.3", @@ -377,7 +425,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-11-20T07:43:10+00:00", + "time": "2019-11-25T08:22:25+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -408,7 +456,13 @@ "type": "zip", "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/39d53dd91040517a01d7c7423235f56b47deefa3", "reference": "39d53dd91040517a01d7c7423235f56b47deefa3", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-curl": "*", @@ -468,7 +522,13 @@ "type": "zip", "url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/4d0d3c064e54556621453845fc65ba52de58a880", "reference": "4d0d3c064e54556621453845fc65ba52de58a880", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-curl": "*", diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php index 7f0fdf286..e0ea53d6a 100644 --- a/vendor/zoujingli/think-library/src/Controller.php +++ b/vendor/zoujingli/think-library/src/Controller.php @@ -15,23 +15,33 @@ namespace library; -use library\logic\Delete; -use library\logic\Form; -use library\logic\Input; -use library\logic\Page; -use library\logic\Query; -use library\logic\Save; -use library\tools\Csrf; +use library\helper\DeleteHelper; +use library\helper\FormHelper; +use library\helper\InputHelper; +use library\helper\PageHelper; +use library\helper\QueryHelper; +use library\helper\SaveHelper; +use library\helper\TokenHelper; +use think\App; +use think\Container; +use think\db\Query; use think\exception\HttpResponseException; +use think\Validate; /** * 标准控制器基类 - * -------------------------------- * Class Controller + * @package library */ class Controller extends \stdClass { + /** + * 当前应用实例 + * @var App + */ + public $app; + /** * 当前请求对象 * @var \think\Request @@ -42,20 +52,23 @@ class Controller extends \stdClass * 表单CSRF验证状态 * @var boolean */ - private $csrf_state = false; + public $csrf_state = false; /** * 表单CSRF验证失败提示消息 * @var string */ - protected $csrf_message = '表单令牌验证失败，请刷新页面再试！'; + public $csrf_message = '表单令牌验证失败，请刷新页面再试！'; /** * Controller constructor. + * @param App $app */ - public function __construct() + public function __construct(App $app) { - $this->request = request(); + $this->app = $app; + $this->request = $app->request; + Container::set('library\Controller', $this); if (in_array($this->request->action(), get_class_methods(__CLASS__))) { $this->error('Access without permission.'); } @@ -94,9 +107,12 @@ class Controller extends \stdClass */ public function success($info, $data = [], $code = 1) { - $result = ['code' => $code, 'info' => $info, 'data' => $data]; - if ($this->csrf_state) Csrf::clearFormToken(Csrf::getToken()); - throw new HttpResponseException(json($result)); + if ($this->csrf_state) { + TokenHelper::instance()->clear(); + } + throw new HttpResponseException(json([ + 'code' => $code, 'info' => $info, 'data' => $data, + ])); } /** @@ -120,7 +136,7 @@ class Controller extends \stdClass { foreach ($this as $name => $value) $vars[$name] = $value; if ($this->csrf_state) { - Csrf::fetchTemplate($tpl, $vars, $node); + TokenHelper::instance()->fetchTemplate($tpl, $vars, $node); } else { throw new HttpResponseException(view($tpl, $vars)); } @@ -155,10 +171,8 @@ class Controller extends \stdClass return call_user_func($name, $this, $one, $two); } foreach ([$name, "_{$this->request->action()}{$name}"] as $method) { - if (method_exists($this, $method)) { - if (false === $this->$method($one, $two)) { - return false; - } + if (method_exists($this, $method)) if (false === $this->$method($one, $two)) { + return false; } } return true; @@ -171,76 +185,90 @@ class Controller extends \stdClass */ protected function applyCsrfToken($return = false) { - $this->csrf_state = true; - if ($this->request->isPost() && !Csrf::checkFormToken()) { - if ($return) return false; - $this->error($this->csrf_message); - } else { - return true; - } + return TokenHelper::instance()->init($return); } /** * 快捷查询逻辑器 - * @param string|\think\db\Query $dbQuery + * @param string|Query $dbQuery * @return Query */ protected function _query($dbQuery) { - return (new Query($dbQuery))->init($this); + return QueryHelper::instance()->init($dbQuery); } /** * 快捷分页逻辑器 - * @param string|\think\db\Query $dbQuery + * @param string|Query $dbQuery * @param boolean $isPage 是否启用分页 * @param boolean $isDisplay 是否渲染模板 * @param boolean $total 集合分页记录数 * @param integer $limit 集合每页记录数 * @return array - * @throws \think\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - * @throws \think\exception\PDOException */ protected function _page($dbQuery, $isPage = true, $isDisplay = true, $total = false, $limit = 0) { - return (new Page($dbQuery, $isPage, $isDisplay, $total, $limit))->init($this); + return PageHelper::instance()->init($dbQuery, $isPage, $isDisplay, $total, $limit); } /** * 快捷表单逻辑器 - * @param string|\think\db\Query $dbQuery + * @param string|Query $dbQuery * @param string $tpl 模板名称 * @param string $pkField 指定数据对象主键 * @param array $where 额外更新条件 * @param array $data 表单扩展数据 * @return array|boolean - * @throws \think\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - * @throws \think\exception\PDOException */ protected function _form($dbQuery, $tpl = '', $pkField = '', $where = [], $data = []) { - return (new Form($dbQuery, $tpl, $pkField, $where, $data))->init($this); + return FormHelper::instance()->init($dbQuery, $tpl, $pkField, $where, $data); } /** * 快捷更新逻辑器 - * @param string|\think\db\Query $dbQuery + * @param string|Query $dbQuery * @param array $data 表单扩展数据 * @param string $pkField 数据对象主键 * @param array $where 额外更新条件 * @return boolean - * @throws \think\Exception - * @throws \think\exception\PDOException */ protected function _save($dbQuery, $data = [], $pkField = '', $where = []) { - return (new Save($dbQuery, $data, $pkField, $where))->init($this); + return SaveHelper::instance()->init($dbQuery, $data, $pkField, $where); + } + + /** + * 快捷输入并验证（ 支持 规则 # 别名 ） + * @param array $rules 验证规则（ 验证信息数组 ） + * @param string $type 输入方式 ( post. 或 get. ) + * @return array + */ + protected function _vali(array $rules, $type = '') + { + list($data, $rule, $info) = [[], [], []]; + foreach ($rules as $name => $message) { + if (stripos($name, '#') !== false) { + list($name, $alias) = explode('#', $name); + } + if (stripos($name, '.') === false) { + $data[$name] = empty($alias) ? $name : $alias; + } else { + list($_rgx) = explode(':', $name); + list($_key, $_rule) = explode('.', $name); + $info[$_rgx] = $message; + $data[$_key] = empty($alias) ? $_key : $alias; + $rule[$_key] = empty($rule[$_key]) ? $_rule : "{$rule[$_key]}|{$_rule}"; + } + } + foreach ($data as $key => $name) $data[$key] = input("{$type}{$name}"); + $validate = Validate::make($rule, $info); + if ($validate->check($data)) { + return $this->data; + } else { + $this->error($validate->getError()); + } } /** @@ -252,21 +280,19 @@ class Controller extends \stdClass */ protected function _input($data, $rule = [], $info = []) { - return (new Input($data, $rule, $info))->init($this); + return InputHelper::instance()->init($data, $rule, $info); } /** * 快捷删除逻辑器 - * @param string|\think\db\Query $dbQuery + * @param string|Query $dbQuery * @param string $pkField 数据对象主键 * @param array $where 额外更新条件 * @return boolean|null - * @throws \think\Exception - * @throws \think\exception\PDOException */ protected function _delete($dbQuery, $pkField = '', $where = []) { - return (new Delete($dbQuery, $pkField, $where))->init($this); + return DeleteHelper::instance()->init($dbQuery, $pkField, $where); } } diff --git a/vendor/zoujingli/think-library/src/Helper.php b/vendor/zoujingli/think-library/src/Helper.php new file mode 100644 index 000000000..53a49e062 --- /dev/null +++ b/vendor/zoujingli/think-library/src/Helper.php @@ -0,0 +1,78 @@ +app = $app; + $this->controller = $controller; + } + + /** + * 获取数据库对象 + * @param string|Query $dbQuery + * @return Query + */ + protected function buildQuery($dbQuery) + { + return is_string($dbQuery) ? Db::name($dbQuery) : $dbQuery; + } + + /** + * 实例对象反射 + * @param array $args 额外参数 + * @return Helper + */ + public static function instance(array $args = []) + { + return Container::getInstance()->invokeClass(static::class, $args); + } + +} \ 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..d4513a1d2 --- /dev/null +++ b/vendor/zoujingli/think-library/src/Service.php @@ -0,0 +1,70 @@ +app = $app; + $this->request = $request; + } + + /** + * 初始化服务 + * @return $this + */ + public function initialize() + { + return $this; + } + + /** + * 静态实例对象 + * @return static + */ + public static function instance() + { + return Container::getInstance()->make(static::class)->initialize(); + } + +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 8fde00936..f59f1df73 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -99,7 +99,7 @@ if (!function_exists('sysconf')) { if (!function_exists('systoken')) { /** - * 生成CSRF-TOKEN参数 + * 生成 CSRF-TOKEN 参数 * @param string $node * @return string */ @@ -112,7 +112,7 @@ if (!function_exists('systoken')) { if (!function_exists('http_get')) { /** - * 以get模拟网络请求 + * 以 get 模拟网络请求 * @param string $url HTTP请求URL地址 * @param array $query GET请求参数 * @param array $options CURL参数 @@ -126,7 +126,7 @@ if (!function_exists('http_get')) { if (!function_exists('http_post')) { /** - * 以get模拟网络请求 + * 以 post 模拟网络请求 * @param string $url HTTP请求URL地址 * @param array $data POST请求数据 * @param array $options CURL参数 @@ -232,24 +232,26 @@ if (!function_exists('emoji_clear')) { } } -try { +if (PHP_SAPI !== 'cli') { // 注册跨域中间键 - if (PHP_SAPI !== 'cli') { - Middleware::add(function (Request $request, \Closure $next, $header = []) { - if (($origin = $request->header('origin', '*')) !== '*') { - $header['Access-Control-Allow-Origin'] = $origin; - $header['Access-Control-Allow-Methods'] = 'GET,POST,PATCH,PUT,DELETE'; - $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-Token-Csrf'; - } - if ($request->isOptions()) { - return Response::create()->code(204)->header($header); - } else { - return $next($request)->header($header); - } - }); - } - // 注册系统常用指令 + Middleware::add(function (Request $request, \Closure $next, $header = []) { + if (($origin = $request->header('origin', '*')) !== '*') { + $header['Access-Control-Allow-Origin'] = $origin; + $header['Access-Control-Allow-Methods'] = 'GET,POST,PATCH,PUT,DELETE'; + $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-Token-Csrf'; + } + if ($request->isOptions()) { + return Response::create()->code(204)->header($header); + } else { + return $next($request)->header($header); + } + }); +} + + +// 注册系统常用指令 +if (class_exists('think\Console')) { Console::addDefaultCommands([ 'library\command\Sess', 'library\command\task\Stop', @@ -261,7 +263,6 @@ try { 'library\command\sync\Wechat', 'library\command\sync\Service', ]); -} catch (\Exception $exception) { } // 动态加载模块配置 diff --git a/vendor/zoujingli/think-library/src/logic/Delete.php b/vendor/zoujingli/think-library/src/helper/DeleteHelper.php similarity index 81% rename from vendor/zoujingli/think-library/src/logic/Delete.php rename to vendor/zoujingli/think-library/src/helper/DeleteHelper.php index 6ec567d75..f653f54ca 100644 --- a/vendor/zoujingli/think-library/src/logic/Delete.php +++ b/vendor/zoujingli/think-library/src/helper/DeleteHelper.php @@ -13,19 +13,18 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace library\logic; +namespace library\helper; -use library\Controller; +use library\Helper; use think\db\Query; /** * 通用删除管理器 - * Class Delete - * @package library\logic + * Class DeleteHelper + * @package library\helper */ -class Delete extends Logic +class DeleteHelper extends Helper { - /** * 表单额外更新条件 * @var array @@ -44,30 +43,21 @@ class Delete extends Logic */ protected $pkValue; - /** - * Delete constructor. - * @param string|Query $dbQuery - * @param string $pkField 数据对象主键 - * @param array $where 额外更新条件 - */ - public function __construct($dbQuery, $pkField = '', $where = []) - { - $this->where = $where; - $this->query = $this->buildQuery($dbQuery); - $this->pkField = empty($pkField) ? $this->query->getPk() : $pkField; - $this->pkValue = request()->post($this->pkField, null); - } - /** * 逻辑器初始化 - * @param Controller $controller + * @param string|Query $dbQuery + * @param string $field 操作数据主键 + * @param array $where 额外更新条件 * @return boolean|null * @throws \think\Exception * @throws \think\exception\PDOException */ - public function init(Controller $controller) + public function init($dbQuery, $field = '', $where = []) { - $this->controller = $controller; + $this->where = $where; + $this->query = $this->buildQuery($dbQuery); + $this->pkField = empty($field) ? $this->query->getPk() : $field; + $this->pkValue = $this->app->request->post($this->pkField, null); // 主键限制处理 if (!isset($this->where[$this->pkField]) && is_string($this->pkValue)) { $this->query->whereIn($this->pkField, explode(',', $this->pkValue)); @@ -93,5 +83,4 @@ class Delete extends Logic $this->controller->error('数据删除失败, 请稍候再试！'); } } - -} +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/helper/FormHelper.php b/vendor/zoujingli/think-library/src/helper/FormHelper.php new file mode 100644 index 000000000..3c084b9b3 --- /dev/null +++ b/vendor/zoujingli/think-library/src/helper/FormHelper.php @@ -0,0 +1,86 @@ +where = $where; + $this->query = $this->buildQuery($dbQuery); + $this->pkField = empty($field) ? $this->query->getPk() : $field; + $this->pkValue = $this->app->request->post($this->pkField, null); + // 主键限制处理 + if (!isset($this->where[$this->pkField]) && is_string($this->pkValue)) { + $this->query->whereIn($this->pkField, explode(',', $this->pkValue)); + } + // 前置回调处理 + if (false === $this->controller->callback('_delete_filter', $this->query, $where)) { + return null; + } + // 执行删除操作 + if (method_exists($this->query, 'getTableFields') && in_array('is_deleted', $this->query->getTableFields())) { + $result = $this->query->where($this->where)->update(['is_deleted' => '1']); + } else { + $result = $this->query->where($this->where)->delete(); + } + // 结果回调处理 + if (false === $this->controller->callback('_delete_result', $result)) { + return $result; + } + // 回复前端结果 + if ($result !== false) { + $this->controller->success('数据删除成功！', ''); + } else { + $this->controller->error('数据删除失败, 请稍候再试！'); + } + } +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/logic/Input.php b/vendor/zoujingli/think-library/src/helper/InputHelper.php similarity index 78% rename from vendor/zoujingli/think-library/src/logic/Input.php rename to vendor/zoujingli/think-library/src/helper/InputHelper.php index bb13cd012..8a002a0c6 100644 --- a/vendor/zoujingli/think-library/src/logic/Input.php +++ b/vendor/zoujingli/think-library/src/helper/InputHelper.php @@ -5,7 +5,7 @@ // +---------------------------------------------------------------------- // | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- -// | 官方网站: http://library.thinkadmin.top +// | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) // +---------------------------------------------------------------------- @@ -13,19 +13,17 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace library\logic; +namespace library\helper; -use library\Controller; +use library\Helper; use think\Validate; /** - * 输入管理器 - * Class Input - * @package library\logic + * Class InputHelper + * @package library\helper */ -class Input extends Logic +class InputHelper extends Helper { - /** * 验证器规则 * @var array @@ -45,15 +43,22 @@ class Input extends Logic protected $info; /** - * Validate constructor. - * @param array $data 验证数据 - * @param array $rule 验证规则 - * @param array $info 验证消息 + * 输入验证器 + * @param array $data + * @param array $rule + * @param array $info + * @return array */ - public function __construct($data, $rule = [], $info = []) + public function init($data, $rule, $info) { list($this->rule, $this->info) = [$rule, $info]; $this->data = $this->parse($data); + $validate = Validate::make($this->rule, $this->info); + if ($validate->check($this->data)) { + return $this->data; + } else { + $this->controller->error($validate->getError()); + } } /** @@ -78,20 +83,4 @@ class Input extends Logic return $result; } - /** - * 应用初始化 - * @param Controller $controller - * @return array - */ - public function init(Controller $controller) - { - $this->controller = $controller; - $validate = Validate::make($this->rule, $this->info); - if ($validate->check($this->data)) { - return $this->data; - } else { - $this->controller->error($validate->getError()); - } - } - -} +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/logic/Page.php b/vendor/zoujingli/think-library/src/helper/PageHelper.php similarity index 87% rename from vendor/zoujingli/think-library/src/logic/Page.php rename to vendor/zoujingli/think-library/src/helper/PageHelper.php index 63c404456..9f0c77e33 100644 --- a/vendor/zoujingli/think-library/src/logic/Page.php +++ b/vendor/zoujingli/think-library/src/helper/PageHelper.php @@ -13,18 +13,25 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace library\logic; +namespace library\helper; -use library\Controller; +use library\Helper; use think\Db; +use think\db\Query; /** - * 列表处理管理器 - * Class Page - * @package library\logic + * + * Class PageHelper + * @package library\helper */ -class Page extends Logic +class PageHelper extends Helper { + /** + * 是否启用分页 + * @var boolean + */ + protected $page; + /** * 集合分页记录数 * @var integer @@ -37,38 +44,19 @@ class Page extends Logic */ protected $limit; - /** - * 是否启用分页 - * @var boolean - */ - protected $isPage; - /** * 是否渲染模板 * @var boolean */ - protected $isDisplay; - - /** - * Page constructor. - * @param string $dbQuery 数据库查询对象 - * @param boolean $isPage 是否启用分页 - * @param boolean $isDisplay 是否渲染模板 - * @param boolean $total 集合分页记录数 - * @param integer $limit 集合每页记录数 - */ - public function __construct($dbQuery, $isPage = true, $isDisplay = true, $total = false, $limit = 0) - { - $this->total = $total; - $this->limit = $limit; - $this->isPage = $isPage; - $this->isDisplay = $isDisplay; - $this->query = $this->buildQuery($dbQuery); - } + protected $display; /** * 逻辑器初始化 - * @param Controller $controller + * @param string|Query $dbQuery + * @param boolean $page 是否启用分页 + * @param boolean $display 是否渲染模板 + * @param boolean $total 集合分页记录数 + * @param integer $limit 集合每页记录数 * @return array * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException @@ -76,9 +64,13 @@ class Page extends Logic * @throws \think\exception\DbException * @throws \think\exception\PDOException */ - public function init(Controller $controller) + public function init($dbQuery, $page = true, $display = true, $total = false, $limit = 0) { - $this->controller = $controller; + $this->page = $page; + $this->total = $total; + $this->limit = $limit; + $this->display = $display; + $this->query = $this->buildQuery($dbQuery); // 列表排序操作 if ($this->controller->request->isPost()) $this->_sort(); // 未配置 order 规则时自动按 sort 字段排序 @@ -86,7 +78,7 @@ class Page extends Logic if (in_array('sort', $this->query->getTableFields())) $this->query->order('sort desc'); } // 列表分页及结果集处理 - if ($this->isPage) { + if ($this->page) { // 分页每页显示记录数 $limit = intval($this->controller->request->get('limit', cookie('page-limit'))); cookie('page-limit', $limit = $limit >= 10 ? $limit : 20); @@ -105,7 +97,7 @@ class Page extends Logic } else { $result = ['list' => $this->query->select()]; } - if (false !== $this->controller->callback('_page_filter', $result['list']) && $this->isDisplay) { + if (false !== $this->controller->callback('_page_filter', $result['list']) && $this->display) { return $this->controller->fetch('', $result); } return $result; @@ -140,4 +132,4 @@ class Page extends Logic } } -} +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/logic/Query.php b/vendor/zoujingli/think-library/src/helper/QueryHelper.php similarity index 86% rename from vendor/zoujingli/think-library/src/logic/Query.php rename to vendor/zoujingli/think-library/src/helper/QueryHelper.php index bfb7bf5e3..5817729a5 100644 --- a/vendor/zoujingli/think-library/src/logic/Query.php +++ b/vendor/zoujingli/think-library/src/helper/QueryHelper.php @@ -13,34 +13,22 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace library\logic; +namespace library\helper; -use library\Controller; +use library\Helper; +use think\db\Query; /** - * 搜索条件处理器 - * Class Query - * @package library\logic - * @see \think\Db\Query - * @mixin \think\Db\Query + * Class QueryHelper + * @package library\helper */ -class Query extends Logic +class QueryHelper extends Helper { - - /** - * Query constructor. - * @param \think\db\Query|string $dbQuery - */ - public function __construct($dbQuery) - { - $this->query = $this->buildQuery($dbQuery); - } - /** * Query call. * @param string $name 调用方法名称 * @param array $args 调用参数内容 - * @return $this + * @return QueryHelper */ public function __call($name, $args) { @@ -52,12 +40,12 @@ class Query extends Logic /** * 逻辑器初始化 - * @param Controller $controller + * @param string|Query $dbQuery * @return $this */ - public function init(Controller $controller) + public function init($dbQuery) { - $this->controller = $controller; + $this->query = $this->buildQuery($dbQuery); return $this; } @@ -79,7 +67,7 @@ class Query extends Logic */ public function like($fields, $input = 'request', $alias = '#') { - $data = $this->controller->request->$input(); + $data = $this->app->request->$input(); foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) { list($dk, $qk) = [$field, $field]; if (stripos($field, $alias) !== false) { @@ -101,7 +89,7 @@ class Query extends Logic */ public function equal($fields, $input = 'request', $alias = '#') { - $data = $this->controller->request->$input(); + $data = $this->app->request->$input(); foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) { list($dk, $qk) = [$field, $field]; if (stripos($field, $alias) !== false) { @@ -124,7 +112,7 @@ class Query extends Logic */ public function in($fields, $split = ',', $input = 'request', $alias = '#') { - $data = $this->controller->request->$input(); + $data = $this->app->request->$input(); foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) { list($dk, $qk) = [$field, $field]; if (stripos($field, $alias) !== false) { @@ -199,7 +187,7 @@ class Query extends Logic */ private function setBetweenWhere($fields, $split = ' ', $input = 'request', $alias = '#', $callback = null) { - $data = $this->controller->request->$input(); + $data = $this->app->request->$input(); foreach (is_array($fields) ? $fields : explode(',', $fields) as $field) { list($dk, $qk) = [$field, $field]; if (stripos($field, $alias) !== false) { @@ -224,14 +212,9 @@ class Query extends Logic * @param boolean $total 集合分页记录数 * @param integer $limit 集合每页记录数 * @return mixed - * @throws \think\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - * @throws \think\exception\PDOException */ public function page($isPage = true, $isDisplay = true, $total = false, $limit = 0) { - return (new Page($this->query, $isPage, $isDisplay, $total, $limit))->init($this->controller); + return PageHelper::instance()->init($this->query, $isPage, $isDisplay, $total, $limit); } -} +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/logic/Save.php b/vendor/zoujingli/think-library/src/helper/SaveHelper.php similarity index 77% rename from vendor/zoujingli/think-library/src/logic/Save.php rename to vendor/zoujingli/think-library/src/helper/SaveHelper.php index 36998180c..600ec4a7f 100644 --- a/vendor/zoujingli/think-library/src/logic/Save.php +++ b/vendor/zoujingli/think-library/src/helper/SaveHelper.php @@ -13,17 +13,16 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace library\logic; +namespace library\helper; -use library\Controller; +use library\Helper; use think\db\Query; /** - * 数据更新管理器 - * Class Save - * @package library\logic + * Class SaveHelper + * @package library\helper */ -class Save extends Logic +class SaveHelper extends Helper { /** * 表单扩展数据 @@ -49,32 +48,23 @@ class Save extends Logic */ protected $pkValue; - /** - * Save constructor. - * @param string|Query $dbQuery - * @param array $data 表单扩展数据 - * @param string $pkField 数据对象主键 - * @param array $where 额外更新条件 - */ - public function __construct($dbQuery, $data = [], $pkField = '', $where = []) - { - $this->where = $where; - $this->query = $this->buildQuery($dbQuery); - $this->data = empty($data) ? request()->post() : $data; - $this->pkField = empty($pkField) ? $this->query->getPk() : $pkField; - $this->pkValue = request()->post($this->pkField, null); - } - /** * 逻辑器初始化 - * @param Controller $controller + * @param Query|string $dbQuery + * @param array $data 表单扩展数据 + * @param string $field 数据对象主键 + * @param array $where 额外更新条件 * @return boolean * @throws \think\Exception * @throws \think\exception\PDOException */ - public function init(Controller $controller) + public function init($dbQuery, $data = [], $field = '', $where = []) { - $this->controller = $controller; + $this->where = $where; + $this->query = $this->buildQuery($dbQuery); + $this->data = empty($data) ? $this->app->request->post() : $data; + $this->pkField = empty($field) ? $this->query->getPk() : $field; + $this->pkValue = $this->app->request->post($this->pkField, null); // 主键限制处理 if (!isset($this->where[$this->pkField]) && is_string($this->pkValue)) { $this->query->whereIn($this->pkField, explode(',', $this->pkValue)); @@ -97,5 +87,4 @@ class Save extends Logic $this->controller->error('数据更新失败, 请稍候再试!'); } } - -} +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/helper/TokenHelper.php b/vendor/zoujingli/think-library/src/helper/TokenHelper.php new file mode 100644 index 000000000..6a06b9aa6 --- /dev/null +++ b/vendor/zoujingli/think-library/src/helper/TokenHelper.php @@ -0,0 +1,67 @@ +controller->csrf_state = true; + if ($this->app->request->isPost() && !TokenService::instance()->checkFormToken()) { + if ($return) return false; + $this->controller->error($this->controller->csrf_message); + } else { + return true; + } + } + + /** + * 清理表单令牌 + */ + public function clear() + { + TokenService::instance()->clearFormToken(); + } + + /** + * 返回视图内容 + * @param string $tpl 模板名称 + * @param array $vars 模板变量 + * @param string $node CSRF授权节点 + */ + public function fetchTemplate($tpl = '', $vars = [], $node = null) + { + throw new HttpResponseException(view($tpl, $vars, 200, function ($html) use ($node) { + return preg_replace_callback('/<\/form>/i', function () use ($node) { + $csrf = TokenService::instance()->buildFormToken($node); + return ""; + }, $html); + })); + } +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/logic/Form.php b/vendor/zoujingli/think-library/src/logic/Form.php deleted file mode 100644 index 2a79ee745..000000000 --- a/vendor/zoujingli/think-library/src/logic/Form.php +++ /dev/null @@ -1,115 +0,0 @@ -query = $this->buildQuery($dbQuery); - list($this->tpl, $this->where, $this->data) = [$tpl, $where, $data]; - $this->pkField = empty($pkField) ? ($this->query->getPk() ? $this->query->getPk() : 'id') : $pkField;; - $this->pkValue = input($this->pkField, isset($data[$this->pkField]) ? $data[$this->pkField] : null); - } - - /** - * 逻辑器初始化 - * @param Controller $controller - * @param array $data - * @return array|boolean - * @throws \think\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - * @throws \think\exception\PDOException - */ - public function init(Controller $controller, $data = []) - { - $this->controller = $controller; - // GET请求, 获取数据并显示表单页面 - if ($this->controller->request->isGet()) { - if ($this->pkValue !== null) { - $where = [$this->pkField => $this->pkValue]; - $data = (array)$this->query->where($where)->where($this->where)->find(); - } - $data = array_merge($data, $this->data); - if (false !== $this->controller->callback('_form_filter', $data)) { - return $this->controller->fetch($this->tpl, ['vo' => $data]); - } - return $data; - } - // POST请求, 数据自动存库处理 - if ($this->controller->request->isPost()) { - $data = array_merge($this->controller->request->post(), $this->data); - if (false !== $this->controller->callback('_form_filter', $data, $this->where)) { - $result = Data::save($this->query, $data, $this->pkField, $this->where); - if (false !== $this->controller->callback('_form_result', $result, $data)) { - if ($result !== false) $this->controller->success('恭喜, 数据保存成功!', ''); - $this->controller->error('数据保存失败, 请稍候再试!'); - } - return $result; - } - } - } - -} diff --git a/vendor/zoujingli/think-library/src/logic/Logic.php b/vendor/zoujingli/think-library/src/logic/Logic.php deleted file mode 100644 index ffe1e19e3..000000000 --- a/vendor/zoujingli/think-library/src/logic/Logic.php +++ /dev/null @@ -1,57 +0,0 @@ -request->module(); + $middle = '\\' . $this->nameTolower($this->app->request->controller()); + $suffix = ($type === 'controller') ? '' : ('\\' . $this->app->request->action()); + return strtr($prefix . $middle . $suffix, '\\', '/'); + } + + /** + * 检查并完整节点内容 + * @param string $node + * @return string + */ + public function fullnode($node) + { + if (empty($node)) return $this->getCurrent(); + if (count($attrs = explode('/', $node)) === 1) { + return $this->getCurrent('controller') . "/{$node}"; + } else { + $attrs[1] = $this->nameTolower($attrs[1]); + return join('/', $attrs); + } + } + + /** + * 控制器方法扫描处理 + * @param boolean $force + * @return array + * @throws \ReflectionException + */ + public function getMethods($force = false) + { + static $data = []; + if (empty($force)) { + if (count($data) > 0) return $data; + $data = $this->app->cache->get('system_auth_node', []); + if (count($data) > 0) return $data; + } else { + $data = []; + } + $ignore = get_class_methods('\library\Controller'); + foreach ($this->scanDirectory($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}", '/', '\\')); + $prefix = strtr("{$application}/" . $this->nameTolower($baseclass), '\\', '/'); + $data[$prefix] = $this->parseComment($class->getDocComment(), $baseclass); + foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { + if (in_array($method->getName(), $ignore)) continue; + $data["{$prefix}/{$method->getName()}"] = $this->parseComment($method->getDocComment(), $method->getName()); + } + } + } + $this->app->cache->set('system_auth_node', $data); + return $data; + } + + /** + * 解析硬节点属性 + * @param string $comment + * @param string $default + * @return array + */ + private function parseComment($comment, $default = '') + { + $text = strtr($comment, "\n", ' '); + $title = preg_replace('/^\/\*\s*\*\s*\*\s*(.*?)\s*\*.*?$/', '$1', $text); + return [ + 'title' => $title ? $title : $default, + 'isauth' => intval(preg_match('/@auth\s*true/i', $text)), + 'ismenu' => intval(preg_match('/@menu\s*true/i', $text)), + 'islogin' => intval(preg_match('/@login\s*true/i', $text)), + ]; + } + + /** + * 获取所有PHP文件列表 + * @param string $path 扫描目录 + * @param array $data 额外数据 + * @param string $ext 有文件后缀 + * @return array + */ + private function scanDirectory($path, $data = [], $ext = 'php') + { + foreach (glob("{$path}*") as $item) { + if (is_dir($item)) { + $data = array_merge($data, $this->scanDirectory("{$item}/")); + } elseif (is_file($item) && pathinfo($item, PATHINFO_EXTENSION) === $ext) { + $data[] = strtr($item, '\\', '/'); + } + } + return $data; + } +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/service/TokenService.php b/vendor/zoujingli/think-library/src/service/TokenService.php new file mode 100644 index 000000000..bff07a845 --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/TokenService.php @@ -0,0 +1,82 @@ +app->request->header('User-Token-Csrf', input('_token_', '')); + } + + /** + * 验证表单令牌是否有效 + * @param string $token 表单令牌 + * @param string $node 授权节点 + * @return boolean + */ + public function checkFormToken($token = null, $node = null) + { + if (is_null($token)) $token = $this->getInputToken(); + if (is_null($node)) $node = NodeService::instance()->getCurrent(); + // 读取缓存并检查是否有效 + $cache = $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; + } + + /** + * 清理表单CSRF信息 + * @param string $token + * @return TokenService + */ + public function clearFormToken($token = null) + { + if (is_null($token)) $token = $this->getInputToken(); + $this->app->session->delete($token); + return $this; + } + + /** + * 生成表单CSRF信息 + * @param null|string $node + * @return array + */ + public function buildFormToken($node = null) + { + list($token, $time) = [uniqid('csrf'), time()]; + foreach ($this->app->session->get() as $key => $item) { + if (stripos($key, 'csrf') === 0 && isset($item['time'])) { + if ($item['time'] + 600 < $time) $this->clearFormToken($key); + } + } + $data = ['node' => NodeService::instance()->fullnode($node), 'token' => $token, 'time' => $time]; + $this->app->session->set($token, $data); + return $data; + } +} \ No newline at end of file