diff --git a/composer.json b/composer.json index 05901bd41..a3704497a 100644 --- a/composer.json +++ b/composer.json @@ -22,5 +22,11 @@ "topthink/think-queue": "^2.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/vendor/autoload.php b/vendor/autoload.php index fe64e35fb..87908c07d 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitfd65e765bf7258efe9e013238473984b::getLoader(); +return ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index bead889b4..35b1e2df1 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', @@ -196,20 +198,30 @@ return array( 'library\\command\\sync\\Plugs' => $vendorDir . '/zoujingli/think-library/src/command/sync/Plugs.php', 'library\\command\\sync\\Service' => $vendorDir . '/zoujingli/think-library/src/command/sync/Service.php', 'library\\command\\sync\\Wechat' => $vendorDir . '/zoujingli/think-library/src/command/sync/Wechat.php', - 'library\\command\\task\\Reset' => $vendorDir . '/zoujingli/think-library/src/command/task/Reset.php', - 'library\\command\\task\\Start' => $vendorDir . '/zoujingli/think-library/src/command/task/Start.php', - 'library\\command\\task\\State' => $vendorDir . '/zoujingli/think-library/src/command/task/State.php', - 'library\\command\\task\\Stop' => $vendorDir . '/zoujingli/think-library/src/command/task/Stop.php', '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\\helper\\ValidateHelper' => $vendorDir . '/zoujingli/think-library/src/helper/ValidateHelper.php', + 'library\\queue\\ListenQueue' => $vendorDir . '/zoujingli/think-library/src/queue/ListenQueue.php', + 'library\\queue\\QueryQueue' => $vendorDir . '/zoujingli/think-library/src/queue/QueryQueue.php', + 'library\\queue\\StartQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StartQueue.php', + 'library\\queue\\StateQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StateQueue.php', + 'library\\queue\\StopQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StopQueue.php', + 'library\\queue\\WorkQueue' => $vendorDir . '/zoujingli/think-library/src/queue/WorkQueue.php', + 'library\\service\\AuthService' => $vendorDir . '/zoujingli/think-library/src/service/AuthService.php', + 'library\\service\\CaptchaService' => $vendorDir . '/zoujingli/think-library/src/service/CaptchaService.php', + 'library\\service\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php', + 'library\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php', + 'library\\service\\ProcessService' => $vendorDir . '/zoujingli/think-library/src/service/ProcessService.php', + 'library\\service\\SystemService' => $vendorDir . '/zoujingli/think-library/src/service/SystemService.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 58aec9153..52235366f 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitfd65e765bf7258efe9e013238473984b +class ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitfd65e765bf7258efe9e013238473984b return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitfd65e765bf7258efe9e013238473984b', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitfd65e765bf7258efe9e013238473984b', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e', '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\ComposerStaticInitfd65e765bf7258efe9e013238473984b::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitfd65e765bf7258efe9e013238473984b $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitfd65e765bf7258efe9e013238473984b::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirefd65e765bf7258efe9e013238473984b($fileIdentifier, $file); + composerRequiref558cbe483e15d25595ae80d3fb20e9e($fileIdentifier, $file); } return $loader; } } -function composerRequirefd65e765bf7258efe9e013238473984b($fileIdentifier, $file) +function composerRequiref558cbe483e15d25595ae80d3fb20e9e($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 741159c59..09f2aed70 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitfd65e765bf7258efe9e013238473984b +class ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -289,6 +289,8 @@ class ComposerStaticInitfd65e765bf7258efe9e013238473984b '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', @@ -297,20 +299,30 @@ class ComposerStaticInitfd65e765bf7258efe9e013238473984b 'library\\command\\sync\\Plugs' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/sync/Plugs.php', 'library\\command\\sync\\Service' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/sync/Service.php', 'library\\command\\sync\\Wechat' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/sync/Wechat.php', - 'library\\command\\task\\Reset' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/task/Reset.php', - 'library\\command\\task\\Start' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/task/Start.php', - 'library\\command\\task\\State' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/task/State.php', - 'library\\command\\task\\Stop' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/task/Stop.php', '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\\helper\\ValidateHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/ValidateHelper.php', + 'library\\queue\\ListenQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/ListenQueue.php', + 'library\\queue\\QueryQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/QueryQueue.php', + 'library\\queue\\StartQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StartQueue.php', + 'library\\queue\\StateQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StateQueue.php', + 'library\\queue\\StopQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StopQueue.php', + 'library\\queue\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php', + 'library\\service\\AuthService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AuthService.php', + 'library\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php', + 'library\\service\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php', + 'library\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php', + 'library\\service\\ProcessService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/ProcessService.php', + 'library\\service\\SystemService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/SystemService.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', @@ -354,9 +366,9 @@ class ComposerStaticInitfd65e765bf7258efe9e013238473984b public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitfd65e765bf7258efe9e013238473984b::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitfd65e765bf7258efe9e013238473984b::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitfd65e765bf7258efe9e013238473984b::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 3111e2b58..910966a21 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-helper/zipball/4d85dfd3778623bbb1de3648f1dcd0c82f4439f4", "reference": "4d85dfd3778623bbb1de3648f1dcd0c82f4439f4", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=7.1.0" @@ -320,7 +356,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" @@ -363,7 +405,13 @@ "type": "zip", "url": "https://api.github.com/repos/top-think/think-queue/zipball/d9b8f38c7af8ad770257b0d7db711ce8b12a6969", "reference": "d9b8f38c7af8ad770257b0d7db711ce8b12a6969", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "topthink/framework": "5.1.*", @@ -411,7 +459,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" @@ -448,17 +502,24 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "6dbcbc8ae1bcca6b18db58085deaa8f918b242da" + "reference": "c76003332a6c0277186507429baca6dfea6f9d15" }, "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/c76003332a6c0277186507429baca6dfea6f9d15", + "reference": "c76003332a6c0277186507429baca6dfea6f9d15", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "aliyuncs/oss-sdk-php": "^2.3", "ext-curl": "*", + "ext-gd": "*", "ext-iconv": "*", "ext-json": "*", "ext-openssl": "*", @@ -466,7 +527,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-11-20T07:43:10+00:00", + "time": "2019-11-25T10:59:35+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -486,18 +547,24 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.2.14", - "version_normalized": "1.2.14.0", + "version": "v1.2.15", + "version_normalized": "1.2.15.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "39d53dd91040517a01d7c7423235f56b47deefa3" + "reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/39d53dd91040517a01d7c7423235f56b47deefa3", - "reference": "39d53dd91040517a01d7c7423235f56b47deefa3", - "shasum": "" + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/4b81e72cff7a3acfde2cca919bd8e173355bc53c", + "reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-curl": "*", @@ -508,7 +575,7 @@ "ext-simplexml": "*", "php": ">=5.4" }, - "time": "2019-11-05T02:35:27+00:00", + "time": "2019-11-25T10:40:50+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -557,7 +624,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/composer.json b/vendor/zoujingli/think-library/composer.json index b6f7584bb..0d122a6f3 100644 --- a/vendor/zoujingli/think-library/composer.json +++ b/vendor/zoujingli/think-library/composer.json @@ -6,6 +6,7 @@ "description": "ThinkPHP Basic Development Library", "require": { "php": ">=5.4", + "ext-gd": "*", "ext-json": "*", "ext-curl": "*", "ext-iconv": "*", diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php index 7f0fdf286..ae1608aea 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 library\helper\ValidateHelper; +use think\App; +use think\Container; +use think\db\Query; use think\exception\HttpResponseException; /** * 标准控制器基类 - * -------------------------------- * Class Controller + * @package library */ -class Controller extends \stdClass +abstract class Controller extends \stdClass { + /** + * 当前应用实例 + * @var App + */ + public $app; + /** * 当前请求对象 * @var \think\Request @@ -42,35 +52,51 @@ 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.'); } + $this->initialize(); + } + + /** + * 控制器初始化 + * @return $this + */ + protected function initialize() + { + return $this; } /** * Controller destruct + * @throws \Exception */ public function __destruct() { - $this->request = request(); - $action = $this->request->action(); - $method = strtolower($this->request->method()); - if (method_exists($this, $callback = "_{$action}_{$method}")) { - call_user_func_array([$this, $callback], $this->request->route()); + $method = "_{$this->request->action()}_{$this->request->method()}"; + if (method_exists($this, $method)) try { + call_user_func_array([$this, $method], $this->request->route()); + } catch (HttpResponseException $exception) { + $exception->getResponse()->send(); + } catch (\Exception $exception) { + throw $exception; } } @@ -94,9 +120,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 +149,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 +184,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,28 +198,22 @@ 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 - * @return Query + * @param string|Query $dbQuery + * @return QueryHelper */ 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 集合分页记录数 @@ -206,31 +227,29 @@ class Controller extends \stdClass */ 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\DbException * @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 额外更新条件 @@ -240,7 +259,18 @@ class Controller extends \stdClass */ 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 = '') + { + return ValidateHelper::instance()->init($rules, $type); } /** @@ -252,21 +282,22 @@ 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 + * @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..810228c2b --- /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 $this + */ + 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..dfc3bf254 --- /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 $this + */ + 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/command/task/Reset.php b/vendor/zoujingli/think-library/src/command/task/Reset.php deleted file mode 100644 index 302a61b66..000000000 --- a/vendor/zoujingli/think-library/src/command/task/Reset.php +++ /dev/null @@ -1,56 +0,0 @@ -setName('xtask:reset')->setDescription('重新启动消息队列守护进程'); - } - - /** - * 执行重置操作 - * @param Input $input - * @param Output $output - * @return int|void|null - */ - protected function execute(Input $input, Output $output) - { - if (($pid = $this->checkProcess()) > 0) { - $this->closeProcess($pid); - $output->info("message queue daemon {$pid} closed successfully!"); - } - $this->createProcess(); - if ($pid = $this->checkProcess()) { - $output->info("message queue daemon {$pid} created successfully!"); - } else { - $output->error('message queue daemon creation failed, try again later!'); - } - } -} diff --git a/vendor/zoujingli/think-library/src/command/task/Start.php b/vendor/zoujingli/think-library/src/command/task/Start.php deleted file mode 100644 index d6005e634..000000000 --- a/vendor/zoujingli/think-library/src/command/task/Start.php +++ /dev/null @@ -1,56 +0,0 @@ -setName('xtask:start')->setDescription('开始启动消息队列守护进程'); - } - - /** - * 执行启动操作 - * @param Input $input - * @param Output $output - */ - protected function execute(Input $input, Output $output) - { - if (($pid = $this->checkProcess()) > 0) { - $output->info("The message queue daemon {$pid} already exists!"); - } else { - $this->createProcess(); - if (($pid = $this->checkProcess()) > 0) { - $output->info("message queue daemon {$pid} created successfully!"); - } else { - $output->error('message queue daemon creation failed, try again later!'); - } - } - } - -} diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 8fde00936..41ac7fd8e 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -21,6 +21,7 @@ use library\tools\Http; use library\tools\Node; use think\Console; use think\Db; +use think\db\Query; use think\facade\Cache; use think\facade\Middleware; use think\facade\Response; @@ -99,7 +100,7 @@ if (!function_exists('sysconf')) { if (!function_exists('systoken')) { /** - * 生成CSRF-TOKEN参数 + * 生成 CSRF-TOKEN 参数 * @param string $node * @return string */ @@ -112,7 +113,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 +127,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参数 @@ -141,7 +142,7 @@ if (!function_exists('http_post')) { if (!function_exists('data_save')) { /** * 数据增量保存 - * @param \think\db\Query|string $dbQuery 数据查询对象 + * @param Query|string $dbQuery 数据查询对象 * @param array $data 需要保存或更新的数据 * @param string $key 条件主键限制 * @param array $where 其它的where条件 @@ -158,7 +159,7 @@ if (!function_exists('data_save')) { if (!function_exists('data_batch_save')) { /** * 批量更新数据 - * @param \think\db\Query|string $dbQuery 数据查询对象 + * @param Query|string $dbQuery 数据查询对象 * @param array $data 需要更新的数据(二维数组) * @param string $key 条件主键限制 * @param array $where 其它的where条件 @@ -232,36 +233,42 @@ 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', - 'library\command\task\State', - 'library\command\task\Start', + // 注册系统任务指令 + 'library\queue\WorkQueue', + 'library\queue\StopQueue', + 'library\queue\StateQueue', + 'library\queue\StartQueue', + 'library\queue\QueryQueue', + 'library\queue\ListenQueue', + // 注册系统更新指令 'library\command\sync\Admin', 'library\command\sync\Plugs', 'library\command\sync\Config', '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/logic/Form.php b/vendor/zoujingli/think-library/src/helper/FormHelper.php similarity index 63% rename from vendor/zoujingli/think-library/src/logic/Form.php rename to vendor/zoujingli/think-library/src/helper/FormHelper.php index 2a79ee745..7f87ced88 100644 --- a/vendor/zoujingli/think-library/src/logic/Form.php +++ b/vendor/zoujingli/think-library/src/helper/FormHelper.php @@ -5,7 +5,7 @@ // +---------------------------------------------------------------------- // | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- -// | 官方网站: http://library.thinkadmin.top +// | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) // +---------------------------------------------------------------------- @@ -13,31 +13,18 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace library\logic; +namespace library\helper; -use library\Controller; -use library\tools\Data; +use library\Helper; use think\db\Query; /** * 表单视图管理器 - * Class Form - * @package library\logic + * Class FormHelper + * @package library\helper */ -class Form extends Logic +class FormHelper extends Helper { - /** - * 表单模板文件 - * @var string - */ - protected $tpl; - - /** - * 表单扩展数据 - * @var array - */ - protected $data; - /** * 表单额外更新条件 * @var array @@ -46,7 +33,7 @@ class Form extends Logic /** * 数据对象主键名称 - * @var array|string + * @var string */ protected $pkField; @@ -57,52 +44,40 @@ class Form extends Logic protected $pkValue; /** - * Form constructor. + * 逻辑器初始化 * @param string|Query $dbQuery - * @param string $tpl 模板名称 - * @param string $pkField 指定数据对象主键 + * @param string $template 模板名称 + * @param string $field 指定数据主键 * @param array $where 额外更新条件 * @param array $data 表单扩展数据 + * @return array|boolean + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ - public function __construct($dbQuery, $tpl = '', $pkField = '', $where = [], $data = []) + public function init($dbQuery, $template = '', $field = '', $where = [], $data = []) { $this->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;; + list($this->template, $this->where, $this->data) = [$template, $where, $data]; + $this->pkField = empty($field) ? ($this->query->getPk() ? $this->query->getPk() : 'id') : $field;; $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->app->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 $this->controller->fetch($this->template, ['vo' => $data]); } return $data; } // POST请求, 数据自动存库处理 - if ($this->controller->request->isPost()) { - $data = array_merge($this->controller->request->post(), $this->data); + if ($this->app->request->isPost()) { + $data = array_merge($this->app->request->post(), $this->data); if (false !== $this->controller->callback('_form_filter', $data, $this->where)) { - $result = Data::save($this->query, $data, $this->pkField, $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('数据保存失败, 请稍候再试!'); @@ -111,5 +86,4 @@ class Form extends Logic } } } - -} +} \ 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 89% rename from vendor/zoujingli/think-library/src/logic/Query.php rename to vendor/zoujingli/think-library/src/helper/QueryHelper.php index bfb7bf5e3..f9b1b1b33 100644 --- a/vendor/zoujingli/think-library/src/logic/Query.php +++ b/vendor/zoujingli/think-library/src/helper/QueryHelper.php @@ -13,34 +13,24 @@ // | 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 + * @see think\db\Query + * @mixin think\db\Query */ -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,18 +42,18 @@ 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; } /** * 获取当前Db操作对象 - * @return \think\db\Query + * @return Query */ public function db() { @@ -79,7 +69,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 +91,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 +114,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 +189,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) { @@ -232,6 +222,6 @@ class Query extends Logic */ 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/helper/ValidateHelper.php b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php new file mode 100644 index 000000000..8dc759ee4 --- /dev/null +++ b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php @@ -0,0 +1,60 @@ + $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 $data; + } else { + $this->controller->error($validate->getError()); + } + } + +} \ No newline at end of file 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 @@ -setName('xtask:listen')->setDescription('[监听]启动任务监听主进程'); + } + + /** + * 执行进程守护监听 + * @param Input $input + * @param Output $output + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException + */ + protected function execute(Input $input, Output $output) + { + Db::name('SystemQueue')->count(); + if (($process = ProcessService::instance())->iswin() && function_exists('cli_set_process_title')) { + cli_set_process_title("ThinkAdmin 监听主进程 {$process->version()}"); + } + $output->comment('============ 任务监听中 ============'); + while (true) { + foreach (Db::name('SystemQueue')->where([['status', 'eq', '1'], ['time', '<=', time()]])->order('time asc')->select() as $item) { + try { + Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '2', 'start_at' => date('Y-m-d H:i:s')]); + if ($process->query($command = $process->think("xtask:_work {$item['id']} -"))) { + $output->comment("正在执行 -> [{$item['id']}] {$item['title']}"); + } else { + $process->create($command); + $output->info("创建成功 -> [{$item['id']}] {$item['title']}"); + } + } catch (\Exception $e) { + Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '4', 'desc' => $e->getMessage()]); + $output->error("创建处理任务的子进程失败 --> [{$item['id']}] {$item['title']}，{$e->getMessage()}"); + } + } + sleep(1); + } + } + +} diff --git a/vendor/zoujingli/think-library/src/command/task/State.php b/vendor/zoujingli/think-library/src/queue/QueryQueue.php similarity index 52% rename from vendor/zoujingli/think-library/src/command/task/State.php rename to vendor/zoujingli/think-library/src/queue/QueryQueue.php index 632164502..071658431 100644 --- a/vendor/zoujingli/think-library/src/command/task/State.php +++ b/vendor/zoujingli/think-library/src/queue/QueryQueue.php @@ -1,51 +1,53 @@ setName('xtask:state')->setDescription('查看消息队列守护进程状态'); + $this->setName('xtask:query')->setDescription('[控制]查询正在运行的进程'); } /** - * 执行查询操作 + * 执行相关进程查询 * @param Input $input * @param Output $output */ protected function execute(Input $input, Output $output) { - if (($pid = $this->checkProcess()) > 0) { - $output->info("message queue daemon {$pid} is runing."); + $process = ProcessService::instance(); + $result = $process->query($process->think("xtask:")); + if (count($result) > 0) foreach ($result as $item) { + $output->writeln("{$item['pid']}\t{$item['cmd']}"); } else { - $output->info('The message queue daemon is not running.'); + $output->writeln('没有查询到相关任务进程'); } } - } diff --git a/vendor/zoujingli/think-library/src/queue/StartQueue.php b/vendor/zoujingli/think-library/src/queue/StartQueue.php new file mode 100644 index 000000000..06a2728aa --- /dev/null +++ b/vendor/zoujingli/think-library/src/queue/StartQueue.php @@ -0,0 +1,62 @@ +setName('xtask:start')->setDescription('[控制]创建守护监听主进程'); + } + + /** + * 执行启动操作 + * @param Input $input + * @param Output $output + */ + protected function execute(Input $input, Output $output) + { + Db::name('SystemQueue')->count(); + $process = ProcessService::instance(); + $command = $process->think("xtask:listen"); + if (count($result = $process->query($command)) > 0) { + $output->info("监听主进程{$result['0']['pid']}已经启动！"); + } else { + $process->create($command); + sleep(1); + if (count($result = $process->query($command)) > 0) { + $output->info("监听主进程{$result['0']['pid']}启动成功！"); + } else { + $output->error('监听主进程创建失败！'); + } + } + } +} diff --git a/vendor/zoujingli/think-library/src/command/task/Stop.php b/vendor/zoujingli/think-library/src/queue/StateQueue.php similarity index 52% rename from vendor/zoujingli/think-library/src/command/task/Stop.php rename to vendor/zoujingli/think-library/src/queue/StateQueue.php index f47c7ff84..b6d09a08d 100644 --- a/vendor/zoujingli/think-library/src/command/task/Stop.php +++ b/vendor/zoujingli/think-library/src/queue/StateQueue.php @@ -1,52 +1,53 @@ setName('xtask:stop')->setDescription('立即停止消息队列守护进程'); + $this->setName('xtask:state')->setDescription('[控制]查看监听主进程状态'); } /** - * 执行停止操作 + * 指令执行状态 * @param Input $input * @param Output $output */ protected function execute(Input $input, Output $output) { - if (($pid = $this->checkProcess()) > 0) { - $this->closeProcess($pid); - $output->info("message queue daemon {$pid} closed successfully."); + $process = ProcessService::instance(); + $command = $process->think('xtask:listen'); + if (count($result = $process->query($command)) > 0) { + $output->info("异步任务监听主进程{$result[0]['pid']}正在运行..."); } else { - $output->info('The message queue daemon is not running.'); + $output->error("异步任务监听主进程没有运行哦!"); } } - } diff --git a/vendor/zoujingli/think-library/src/queue/StopQueue.php b/vendor/zoujingli/think-library/src/queue/StopQueue.php new file mode 100644 index 000000000..42d740301 --- /dev/null +++ b/vendor/zoujingli/think-library/src/queue/StopQueue.php @@ -0,0 +1,55 @@ +setName('xtask:stop')->setDescription('[控制]平滑停止所有的进程'); + } + + /** + * 停止所有任务执行 + * @param Input $input + * @param Output $output + */ + protected function execute(Input $input, Output $output) + { + $process = ProcessService::instance(); + $command = $process->think('xtask:'); + if (count($result = $process->query($command)) < 1) { + $output->writeln("没有需要结束的任务进程哦！"); + } else foreach ($result as $item) { + $process->close($item['pid']); + $output->writeln("发送结束进程{$item['pid']}信号成功！"); + } + } +} diff --git a/vendor/zoujingli/think-library/src/queue/WorkQueue.php b/vendor/zoujingli/think-library/src/queue/WorkQueue.php new file mode 100644 index 000000000..5ee684684 --- /dev/null +++ b/vendor/zoujingli/think-library/src/queue/WorkQueue.php @@ -0,0 +1,112 @@ +setName('xtask:_work')->setDescription('[执行]创建执行任务的进程'); + $this->addArgument('id', Argument::OPTIONAL, '指定任务ID'); + $this->addArgument('sp', Argument::OPTIONAL, '指令结束符'); + } + + /** + * 任务执行 + * @param Input $input + * @param Output $output + * @throws Exception + * @throws \think\exception\PDOException + */ + protected function execute(Input $input, Output $output) + { + try { + $this->id = trim($input->getArgument('id')) ?: 0; + if (empty($this->id)) throw new Exception("执行任务需要指定任务编号！"); + $queue = Db::name('SystemQueue')->where(['id' => $this->id, 'status' => '2'])->find(); + if (empty($queue)) throw new Exception("执行任务{$this->id}的信息或状态异常！");; + // 设置进程标题 + if (($process = ProcessService::instance())->iswin() && function_exists('cli_set_process_title')) { + cli_set_process_title("ThinkAdmin {$process->version()} 执行任务 - {$queue['title']}"); + } + // 执行任务内容 + if (class_exists($queue['preload'])) { + if (method_exists($class = new $queue['preload'], 'execute')) { + $data = json_decode($queue['data'], true); + if (isset($class->jobid)) $class->jobid = $this->id; + if (isset($class->title)) $class->title = $queue['title']; + $this->update('3', $class->execute($input, $output, is_array($data) ? $data : [])); + } else { + throw new Exception("任务处理类 {$queue['preload']} 未定义 execute 入口！"); + } + } else { + $attr = explode(' ', trim(preg_replace('|\s+|', ' ', $queue['command']))); + $this->update('3', Console::call(array_shift($attr), $attr, 'console')); + } + } catch (\Exception $e) { + $this->update('4', $e->getMessage()); + } + } + + /** + * 修改当前任务状态 + * @param integer $status 任务状态 + * @param string $message 消息内容 + * @return boolean + * @throws \think\Exception + * @throws \think\exception\PDOException + */ + protected function update($status, $message) + { + $result = Db::name('SystemQueue')->where(['id' => $this->id])->update([ + 'status' => $status, 'end_at' => date('Y-m-d H:i:s'), + 'desc' => is_string($message) ? $message : '', + ]); + $this->output->writeln(is_string($message) ? $message : ''); + return $result !== false; + } + +} diff --git a/vendor/zoujingli/think-library/src/service/AuthService.php b/vendor/zoujingli/think-library/src/service/AuthService.php new file mode 100644 index 000000000..2e21004a2 --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/AuthService.php @@ -0,0 +1,114 @@ +app->session->get('user.id') ? true : false; + } + + /** + * 检查指定节点授权 + * --- 需要读取缓存或扫描所有节点 + * @param string $node + * @return boolean + * @throws \ReflectionException + */ + public function check($node = '') + { + $service = NodeService::instance(); + if ($this->app->session->get('user.username') === 'admin') return true; + list($real, $nodes) = [$service->fullnode($node), $service->getMethods()]; + if (empty($nodes[$real]['isauth'])) { + return empty($nodes[$real]['islogin']) ? true : $this->isLogin(); + } else { + return in_array($real, $this->app->session->get('user.nodes')); + } + } + + /** + * 获取授权节点列表 + * @param array $checkeds + * @return array + * @throws \ReflectionException + */ + public function getTree($checkeds = []) + { + list($nodes, $pnodes) = [[], []]; + $methods = array_reverse(NodeService::instance()->getMethods()); + foreach ($methods as $node => $method) { + $count = substr_count($node, '/'); + $pnode = substr($node, 0, strripos($node, '/')); + if ($count === 2 && !empty($method['isauth'])) { + in_array($pnode, $pnodes) or array_push($pnodes, $pnode); + $nodes[$node] = ['node' => $node, 'title' => $method['title'], 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)]; + } elseif ($count === 1 && in_array($pnode, $pnodes)) { + $nodes[$node] = ['node' => $node, 'title' => $method['title'], 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)]; + } + } + foreach (array_keys($nodes) as $key) foreach ($methods as $node => $method) if (stripos($key, "{$node}/") !== false) { + $pnode = substr($node, 0, strripos($node, '/')); + $nodes[$node] = ['node' => $node, 'title' => $method['title'], 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)]; + $nodes[$pnode] = ['node' => $pnode, 'title' => ucfirst($pnode), 'pnode' => '', 'checked' => in_array($pnode, $checkeds)]; + } + return Data::arr2tree(array_reverse($nodes), 'node', 'pnode', '_sub_'); + } + + /** + * 初始化用户权限 + * @param boolean $force 强刷权限 + * @return AuthService + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public function apply($force = false) + { + if ($force) $this->app->cache->rm('system_auth_node'); + if (($uid = $this->app->session->get('user.id'))) { + $user = Db::name('SystemUser')->where(['id' => $uid])->find(); + if (($aids = $user['authorize'])) { + $where = [['status', 'eq', '1'], ['id', 'in', explode(',', $aids)]]; + $subsql = Db::name('SystemAuth')->field('id')->where($where)->buildSql(); + $user['nodes'] = array_unique(Db::name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node')); + $this->app->session->set('user', $user); + } else { + $user['nodes'] = []; + $this->app->session->set('user', $user); + } + } + return $this; + } + +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/service/CaptchaService.php b/vendor/zoujingli/think-library/src/service/CaptchaService.php new file mode 100644 index 000000000..96872b871 --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/CaptchaService.php @@ -0,0 +1,158 @@ + $v) if (isset($this->$k)) $this->$k = $v; + // 生成验证码序号 + $this->uniqid = uniqid('captcha') . mt_rand(1000, 9999); + // 生成验证码字符串 + $length = strlen($this->charset) - 1; + for ($i = 0; $i < $this->codelen; $i++) { + $this->code .= $this->charset[mt_rand(0, $length)]; + } + // 设置字体文件路径 + $this->font = __DIR__ . '/bin/font.ttf'; + // 缓存验证码字符串 + $this->app->cache->set($this->uniqid, $this->code, 360); + // 返回当前对象 + return $this; + } + + /** + * 获取验证码值 + * @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 array + */ + public function getAttrs() + { + return [ + 'code' => $this->getCode(), + 'data' => $this->getData(), + 'uniqid' => $this->getUniqid(), + ]; + } + + /** + * 检查验证码是否正确 + * @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->rm($_uni); + return is_string($_val) && strtolower($_val) === strtolower($code); + } + + /** + * 输出图形验证码 + * @return string + */ + public function __toString() + { + return $this->getData(); + } + + /** + * 创建验证码图片 + * @return string + */ + private function createImage() + { + // 生成背景 + $this->img = imagecreatetruecolor($this->width, $this->height); + $color = imagecolorallocate($this->img, mt_rand(220, 255), mt_rand(220, 255), mt_rand(220, 255)); + imagefilledrectangle($this->img, 0, $this->height, $this->width, 0, $color); + // 生成线条 + for ($i = 0; $i < 6; $i++) { + $color = imagecolorallocate($this->img, mt_rand(0, 50), mt_rand(0, 50), mt_rand(0, 50)); + imageline($this->img, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $color); + } + // 生成雪花 + for ($i = 0; $i < 100; $i++) { + $color = imagecolorallocate($this->img, mt_rand(200, 255), mt_rand(200, 255), mt_rand(200, 255)); + imagestring($this->img, mt_rand(1, 5), mt_rand(0, $this->width), mt_rand(0, $this->height), '*', $color); + } + // 生成文字 + $_x = $this->width / $this->codelen; + for ($i = 0; $i < $this->codelen; $i++) { + $this->fontcolor = imagecolorallocate($this->img, mt_rand(0, 156), mt_rand(0, 156), mt_rand(0, 156)); + imagettftext($this->img, $this->fontsize, mt_rand(-30, 30), $_x * $i + mt_rand(1, 5), $this->height / 1.4, $this->fontcolor, $this->font, $this->code[$i]); + } + ob_start(); + imagepng($this->img); + $data = ob_get_contents(); + ob_end_clean(); + imagedestroy($this->img); + return base64_encode($data); + } +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/service/MenuService.php b/vendor/zoujingli/think-library/src/service/MenuService.php new file mode 100644 index 000000000..bb7dfad13 --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/MenuService.php @@ -0,0 +1,83 @@ + 0) return $nodes; + foreach (NodeService::instance()->getMethods() as $node => $method) { + if ($method['ismenu']) $nodes[] = ['node' => $node, 'title' => $method['title']]; + } + return $nodes; + } + + /** + * 获取系统菜单树数据 + * @return array + * @throws \ReflectionException + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public function getTree() + { + $result = Db::name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select(); + return $this->buildData(Data::arr2tree($result), NodeService::instance()->getMethods()); + } + + /** + * 后台主菜单权限过滤 + * @param array $menus 当前菜单列表 + * @param array $nodes 系统权限节点 + * @return array + * @throws \ReflectionException + */ + private function buildData($menus, $nodes) + { + foreach ($menus as $key => &$menu) { + if (!empty($menu['sub'])) { + $menu['sub'] = $this->buildData($menu['sub'], $nodes); + } + if (!empty($menu['sub'])) $menu['url'] = '#'; + elseif ($menu['url'] === '#') unset($menus[$key]); + elseif (preg_match('|^https?://|i', $menu['url'])) continue; + else { + $node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3)); + $menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}"); + if (!AuthService::instance()->check($node)) unset($menus[$key]); + } + } + return $menus; + } +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/service/NodeService.php b/vendor/zoujingli/think-library/src/service/NodeService.php new file mode 100644 index 000000000..3e9d97e67 --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/NodeService.php @@ -0,0 +1,141 @@ +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+)/controller/(.+)\.php$|i", $file, $matches)) { + list(, $application, $baseclass) = $matches; + $namespace = $this->app->env->get('APP_NAMESPACE'); + $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/ProcessService.php b/vendor/zoujingli/think-library/src/service/ProcessService.php new file mode 100644 index 000000000..b093b3e7e --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/ProcessService.php @@ -0,0 +1,144 @@ +app->getRootPath(); + return trim("php {$root}think {$args}"); + } + + /** + * 获取当前应用版本 + * @return string + */ + public function version() + { + return $this->app->config->get('app.thinkadmin_ver', 'v4'); + } + + /** + * 创建异步进程 + * @param string $command 任务指令 + * @return ProcessService + */ + public function create($command) + { + if ($this->iswin()) { + $command = __DIR__ . "/bin/console.exe {$command}"; + pclose(popen("wmic process call create \"{$command}\"", 'r')); + } else { + pclose(popen("{$command} &", 'r')); + } + return $this; + } + + /** + * 查询相关进程列表 + * @param string $command 任务指令 + * @return array + */ + public function query($command) + { + $list = []; + if ($this->iswin()) { + $result = $this->exec('wmic process where name="php.exe" get processid,CommandLine'); + foreach (explode("\n", $result) as $line) if ($this->_issub($line, $command) !== false) { + $attr = explode(' ', $this->_space($line)); + $list[] = ['pid' => array_pop($attr), 'cmd' => join(' ', $attr)]; + } + } else { + $result = $this->exec("ps ax|grep -v grep|grep \"{$command}\""); + foreach (explode("\n", $result) as $line) if ($this->_issub($line, $command) !== false) { + $attr = explode(' ', $this->_space($line)); + list($pid) = [array_shift($attr), array_shift($attr), array_shift($attr), array_shift($attr)]; + $list[] = ['pid' => $pid, 'cmd' => join(' ', $attr)]; + } + } + return $list; + } + + /** + * 关闭任务进程 + * @param integer $pid 进程号 + * @return boolean + */ + public function close($pid) + { + if ($this->iswin()) { + $this->exec("wmic process {$pid} call terminate"); + } else { + $this->exec("kill -9 {$pid}"); + } + return true; + } + + /** + * 立即执行指令 + * @param string $command 执行指令 + * @return string + */ + public function exec($command) + { + return shell_exec($command); + } + + /** + * 判断系统类型 + * @return boolean + */ + public function iswin() + { + return PATH_SEPARATOR === ';'; + } + + /** + * 消息空白字符过滤 + * @param string $content + * @param string $tochar + * @return string + */ + private function _space($content, $tochar = ' ') + { + return preg_replace('|\s+|', $tochar, strtr(trim($content), '\\', '/')); + } + + /** + * 判断是否包含字符串 + * @param string $content + * @param string $substr + * @return boolean + */ + private function _issub($content, $substr) + { + return stripos($this->_space($content), $this->_space($substr)) !== false; + } +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php new file mode 100644 index 000000000..7986234f9 --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -0,0 +1,140 @@ +getTable(), isset($data[$key]) ? $data[$key] : null]; + $map = isset($where[$key]) ? [] : (is_string($value) ? [[$key, 'in', explode(',', $value)]] : [$key => $value]); + if (is_array($info = Db::table($table)->master()->where($where)->where($map)->find()) && !empty($info)) { + if (Db::table($table)->strict(false)->where($where)->where($map)->update($data) !== false) { + return isset($info[$key]) ? $info[$key] : true; + } else { + return false; + } + } else { + return Db::table($table)->strict(false)->insertGetId($data); + } + } + + /** + * 保存数据内容 + * @param string $name 数据名称 + * @param mixed $value 数据内容 + * @return boolean + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException + */ + public function setData($name, $value) + { + $data = ['name' => $name, 'value' => serialize($value)]; + return $this->save('SystemData', $data, 'name'); + } + + /** + * 读取数据内容 + * @param string $name 数据名称 + * @param mixed $default 默认值 + * @return mixed + */ + public function getData($name, $default = null) + { + $value = Db::name('SystemData')->where(['name' => $name])->value('value'); + return empty($value) ? $default : unserialize($value); + } + + /** + * 写入系统日志 + * @param string $action + * @param string $content + * @return integer + */ + public function setOplog($action, $content) + { + return Db::name('SystemLog')->insert([ + 'node' => NodeService::instance()->getCurrent(), + 'action' => $action, 'content' => $content, + 'geoip' => $this->app->request->isCli() ? '127.0.0.1' : $this->app->request->ip(), + 'username' => $this->app->request->isCli() ? 'cli' : $this->app->session->get('user.username'), + ]); + } + + /** + * 打印输出数据到文件 + * @param mixed $data 输出的数据 + * @param boolean $new 强制替换文件 + * @param string|null $file 文件名称 + */ + public function putDebug($data, $new = false, $file = null) + { + if (is_null($file)) $file = $this->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; + $new ? file_put_contents($file, $str) : file_put_contents($file, $str, FILE_APPEND); + } + + /** + * 判断运行环境 + * @param string $type 运行模式（dev|demo|local） + * @return boolean + */ + public function checkRunMode($type = 'dev') + { + $domain = $this->app->request->host(true); + $isDemo = is_numeric(stripos($domain, 'thinkadmin.top')); + $isLocal = in_array($domain, ['127.0.0.1', 'localhost']); + if ($type === 'dev') return $isLocal || $isDemo; + if ($type === 'demo') return $isDemo; + if ($type === 'local') return $isLocal; + return true; + } + +} \ 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 diff --git a/vendor/zoujingli/think-library/src/service/bin/console.exe b/vendor/zoujingli/think-library/src/service/bin/console.exe new file mode 100644 index 000000000..6d8e8df79 Binary files /dev/null and b/vendor/zoujingli/think-library/src/service/bin/console.exe differ 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 000000000..54a14ed1c Binary files /dev/null and b/vendor/zoujingli/think-library/src/service/bin/font.ttf differ diff --git a/vendor/zoujingli/wechat-developer/WeChat/Pay.php b/vendor/zoujingli/wechat-developer/WeChat/Pay.php index 3e3fbad25..dcc87cede 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Pay.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Pay.php @@ -18,6 +18,7 @@ use WeChat\Contracts\BasicWePay; use WeChat\Exceptions\InvalidResponseException; use WePay\Bill; use WePay\Order; +use WePay\Refund; use WePay\Transfers; use WePay\TransfersBank; @@ -116,7 +117,7 @@ class Pay extends BasicWePay */ public function createRefund(array $options) { - return Order::instance($this->config->get())->create($options); + return Refund::instance($this->config->get())->create($options); } /** @@ -128,7 +129,7 @@ class Pay extends BasicWePay */ public function queryRefund(array $options) { - return Order::instance($this->config->get())->query($options); + return Refund::instance($this->config->get())->query($options); } /**