From f9fe32e1aec3fd5d4cff6c393f0ca6574bda0e89 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 9 Mar 2020 17:11:03 +0800 Subject: [PATCH] ComposerUpdate --- vendor/composer/autoload_classmap.php | 4 +- vendor/composer/autoload_static.php | 4 +- vendor/composer/installed.json | 24 ++++----- .../think-library/src/Controller.php | 2 +- vendor/zoujingli/think-library/src/File.php | 2 +- vendor/zoujingli/think-library/src/Helper.php | 2 +- .../zoujingli/think-library/src/Service.php | 2 +- .../think-library/src/command/Sess.php | 2 +- .../think-library/src/command/Sync.php | 2 +- .../think-library/src/command/Task.php | 2 +- .../think-library/src/command/sync/Admin.php | 2 +- .../think-library/src/command/sync/Config.php | 2 +- .../think-library/src/command/sync/Plugs.php | 2 +- .../src/command/sync/Service.php | 2 +- .../think-library/src/command/sync/Wechat.php | 2 +- vendor/zoujingli/think-library/src/common.php | 2 +- .../think-library/src/driver/Local.php | 2 +- .../think-library/src/driver/Oss.php | 2 +- .../think-library/src/driver/Qiniu.php | 2 +- .../think-library/src/driver/_mime.php | 2 +- .../think-library/src/helper/DeleteHelper.php | 2 +- .../think-library/src/helper/FormHelper.php | 2 +- .../think-library/src/helper/InputHelper.php | 2 +- .../think-library/src/helper/PageHelper.php | 2 +- .../think-library/src/helper/QueryHelper.php | 2 +- .../think-library/src/helper/SaveHelper.php | 2 +- .../think-library/src/helper/TokenHelper.php | 2 +- .../src/helper/ValidateHelper.php | 2 +- .../think-library/src/queue/ListenQueue.php | 2 +- .../think-library/src/queue/QueryQueue.php | 2 +- .../think-library/src/queue/StartQueue.php | 2 +- .../think-library/src/queue/StateQueue.php | 2 +- .../think-library/src/queue/StopQueue.php | 2 +- .../think-library/src/queue/WorkQueue.php | 2 +- .../src/service/AdminService.php | 2 +- .../src/service/CaptchaService.php | 2 +- .../think-library/src/service/MenuService.php | 2 +- .../think-library/src/service/NodeService.php | 2 +- .../src/service/ProcessService.php | 2 +- .../src/service/SystemService.php | 2 +- .../src/service/TokenService.php | 2 +- .../think-library/src/tools/Crypt.php | 2 +- .../think-library/src/tools/Csrf.php | 2 +- .../zoujingli/think-library/src/tools/Csv.php | 2 +- .../think-library/src/tools/Data.php | 2 +- .../think-library/src/tools/Emoji.php | 2 +- .../think-library/src/tools/Express.php | 2 +- .../think-library/src/tools/Http.php | 2 +- .../JsonRpcClient.php} | 47 ++++++++-------- .../JsonRpcServer.php} | 42 +++++++++++---- .../think-library/src/tools/Node.php | 2 +- .../think-library/src/tools/Options.php | 2 +- .../wechat-developer/AliPay/Transfer.php | 53 +++++++++++++++---- vendor/zoujingli/wechat-developer/We.php | 2 +- .../_test/alipay-transfer-account.php | 37 +++++++++++++ .../_test/alipay-transfer-create.php | 44 +++++++++++++++ .../_test/alipay-transfer-query.php | 38 +++++++++++++ 57 files changed, 279 insertions(+), 110 deletions(-) rename vendor/zoujingli/think-library/src/{service/JsonRpcClientService.php => tools/JsonRpcClient.php} (71%) rename vendor/zoujingli/think-library/src/{service/JsonRpcServerService.php => tools/JsonRpcServer.php} (81%) create mode 100644 vendor/zoujingli/wechat-developer/_test/alipay-transfer-account.php create mode 100644 vendor/zoujingli/wechat-developer/_test/alipay-transfer-create.php create mode 100644 vendor/zoujingli/wechat-developer/_test/alipay-transfer-query.php diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index f7d1f7dd4..554b53179 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -218,8 +218,6 @@ return array( 'library\\queue\\WorkQueue' => $vendorDir . '/zoujingli/think-library/src/queue/WorkQueue.php', 'library\\service\\AdminService' => $vendorDir . '/zoujingli/think-library/src/service/AdminService.php', 'library\\service\\CaptchaService' => $vendorDir . '/zoujingli/think-library/src/service/CaptchaService.php', - 'library\\service\\JsonRpcClientService' => $vendorDir . '/zoujingli/think-library/src/service/JsonRpcClientService.php', - 'library\\service\\JsonRpcServerService' => $vendorDir . '/zoujingli/think-library/src/service/JsonRpcServerService.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', @@ -232,6 +230,8 @@ return array( 'library\\tools\\Emoji' => $vendorDir . '/zoujingli/think-library/src/tools/Emoji.php', 'library\\tools\\Express' => $vendorDir . '/zoujingli/think-library/src/tools/Express.php', 'library\\tools\\Http' => $vendorDir . '/zoujingli/think-library/src/tools/Http.php', + 'library\\tools\\JsonRpcClient' => $vendorDir . '/zoujingli/think-library/src/tools/JsonRpcClient.php', + 'library\\tools\\JsonRpcServer' => $vendorDir . '/zoujingli/think-library/src/tools/JsonRpcServer.php', 'library\\tools\\Node' => $vendorDir . '/zoujingli/think-library/src/tools/Node.php', 'library\\tools\\Options' => $vendorDir . '/zoujingli/think-library/src/tools/Options.php', 'think\\Collection' => $vendorDir . '/topthink/think-helper/src/Collection.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 0fd606fcd..070173b26 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -319,8 +319,6 @@ class ComposerStaticInitbf5dd43c242f2a86b1513b16fb281176 'library\\queue\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php', 'library\\service\\AdminService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AdminService.php', 'library\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php', - 'library\\service\\JsonRpcClientService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/JsonRpcClientService.php', - 'library\\service\\JsonRpcServerService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/JsonRpcServerService.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', @@ -333,6 +331,8 @@ class ComposerStaticInitbf5dd43c242f2a86b1513b16fb281176 'library\\tools\\Emoji' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Emoji.php', 'library\\tools\\Express' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Express.php', 'library\\tools\\Http' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Http.php', + 'library\\tools\\JsonRpcClient' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/JsonRpcClient.php', + 'library\\tools\\JsonRpcServer' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/JsonRpcServer.php', 'library\\tools\\Node' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Node.php', 'library\\tools\\Options' => __DIR__ . '/..' . '/zoujingli/think-library/src/tools/Options.php', 'think\\Collection' => __DIR__ . '/..' . '/topthink/think-helper/src/Collection.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index cb70cc057..9cb67eefd 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -177,8 +177,8 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.37", - "version_normalized": "3.4.37.0", + "version": "v3.4.38", + "version_normalized": "3.4.38.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -502,12 +502,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "33ed4743a5b93e47f8f8f76949166449319ae42b" + "reference": "997cf0eb09f433a42ab3fe7f61fb4448603557c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/33ed4743a5b93e47f8f8f76949166449319ae42b", - "reference": "33ed4743a5b93e47f8f8f76949166449319ae42b", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/997cf0eb09f433a42ab3fe7f61fb4448603557c2", + "reference": "997cf0eb09f433a42ab3fe7f61fb4448603557c2", "shasum": "", "mirrors": [ { @@ -527,7 +527,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2020-02-25T07:54:31+00:00", + "time": "2020-03-03T03:03:27+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -547,17 +547,17 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.2.16", - "version_normalized": "1.2.16.0", + "version": "v1.2.17", + "version_normalized": "1.2.17.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9" + "reference": "98f6e82311a364220a677cdfd56dc9f97851ab24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/01fa1479e8c4d7a0875de96787a2bcaeacc755e9", - "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/98f6e82311a364220a677cdfd56dc9f97851ab24", + "reference": "98f6e82311a364220a677cdfd56dc9f97851ab24", "shasum": "", "mirrors": [ { @@ -575,7 +575,7 @@ "ext-simplexml": "*", "php": ">=5.4" }, - "time": "2020-01-04T08:51:50+00:00", + "time": "2020-03-03T01:38:07+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php index 56026d99a..fee398539 100644 --- a/vendor/zoujingli/think-library/src/Controller.php +++ b/vendor/zoujingli/think-library/src/Controller.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/File.php b/vendor/zoujingli/think-library/src/File.php index 8696f141f..31e96cf38 100644 --- a/vendor/zoujingli/think-library/src/File.php +++ b/vendor/zoujingli/think-library/src/File.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/Helper.php b/vendor/zoujingli/think-library/src/Helper.php index 707d3c128..8c75bdb88 100644 --- a/vendor/zoujingli/think-library/src/Helper.php +++ b/vendor/zoujingli/think-library/src/Helper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/Service.php b/vendor/zoujingli/think-library/src/Service.php index daf00e5ce..debb896c0 100644 --- a/vendor/zoujingli/think-library/src/Service.php +++ b/vendor/zoujingli/think-library/src/Service.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/command/Sess.php b/vendor/zoujingli/think-library/src/command/Sess.php index 4fb8c459a..90d224de1 100644 --- a/vendor/zoujingli/think-library/src/command/Sess.php +++ b/vendor/zoujingli/think-library/src/command/Sess.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/command/Sync.php b/vendor/zoujingli/think-library/src/command/Sync.php index a6d11e926..4f0325ec1 100644 --- a/vendor/zoujingli/think-library/src/command/Sync.php +++ b/vendor/zoujingli/think-library/src/command/Sync.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/command/Task.php b/vendor/zoujingli/think-library/src/command/Task.php index 327624727..5be49fde6 100644 --- a/vendor/zoujingli/think-library/src/command/Task.php +++ b/vendor/zoujingli/think-library/src/command/Task.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/command/sync/Admin.php b/vendor/zoujingli/think-library/src/command/sync/Admin.php index 36b7623f8..022c0cf08 100644 --- a/vendor/zoujingli/think-library/src/command/sync/Admin.php +++ b/vendor/zoujingli/think-library/src/command/sync/Admin.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/command/sync/Config.php b/vendor/zoujingli/think-library/src/command/sync/Config.php index 826205ca8..64dab07d1 100644 --- a/vendor/zoujingli/think-library/src/command/sync/Config.php +++ b/vendor/zoujingli/think-library/src/command/sync/Config.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/command/sync/Plugs.php b/vendor/zoujingli/think-library/src/command/sync/Plugs.php index d89676c49..52fe36bb0 100644 --- a/vendor/zoujingli/think-library/src/command/sync/Plugs.php +++ b/vendor/zoujingli/think-library/src/command/sync/Plugs.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/command/sync/Service.php b/vendor/zoujingli/think-library/src/command/sync/Service.php index e23cd7670..651876d7a 100644 --- a/vendor/zoujingli/think-library/src/command/sync/Service.php +++ b/vendor/zoujingli/think-library/src/command/sync/Service.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/command/sync/Wechat.php b/vendor/zoujingli/think-library/src/command/sync/Wechat.php index 1565fbced..a6e327982 100644 --- a/vendor/zoujingli/think-library/src/command/sync/Wechat.php +++ b/vendor/zoujingli/think-library/src/command/sync/Wechat.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 71d9acf91..f756ab772 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/driver/Local.php b/vendor/zoujingli/think-library/src/driver/Local.php index b155589d1..c0ed8f03e 100644 --- a/vendor/zoujingli/think-library/src/driver/Local.php +++ b/vendor/zoujingli/think-library/src/driver/Local.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/driver/Oss.php b/vendor/zoujingli/think-library/src/driver/Oss.php index 7f15599aa..a7d0910d5 100644 --- a/vendor/zoujingli/think-library/src/driver/Oss.php +++ b/vendor/zoujingli/think-library/src/driver/Oss.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/driver/Qiniu.php b/vendor/zoujingli/think-library/src/driver/Qiniu.php index ad0ea428e..bfc08d17d 100644 --- a/vendor/zoujingli/think-library/src/driver/Qiniu.php +++ b/vendor/zoujingli/think-library/src/driver/Qiniu.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/driver/_mime.php b/vendor/zoujingli/think-library/src/driver/_mime.php index 4494e1524..2010e4fc5 100644 --- a/vendor/zoujingli/think-library/src/driver/_mime.php +++ b/vendor/zoujingli/think-library/src/driver/_mime.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/helper/DeleteHelper.php b/vendor/zoujingli/think-library/src/helper/DeleteHelper.php index 12aa95a94..74483fa55 100644 --- a/vendor/zoujingli/think-library/src/helper/DeleteHelper.php +++ b/vendor/zoujingli/think-library/src/helper/DeleteHelper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/helper/FormHelper.php b/vendor/zoujingli/think-library/src/helper/FormHelper.php index c7ac30f07..9ec2679ce 100644 --- a/vendor/zoujingli/think-library/src/helper/FormHelper.php +++ b/vendor/zoujingli/think-library/src/helper/FormHelper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/helper/InputHelper.php b/vendor/zoujingli/think-library/src/helper/InputHelper.php index 8a002a0c6..ee6158fe9 100644 --- a/vendor/zoujingli/think-library/src/helper/InputHelper.php +++ b/vendor/zoujingli/think-library/src/helper/InputHelper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/helper/PageHelper.php b/vendor/zoujingli/think-library/src/helper/PageHelper.php index 3818d1c6a..81dfca049 100644 --- a/vendor/zoujingli/think-library/src/helper/PageHelper.php +++ b/vendor/zoujingli/think-library/src/helper/PageHelper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/helper/QueryHelper.php b/vendor/zoujingli/think-library/src/helper/QueryHelper.php index e4fb5246f..3903e6a3c 100644 --- a/vendor/zoujingli/think-library/src/helper/QueryHelper.php +++ b/vendor/zoujingli/think-library/src/helper/QueryHelper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/helper/SaveHelper.php b/vendor/zoujingli/think-library/src/helper/SaveHelper.php index ad5cc4269..aac8301b0 100644 --- a/vendor/zoujingli/think-library/src/helper/SaveHelper.php +++ b/vendor/zoujingli/think-library/src/helper/SaveHelper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/helper/TokenHelper.php b/vendor/zoujingli/think-library/src/helper/TokenHelper.php index 6a06b9aa6..42bce6c83 100644 --- a/vendor/zoujingli/think-library/src/helper/TokenHelper.php +++ b/vendor/zoujingli/think-library/src/helper/TokenHelper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/helper/ValidateHelper.php b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php index 43fc54ed7..650393d28 100644 --- a/vendor/zoujingli/think-library/src/helper/ValidateHelper.php +++ b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/queue/ListenQueue.php b/vendor/zoujingli/think-library/src/queue/ListenQueue.php index a51f66b35..d7002d01f 100644 --- a/vendor/zoujingli/think-library/src/queue/ListenQueue.php +++ b/vendor/zoujingli/think-library/src/queue/ListenQueue.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/queue/QueryQueue.php b/vendor/zoujingli/think-library/src/queue/QueryQueue.php index c72f79a33..e70cf2765 100644 --- a/vendor/zoujingli/think-library/src/queue/QueryQueue.php +++ b/vendor/zoujingli/think-library/src/queue/QueryQueue.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/queue/StartQueue.php b/vendor/zoujingli/think-library/src/queue/StartQueue.php index 4039b015e..fa91cfa91 100644 --- a/vendor/zoujingli/think-library/src/queue/StartQueue.php +++ b/vendor/zoujingli/think-library/src/queue/StartQueue.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/queue/StateQueue.php b/vendor/zoujingli/think-library/src/queue/StateQueue.php index 1be4b6ec2..f648abdf5 100644 --- a/vendor/zoujingli/think-library/src/queue/StateQueue.php +++ b/vendor/zoujingli/think-library/src/queue/StateQueue.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/queue/StopQueue.php b/vendor/zoujingli/think-library/src/queue/StopQueue.php index b47091314..f43cca16c 100644 --- a/vendor/zoujingli/think-library/src/queue/StopQueue.php +++ b/vendor/zoujingli/think-library/src/queue/StopQueue.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/queue/WorkQueue.php b/vendor/zoujingli/think-library/src/queue/WorkQueue.php index 4807264b6..50de0d9ef 100644 --- a/vendor/zoujingli/think-library/src/queue/WorkQueue.php +++ b/vendor/zoujingli/think-library/src/queue/WorkQueue.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/service/AdminService.php b/vendor/zoujingli/think-library/src/service/AdminService.php index d5ba6313d..e0177b475 100644 --- a/vendor/zoujingli/think-library/src/service/AdminService.php +++ b/vendor/zoujingli/think-library/src/service/AdminService.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/service/CaptchaService.php b/vendor/zoujingli/think-library/src/service/CaptchaService.php index 6f57163fa..3a6424a4d 100644 --- a/vendor/zoujingli/think-library/src/service/CaptchaService.php +++ b/vendor/zoujingli/think-library/src/service/CaptchaService.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/service/MenuService.php b/vendor/zoujingli/think-library/src/service/MenuService.php index a962540f3..c3af25197 100644 --- a/vendor/zoujingli/think-library/src/service/MenuService.php +++ b/vendor/zoujingli/think-library/src/service/MenuService.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/service/NodeService.php b/vendor/zoujingli/think-library/src/service/NodeService.php index a9d1b582d..d744fc099 100644 --- a/vendor/zoujingli/think-library/src/service/NodeService.php +++ b/vendor/zoujingli/think-library/src/service/NodeService.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/service/ProcessService.php b/vendor/zoujingli/think-library/src/service/ProcessService.php index c36cec489..a842ad087 100644 --- a/vendor/zoujingli/think-library/src/service/ProcessService.php +++ b/vendor/zoujingli/think-library/src/service/ProcessService.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index 52f1ae8fe..5fd056022 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/service/TokenService.php b/vendor/zoujingli/think-library/src/service/TokenService.php index 1b4ef2b35..09138667b 100644 --- a/vendor/zoujingli/think-library/src/service/TokenService.php +++ b/vendor/zoujingli/think-library/src/service/TokenService.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/tools/Crypt.php b/vendor/zoujingli/think-library/src/tools/Crypt.php index b414e5e69..e68c71072 100644 --- a/vendor/zoujingli/think-library/src/tools/Crypt.php +++ b/vendor/zoujingli/think-library/src/tools/Crypt.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/tools/Csrf.php b/vendor/zoujingli/think-library/src/tools/Csrf.php index b329f99eb..90f7aca16 100644 --- a/vendor/zoujingli/think-library/src/tools/Csrf.php +++ b/vendor/zoujingli/think-library/src/tools/Csrf.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/tools/Csv.php b/vendor/zoujingli/think-library/src/tools/Csv.php index 09eed725f..1030e43e5 100644 --- a/vendor/zoujingli/think-library/src/tools/Csv.php +++ b/vendor/zoujingli/think-library/src/tools/Csv.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/tools/Data.php b/vendor/zoujingli/think-library/src/tools/Data.php index 55673616c..fb3e680fe 100644 --- a/vendor/zoujingli/think-library/src/tools/Data.php +++ b/vendor/zoujingli/think-library/src/tools/Data.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/tools/Emoji.php b/vendor/zoujingli/think-library/src/tools/Emoji.php index 2139f2425..eba51d95b 100644 --- a/vendor/zoujingli/think-library/src/tools/Emoji.php +++ b/vendor/zoujingli/think-library/src/tools/Emoji.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/tools/Express.php b/vendor/zoujingli/think-library/src/tools/Express.php index 7b1e38581..eb2b18bc0 100644 --- a/vendor/zoujingli/think-library/src/tools/Express.php +++ b/vendor/zoujingli/think-library/src/tools/Express.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/tools/Http.php b/vendor/zoujingli/think-library/src/tools/Http.php index ca70ec82a..605a898c8 100644 --- a/vendor/zoujingli/think-library/src/tools/Http.php +++ b/vendor/zoujingli/think-library/src/tools/Http.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php b/vendor/zoujingli/think-library/src/tools/JsonRpcClient.php similarity index 71% rename from vendor/zoujingli/think-library/src/service/JsonRpcClientService.php rename to vendor/zoujingli/think-library/src/tools/JsonRpcClient.php index bc6b1b1c6..bf18b949a 100644 --- a/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php +++ b/vendor/zoujingli/think-library/src/tools/JsonRpcClient.php @@ -3,9 +3,9 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- -// | 官方网站: http://demo.thinkadmin.top +// | 官方网站: https://gitee.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) // +---------------------------------------------------------------------- @@ -13,18 +13,21 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace library\service; - -use library\Service; -use library\tools\Data; +namespace library\tools; /** - * JsonRpc 客户端服务 - * Class JsonRpcClientService - * @package library\service + * JsonRpc 客户端 + * Class JsonRpcClient + * @package think\admin\extend */ -class JsonRpcClientService extends Service +class JsonRpcClient { + /** + * 请求ID + * @var integer + */ + private $id; + /** * 服务端地址 * @var string @@ -32,21 +35,13 @@ class JsonRpcClientService extends Service private $proxy; /** - * 请求ID - * @var integer + * JsonRpcClient constructor. + * @param $proxy */ - private $requestid; - - /** - * 创建连接对象 - * @param string $proxy - * @return $this - */ - public function create($proxy) + public function __construct($proxy) { - $this->requestid = Data::randomCode(16, 3); + $this->id = Data::randomCode(16, 3); $this->proxy = $proxy; - return $this; } /** @@ -64,7 +59,7 @@ class JsonRpcClientService extends Service 'method' => 'POST', 'header' => 'Content-type: application/json', 'content' => json_encode([ - 'jsonrpc' => '2.0', 'method' => $method, 'params' => $params, 'id' => $this->requestid, + 'jsonrpc' => '2.0', 'method' => $method, 'params' => $params, 'id' => $this->id, ], JSON_UNESCAPED_UNICODE), ], ]; @@ -77,13 +72,13 @@ class JsonRpcClientService extends Service throw new \think\Exception("无法连接到 {$this->proxy}"); } // Final checks and return - if ($response['id'] != $this->requestid) { - throw new \think\Exception("错误的响应标记 (请求标记: {$this->requestid}, 响应标记: {$response['id']}）"); + if ($response['id'] != $this->id) { + throw new \think\Exception("错误的响应标记 (请求标记: {$this->id}, 响应标记: {$response['id']}）"); } if (is_null($response['error'])) { return $response['result']; } else { - throw new \think\Exception("请求错误：[{$response['error']['code']}] {$response['error']['message']}"); + throw new \think\Exception("请求错误：{$response['error']['message']}", $response['error']['code']); } } } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php b/vendor/zoujingli/think-library/src/tools/JsonRpcServer.php similarity index 81% rename from vendor/zoujingli/think-library/src/service/JsonRpcServerService.php rename to vendor/zoujingli/think-library/src/tools/JsonRpcServer.php index cd78b9403..a9ffa612e 100644 --- a/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php +++ b/vendor/zoujingli/think-library/src/tools/JsonRpcServer.php @@ -3,9 +3,9 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- -// | 官方网站: http://demo.thinkadmin.top +// | 官方网站: https://gitee.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) // +---------------------------------------------------------------------- @@ -13,18 +13,43 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace library\service; +namespace library\tools; -use library\Service; +use think\App; +use think\Container; use think\exception\HttpResponseException; /** - * JsonRpc 服务端服务 - * Class JsonRpcServerService - * @package library\service + * JsonRpc 服务端 + * Class JsonRpcServer + * @package think\admin\extend */ -class JsonRpcServerService extends Service +class JsonRpcServer { + /** + * 当前App对象 + * @var App + */ + protected $app; + + /** + * JsonRpcServer constructor. + * @param App $app + */ + public function __construct(App $app) + { + $this->app = $app; + } + + /** + * 静态实例对象 + * @return static + */ + public static function instance() + { + return Container::getInstance()->make(static::class); + } + /** * 设置监听对象 * @param mixed $object @@ -62,5 +87,4 @@ class JsonRpcServerService extends Service throw new HttpResponseException(json($response)->contentType('text/javascript')); } } - } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/tools/Node.php b/vendor/zoujingli/think-library/src/tools/Node.php index e7028017c..f4319a38e 100644 --- a/vendor/zoujingli/think-library/src/tools/Node.php +++ b/vendor/zoujingli/think-library/src/tools/Node.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/think-library/src/tools/Options.php b/vendor/zoujingli/think-library/src/tools/Options.php index f214f24a7..e4b51a254 100644 --- a/vendor/zoujingli/think-library/src/tools/Options.php +++ b/vendor/zoujingli/think-library/src/tools/Options.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | Library for ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://library.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/zoujingli/wechat-developer/AliPay/Transfer.php b/vendor/zoujingli/wechat-developer/AliPay/Transfer.php index bb745cf4b..46e9f21fb 100644 --- a/vendor/zoujingli/wechat-developer/AliPay/Transfer.php +++ b/vendor/zoujingli/wechat-developer/AliPay/Transfer.php @@ -25,17 +25,7 @@ class Transfer extends BasicAliPay { /** - * Transfer constructor. - * @param array $options - */ - public function __construct(array $options) - { - parent::__construct($options); - $this->options->set('method', 'alipay.fund.trans.toaccount.transfer'); - } - - /** - * 创建数据操作 + * 旧版 向指定支付宝账户转账 * @param array $options * @return mixed * @throws \WeChat\Exceptions\InvalidResponseException @@ -43,6 +33,47 @@ class Transfer extends BasicAliPay */ public function apply($options) { + $this->options->set('method', 'alipay.fund.trans.toaccount.transfer'); + return $this->getResult($options); + } + + /** + * 新版 向指定支付宝账户转账 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function create($options = []) + { + $this->options->set('method', 'alipay.fund.trans.uni.transfer'); + return $this->getResult($options); + } + + /** + * 新版 转账业务单据查询接口 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function queryResult($options = []) + { + $this->options->set('method', 'alipay.fund.trans.common.query'); + return $this->getResult($options); + + } + + /** + * 新版 支付宝资金账户资产查询接口 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function queryAccount($options = []) + { + $this->options->set('method', 'alipay.fund.account.query'); return $this->getResult($options); } } \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/We.php b/vendor/zoujingli/wechat-developer/We.php index f4bb06b36..a81ff1a25 100644 --- a/vendor/zoujingli/wechat-developer/We.php +++ b/vendor/zoujingli/wechat-developer/We.php @@ -81,7 +81,7 @@ class We * 定义当前版本 * @var string */ - const VERSION = '1.2.13'; + const VERSION = '1.2.17'; /** * 静态配置 diff --git a/vendor/zoujingli/wechat-developer/_test/alipay-transfer-account.php b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-account.php new file mode 100644 index 000000000..1d2b289e4 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-account.php @@ -0,0 +1,37 @@ +queryAccount([ + 'alipay_user_id' => $config['appid'], // 订单号 + 'account_scene_code' => 'SCENE_000_000_000', + ]); + echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
diff --git a/vendor/zoujingli/wechat-developer/_test/alipay-transfer-create.php b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-create.php
new file mode 100644
index 000000000..39d0fc429
--- /dev/null
+++ b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-create.php
@@ -0,0 +1,44 @@
+create([
+        'out_biz_no'   => time(), // 订单号
+        'trans_amount' => '10', // 转账金额
+        'product_code' => 'TRANS_ACCOUNT_NO_PWD',
+        'biz_scene'    => 'DIRECT_TRANSFER',
+        'payee_info'   => [
+            'identity'      => 'zoujingli@qq.com',
+            'identity_type' => 'ALIPAY_LOGON_ID',
+            'name'          => '邹景立',
+        ],
+    ]);
+    echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
diff --git a/vendor/zoujingli/wechat-developer/_test/alipay-transfer-query.php b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-query.php
new file mode 100644
index 000000000..7e7d99fea
--- /dev/null
+++ b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-query.php
@@ -0,0 +1,38 @@
+queryResult([
+        'out_biz_no'   => '201808080001', // 订单号
+        'product_code' => 'TRANS_ACCOUNT_NO_PWD',
+        'biz_scene'    => 'DIRECT_TRANSFER',
+    ]);
+    echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+