diff --git a/composer.lock b/composer.lock
index 4ac273251..0aa0fff53 100644
--- a/composer.lock
+++ b/composer.lock
@@ -909,12 +909,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
- "reference": "b5976aed117fc4d0435723235a6cf258322a18a0"
+ "reference": "bc592ee0fba92938ec97f327cbbd119e0ff14288"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b5976aed117fc4d0435723235a6cf258322a18a0",
- "reference": "b5976aed117fc4d0435723235a6cf258322a18a0",
+ "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bc592ee0fba92938ec97f327cbbd119e0ff14288",
+ "reference": "bc592ee0fba92938ec97f327cbbd119e0ff14288",
"shasum": "",
"mirrors": [
{
@@ -958,7 +958,7 @@
],
"description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top",
- "time": "2019-12-21T06:59:41+00:00"
+ "time": "2019-12-23T06:45:36+00:00"
},
{
"name": "zoujingli/wechat-developer",
diff --git a/config/cache.php b/config/cache.php
index a4f48c399..11417d94d 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -22,10 +22,10 @@ return [
// 驱动方式
'type' => 'File',
// 缓存保存目录
- 'path' => app()->getRuntimePath() . 'cache',
- // 缓存前缀
+ 'path' => app()->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR,
+ // 缓存名称前缀
'prefix' => '',
- // 缓存有效期 0表示永久缓存
+ // 缓存有效期 0 表示永久缓存
'expire' => 0,
// 缓存标签前缀
'tag_prefix' => 'tag:',
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index e81c43ca7..63f91ce5a 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -277,6 +277,7 @@ return array(
'think\\admin\\service\\JsonRpcClientService' => $vendorDir . '/zoujingli/think-library/src/service/JsonRpcClientService.php',
'think\\admin\\service\\JsonRpcServerService' => $vendorDir . '/zoujingli/think-library/src/service/JsonRpcServerService.php',
'think\\admin\\service\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php',
+ 'think\\admin\\service\\MessageService' => $vendorDir . '/zoujingli/think-library/src/service/MessageService.php',
'think\\admin\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php',
'think\\admin\\service\\ProcessService' => $vendorDir . '/zoujingli/think-library/src/service/ProcessService.php',
'think\\admin\\service\\QueueService' => $vendorDir . '/zoujingli/think-library/src/service/QueueService.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 4e3f16e73..49299c44a 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -417,6 +417,7 @@ class ComposerStaticInitada0e677dd8f1307ba83d0cf07626e6c
'think\\admin\\service\\JsonRpcClientService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/JsonRpcClientService.php',
'think\\admin\\service\\JsonRpcServerService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/JsonRpcServerService.php',
'think\\admin\\service\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php',
+ 'think\\admin\\service\\MessageService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MessageService.php',
'think\\admin\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php',
'think\\admin\\service\\ProcessService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/ProcessService.php',
'think\\admin\\service\\QueueService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/QueueService.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 160d08dcc..11fb534d3 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -935,12 +935,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
- "reference": "b5976aed117fc4d0435723235a6cf258322a18a0"
+ "reference": "bc592ee0fba92938ec97f327cbbd119e0ff14288"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b5976aed117fc4d0435723235a6cf258322a18a0",
- "reference": "b5976aed117fc4d0435723235a6cf258322a18a0",
+ "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bc592ee0fba92938ec97f327cbbd119e0ff14288",
+ "reference": "bc592ee0fba92938ec97f327cbbd119e0ff14288",
"shasum": "",
"mirrors": [
{
@@ -956,7 +956,7 @@
"ext-json": "*",
"topthink/framework": "^6.0"
},
- "time": "2019-12-21T06:59:41+00:00",
+ "time": "2019-12-23T06:45:36+00:00",
"type": "library",
"extra": {
"think": {
diff --git a/vendor/services.php b/vendor/services.php
index 0c3e51da8..eb3628f3c 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
<?php
-// This file is automatically generated at:2019-12-21 17:11:54
+// This file is automatically generated at:2019-12-23 15:23:32
declare (strict_types = 1);
return array (
0 => 'think\\app\\Service',
diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php
index 2b2fbe1a1..9b62e1643 100644
--- a/vendor/zoujingli/think-library/src/Controller.php
+++ b/vendor/zoujingli/think-library/src/Controller.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/Helper.php b/vendor/zoujingli/think-library/src/Helper.php
index b3debbad0..79d74e257 100644
--- a/vendor/zoujingli/think-library/src/Helper.php
+++ b/vendor/zoujingli/think-library/src/Helper.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php
index 7b2ecaff4..8a161c871 100644
--- a/vendor/zoujingli/think-library/src/Library.php
+++ b/vendor/zoujingli/think-library/src/Library.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin;
diff --git a/vendor/zoujingli/think-library/src/Service.php b/vendor/zoujingli/think-library/src/Service.php
index 469618a0f..13025b9ac 100644
--- a/vendor/zoujingli/think-library/src/Service.php
+++ b/vendor/zoujingli/think-library/src/Service.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin;
diff --git a/vendor/zoujingli/think-library/src/Storage.php b/vendor/zoujingli/think-library/src/Storage.php
index 616b2ef34..e22cd70c4 100644
--- a/vendor/zoujingli/think-library/src/Storage.php
+++ b/vendor/zoujingli/think-library/src/Storage.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php
index 4f04e3dfe..715866e7d 100644
--- a/vendor/zoujingli/think-library/src/command/Install.php
+++ b/vendor/zoujingli/think-library/src/command/Install.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/command/Version.php b/vendor/zoujingli/think-library/src/command/Version.php
index c9e507675..f8ba8531c 100644
--- a/vendor/zoujingli/think-library/src/command/Version.php
+++ b/vendor/zoujingli/think-library/src/command/Version.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php
index 4ec8e0a70..f2d99dede 100644
--- a/vendor/zoujingli/think-library/src/common.php
+++ b/vendor/zoujingli/think-library/src/common.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/extend/CodeExtend.php b/vendor/zoujingli/think-library/src/extend/CodeExtend.php
index 93b82f76b..0a3e960f4 100644
--- a/vendor/zoujingli/think-library/src/extend/CodeExtend.php
+++ b/vendor/zoujingli/think-library/src/extend/CodeExtend.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\extend;
diff --git a/vendor/zoujingli/think-library/src/extend/DataExtend.php b/vendor/zoujingli/think-library/src/extend/DataExtend.php
index 0a25cf85f..936761165 100644
--- a/vendor/zoujingli/think-library/src/extend/DataExtend.php
+++ b/vendor/zoujingli/think-library/src/extend/DataExtend.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\extend;
diff --git a/vendor/zoujingli/think-library/src/extend/ExcelExtend.php b/vendor/zoujingli/think-library/src/extend/ExcelExtend.php
index d35ca88f5..d43d655e7 100644
--- a/vendor/zoujingli/think-library/src/extend/ExcelExtend.php
+++ b/vendor/zoujingli/think-library/src/extend/ExcelExtend.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\extend;
diff --git a/vendor/zoujingli/think-library/src/extend/HttpExtend.php b/vendor/zoujingli/think-library/src/extend/HttpExtend.php
index 944fcc3a6..34aa7fda7 100644
--- a/vendor/zoujingli/think-library/src/extend/HttpExtend.php
+++ b/vendor/zoujingli/think-library/src/extend/HttpExtend.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/helper/DeleteHelper.php b/vendor/zoujingli/think-library/src/helper/DeleteHelper.php
index 47b5f5531..ca8e442d8 100644
--- a/vendor/zoujingli/think-library/src/helper/DeleteHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/DeleteHelper.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/helper/FormHelper.php b/vendor/zoujingli/think-library/src/helper/FormHelper.php
index 650152e4a..0551265b8 100644
--- a/vendor/zoujingli/think-library/src/helper/FormHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/FormHelper.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/helper/PageHelper.php b/vendor/zoujingli/think-library/src/helper/PageHelper.php
index 39f392836..4c8edc6e7 100644
--- a/vendor/zoujingli/think-library/src/helper/PageHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/PageHelper.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/helper/QueryHelper.php b/vendor/zoujingli/think-library/src/helper/QueryHelper.php
index c864bf5d3..4b37e95bd 100644
--- a/vendor/zoujingli/think-library/src/helper/QueryHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/QueryHelper.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/helper/SaveHelper.php b/vendor/zoujingli/think-library/src/helper/SaveHelper.php
index 7431a96e3..e3af4564a 100644
--- a/vendor/zoujingli/think-library/src/helper/SaveHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/SaveHelper.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/helper/TokenHelper.php b/vendor/zoujingli/think-library/src/helper/TokenHelper.php
index 9466be9eb..bf57a2c5a 100644
--- a/vendor/zoujingli/think-library/src/helper/TokenHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/TokenHelper.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/helper/ValidateHelper.php b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php
index 6617146a2..6f1273931 100644
--- a/vendor/zoujingli/think-library/src/helper/ValidateHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/ValidateHelper.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/queue/ListenQueue.php b/vendor/zoujingli/think-library/src/queue/ListenQueue.php
index 34a40c8c3..31a9b7488 100644
--- a/vendor/zoujingli/think-library/src/queue/ListenQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/ListenQueue.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\queue;
diff --git a/vendor/zoujingli/think-library/src/queue/QueryQueue.php b/vendor/zoujingli/think-library/src/queue/QueryQueue.php
index ea7d3e803..c18439a72 100644
--- a/vendor/zoujingli/think-library/src/queue/QueryQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/QueryQueue.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\queue;
diff --git a/vendor/zoujingli/think-library/src/queue/StartQueue.php b/vendor/zoujingli/think-library/src/queue/StartQueue.php
index eb576d6ed..64a31cf42 100644
--- a/vendor/zoujingli/think-library/src/queue/StartQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/StartQueue.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\queue;
diff --git a/vendor/zoujingli/think-library/src/queue/StateQueue.php b/vendor/zoujingli/think-library/src/queue/StateQueue.php
index d99517b40..7f4d98319 100644
--- a/vendor/zoujingli/think-library/src/queue/StateQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/StateQueue.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\queue;
diff --git a/vendor/zoujingli/think-library/src/queue/StopQueue.php b/vendor/zoujingli/think-library/src/queue/StopQueue.php
index 03e17a78e..acfccc416 100644
--- a/vendor/zoujingli/think-library/src/queue/StopQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/StopQueue.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\queue;
diff --git a/vendor/zoujingli/think-library/src/queue/WorkQueue.php b/vendor/zoujingli/think-library/src/queue/WorkQueue.php
index 30856eb18..875711c11 100644
--- a/vendor/zoujingli/think-library/src/queue/WorkQueue.php
+++ b/vendor/zoujingli/think-library/src/queue/WorkQueue.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\queue;
diff --git a/vendor/zoujingli/think-library/src/service/AdminService.php b/vendor/zoujingli/think-library/src/service/AdminService.php
index 8567ac795..a205756f6 100644
--- a/vendor/zoujingli/think-library/src/service/AdminService.php
+++ b/vendor/zoujingli/think-library/src/service/AdminService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
diff --git a/vendor/zoujingli/think-library/src/service/CaptchaService.php b/vendor/zoujingli/think-library/src/service/CaptchaService.php
index 6fd6b2669..d2e82ebff 100644
--- a/vendor/zoujingli/think-library/src/service/CaptchaService.php
+++ b/vendor/zoujingli/think-library/src/service/CaptchaService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
@@ -59,6 +59,16 @@ class CaptchaService extends Service
return $this;
}
+ /**
+ * 动态切换配置
+ * @param array $config
+ * @return $this|Service
+ */
+ public function config($config = [])
+ {
+ return $this->initialize($config);
+ }
+
/**
* 获取验证码值
* @return string
diff --git a/vendor/zoujingli/think-library/src/service/ExpressService.php b/vendor/zoujingli/think-library/src/service/ExpressService.php
index a0693c82d..942deb277 100644
--- a/vendor/zoujingli/think-library/src/service/ExpressService.php
+++ b/vendor/zoujingli/think-library/src/service/ExpressService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
diff --git a/vendor/zoujingli/think-library/src/service/InstallService.php b/vendor/zoujingli/think-library/src/service/InstallService.php
index a4d03e890..051779b01 100644
--- a/vendor/zoujingli/think-library/src/service/InstallService.php
+++ b/vendor/zoujingli/think-library/src/service/InstallService.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php b/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php
index 791133890..a661478f9 100644
--- a/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php
+++ b/vendor/zoujingli/think-library/src/service/JsonRpcClientService.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php b/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php
index 827c052cc..37e279994 100644
--- a/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php
+++ b/vendor/zoujingli/think-library/src/service/JsonRpcServerService.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/service/MenuService.php b/vendor/zoujingli/think-library/src/service/MenuService.php
index 38eb8fdad..9c8ce94dc 100644
--- a/vendor/zoujingli/think-library/src/service/MenuService.php
+++ b/vendor/zoujingli/think-library/src/service/MenuService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
diff --git a/vendor/zoujingli/think-library/src/service/MessageService.php b/vendor/zoujingli/think-library/src/service/MessageService.php
new file mode 100644
index 000000000..3dbab498a
--- /dev/null
+++ b/vendor/zoujingli/think-library/src/service/MessageService.php
@@ -0,0 +1,508 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://gitee.com/zoujingli/ThinkLibrary
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
+// +----------------------------------------------------------------------
+
+namespace think\admin\service;
+
+use think\admin\extend\HttpExtend;
+use think\admin\Service;
+
+/**
+ * 短信业务扩展服务
+ * Class MessageService
+ * @package app\store\service
+ * =================================
+ *
+ * CREATE TABLE `SystemMessageHistory` (
+ * `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ * `region` varchar(255) DEFAULT '0' COMMENT '国家编号',
+ * `phone` varchar(100) DEFAULT '' COMMENT '目标手机',
+ * `content` varchar(512) DEFAULT '' COMMENT '短信内容',
+ * `result` varchar(100) DEFAULT '' COMMENT '返回结果',
+ * `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ * PRIMARY KEY (`id`) USING BTREE,
+ * KEY `idx_system_message_history_phone` (`phone`) USING BTREE,
+ * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='短信-记录';
+ *
+ * =================================
+ * 发送国内短信需要给产品码 [productid]
+ * --- 验证短信的产品码为：676767
+ * --- 营销短信的产品码为：333333
+ * ---------------------------------
+ * ---------------------------------
+ * 发送国际短信需要给国家代码 [code]
+ * --- 国家代码见 getGlobeRegionMap
+ * ---------------------------------
+ * ---------------------------------
+ * 需要开通短信账号请联系客服
+ * --- 客服电话：18122377655
+ * =================================
+ */
+class MessageService extends Service
+{
+
+ private $table;
+
+ private $china_username;
+ private $china_password;
+
+ private $globe_username;
+ private $globe_password;
+
+ /**
+ * @return $this
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ */
+ protected function initialize(): Service
+ {
+ $this->table = 'SystemMessageHistory';
+ $this->china_username = sysconf('sms_zt.china_username');
+ $this->china_password = sysconf('sms_zt.china_password');
+ $this->globe_username = sysconf('sms_zt.globe_username');
+ $this->globe_password = sysconf('sms_zt.globe_password');
+ return $this;
+ }
+
+ /**
+ * 配置内陆短信认证
+ * @param string $username
+ * @param string $password
+ * @return $this
+ */
+ public function configChina($username, $password): MessageService
+ {
+ $this->china_username = $username;
+ $this->china_password = $password;
+ return $this;
+ }
+
+ /**
+ * 配置国际短信认证
+ * @param string $username
+ * @param string $password
+ * @return $this
+ */
+ public function configGlobe($username, $password): MessageService
+ {
+ $this->globe_username = $username;
+ $this->globe_password = $password;
+ return $this;
+ }
+
+ /**
+ * 设置存储数据表
+ * @param string $table
+ * @return $this
+ */
+ public function setSaveTable($table): MessageService
+ {
+ $this->table = $table;
+ return $this;
+ }
+
+ /**
+ * 生成短信内容
+ * @param string $content
+ * @param array $params
+ * @return string
+ */
+ public function buildContent($content, array $params = []): string
+ {
+ foreach ($params as $key => $value) {
+ $content = str_replace("{{$key}}", $value, $content);
+ }
+ return $content;
+ }
+
+ /**
+ * 发送国内短信验证码
+ * @param string $phone 手机号
+ * @param string $content 短信内容
+ * @param string $productid 短信通道ID
+ * @return boolean
+ */
+ public function sendChinaSms($phone, $content, $productid = '676767')
+ {
+ $tkey = date("YmdHis");
+ $result = HttpExtend::post('http://www.ztsms.cn/sendNSms.do', [
+ 'tkey' => $tkey,
+ 'mobile' => $phone,
+ 'content' => $content,
+ 'username' => $this->china_username,
+ 'productid' => $productid,
+ 'password' => md5(md5($this->china_password) . $tkey),
+ ]);
+ list($code, $message) = explode(',', $result . ',');
+ $this->app->db->name($this->table)->insert([
+ 'phone' => $phone, 'region' => '860', 'content' => $content, 'result' => $result,
+ ]);
+ return intval($code) === 1;
+ }
+
+ /**
+ * 发送国内短信验证码
+ * @param string $mid 会员ID
+ * @param string $phone 目标手机
+ * @param integer $wait 等待时间
+ * @param string $type 短信模板
+ * @return array
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ */
+ public function sendChinaSmsByCode($mid, $phone, $wait = 120, $type = 'sms_reg_template')
+ {
+ $cache = $this->app->cache->get($ckey = "{$type}_{$phone}", []);
+ if (is_array($cache) && isset($cache['time']) && $cache['time'] > time() - $wait) {
+ $dtime = ($cache['time'] + $wait < time()) ? 0 : ($wait - time() + $cache['time']);
+ return [1, '短信验证码已经发送！', ['time' => $dtime]];
+ }
+ list($code, $content) = [rand(1000, 9999), sysconf($type)];
+ if (empty($content) || stripos($content, '{code}') === false) {
+ $content = '您的验证码为{code}，请在十分钟内完成操作！';
+ }
+ $this->app->cache->set($ckey, $cache = ['code' => $code, 'time' => time()], 600);
+ if ($this->sendChinaSms($mid, $phone, str_replace('{code}', $code, $content))) {
+ $dtime = ($cache['time'] + $wait < time()) ? 0 : ($wait - time() + $cache['time']);
+ return [1, '短信验证码发送成功！', ['time' => $dtime]];
+ } else {
+ return [0, '短信发送失败，请稍候再试！', []];
+ }
+ }
+
+ /**
+ * 验证手机短信验证码
+ * @param string $phone 目标手机
+ * @param string $code 短信验证码
+ * @param string $type 短信模板
+ * @return boolean
+ */
+ public function checkChinaSmsByCode($phone, $code, $type = 'sms_reg_template')
+ {
+ $cache = $this->app->cache->get($cachekey = "{$type}_{$phone}", []);
+ return is_array($cache) && isset($cache['code']) && $cache['code'] == $code;
+ }
+
+ /**
+ * 查询国内短信余额
+ * @return array
+ */
+ public function queryChinaSmsBalance()
+ {
+ $tkey = date("YmdHis");
+ $result = HttpExtend::post('http://www.ztsms.cn/balanceN.do', [
+ 'username' => $this->china_username, 'tkey' => $tkey,
+ 'password' => md5(md5($this->china_password) . $tkey),
+ ]);
+ if ($result > -1) {
+ return ['code' => 1, 'num' => $result, 'msg' => '获取短信剩余条数成功！'];
+ } elseif ($result > -2) {
+ return ['code' => 0, 'num' => '0', 'msg' => '用户名或者密码不正确！'];
+ } elseif ($result > -3) {
+ return ['code' => 0, 'num' => '0', 'msg' => 'tkey不正确！'];
+ } elseif ($result > -4) {
+ return ['code' => 0, 'num' => '0', 'msg' => '用户不存在或用户停用！'];
+ }
+ }
+
+ /**
+ * 错误消息处理
+ * @var array
+ */
+ private $globeMessageMap = [
+ 2 => '用户账号为空',
+ 3 => '用户账号错误',
+ 4 => '授权密码为空',
+ 5 => '授权密码错误',
+ 6 => '当前时间为空',
+ 7 => '当前时间错误',
+ 8 => '用户类型错误',
+ 9 => '用户鉴权错误',
+ 10 => '请求IP已被列入黑名单',
+ ];
+
+ /**
+ * 发送国际短信内容
+ * @param string $mid 会员编号
+ * @param string $code 国家代码
+ * @param string $mobile 手机号码
+ * @param string $content 发送内容
+ * @return boolean
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ */
+ public function sendGlobeSms($mid, $code, $mobile, $content)
+ {
+ $tkey = date("YmdHis");
+ $result = HttpExtend::post('http://intl.zthysms.com/intSendSms.do', [
+ 'tkey' => $tkey, 'code' => $code, 'mobile' => $mobile,
+ 'content' => $content, 'username' => sysconf('sms_zt_username2'),
+ 'password' => md5(md5(sysconf('sms_zt_password2')) . $tkey),
+ ]);
+ $this->app->db->name($this->table)->insert([
+ 'mid' => $mid, 'region' => $code, 'phone' => $mobile, 'content' => $content, 'result' => $result,
+ ]);
+ return intval($result) === 1;
+ }
+
+ /**
+ * 查询国际短信余额
+ * @return array
+ */
+ public function queryGlobeSmsBalance()
+ {
+ $tkey = date("YmdHis");
+ $result = HttpExtend::post('http://intl.zthysms.com/intBalance.do', [
+ 'username' => $this->globe_username, 'tkey' => $tkey,
+ 'password' => md5(md5($this->globe_password) . $tkey),
+ ]);
+ if (!is_numeric($result) && ($state = intval($result)) && isset($this->globeMessageMap[$state])) {
+ return ['code' => 0, 'num' => 0, 'msg' => $this->globeMessageMap[$state]];
+ } else {
+ return ['code' => 1, 'num' => $result, 'msg' => '查询成功'];
+ }
+ }
+
+ /**
+ * 获取国际地域编号
+ * @return array
+ */
+ public function getGlobeRegionMap()
+ {
+ return [
+ ['title' => '中国 台湾', 'english' => 'Taiwan', 'code' => 886],
+ ['title' => '东帝汶民主共和国', 'english' => 'DEMOCRATIC REPUBLIC OF TIMORLESTE', 'code' => 670],
+ ['title' => '中非共和国', 'english' => 'Central African Republic', 'code' => 236],
+ ['title' => '丹麦', 'english' => 'Denmark', 'code' => 45],
+ ['title' => '乌克兰', 'english' => 'Ukraine', 'code' => 380],
+ ['title' => '乌兹别克斯坦', 'english' => 'Uzbekistan', 'code' => 998],
+ ['title' => '乌干达', 'english' => 'Uganda', 'code' => 256],
+ ['title' => '乌拉圭', 'english' => 'Uruguay', 'code' => 598],
+ ['title' => '乍得', 'english' => 'Chad', 'code' => 235],
+ ['title' => '也门', 'english' => 'Yemen', 'code' => 967],
+ ['title' => '亚美尼亚', 'english' => 'Armenia', 'code' => 374],
+ ['title' => '以色列', 'english' => 'Israel', 'code' => 972],
+ ['title' => '伊拉克', 'english' => 'Iraq', 'code' => 964],
+ ['title' => '伊朗', 'english' => 'Iran', 'code' => 98],
+ ['title' => '伯利兹', 'english' => 'Belize', 'code' => 501],
+ ['title' => '佛得角', 'english' => 'Cape Verde', 'code' => 238],
+ ['title' => '俄罗斯', 'english' => 'Russia', 'code' => 7],
+ ['title' => '保加利亚', 'english' => 'Bulgaria', 'code' => 359],
+ ['title' => '克罗地亚', 'english' => 'Croatia', 'code' => 385],
+ ['title' => '关岛', 'english' => 'Guam', 'code' => 1671],
+ ['title' => '冈比亚', 'english' => 'The Gambia', 'code' => 220],
+ ['title' => '冰岛', 'english' => 'Iceland', 'code' => 354],
+ ['title' => '几内亚', 'english' => 'Guinea', 'code' => 224],
+ ['title' => '几内亚比绍', 'english' => 'Guinea - Bissau', 'code' => 245],
+ ['title' => '列支敦士登', 'english' => 'Liechtenstein', 'code' => 423],
+ ['title' => '刚果共和国', 'english' => 'The Republic of Congo', 'code' => 242],
+ ['title' => '刚果民主共和国', 'english' => 'Democratic Republic of the Congo', 'code' => 243],
+ ['title' => '利比亚', 'english' => 'Libya', 'code' => 218],
+ ['title' => '利比里亚', 'english' => 'Liberia', 'code' => 231],
+ ['title' => '加拿大', 'english' => 'Canada', 'code' => 1],
+ ['title' => '加纳', 'english' => 'Ghana', 'code' => 233],
+ ['title' => '加蓬', 'english' => 'Gabon', 'code' => 241],
+ ['title' => '匈牙利', 'english' => 'Hungary', 'code' => 36],
+ ['title' => '南非', 'english' => 'South Africa', 'code' => 27],
+ ['title' => '博茨瓦纳', 'english' => 'Botswana', 'code' => 267],
+ ['title' => '卡塔尔', 'english' => 'Qatar', 'code' => 974],
+ ['title' => '卢旺达', 'english' => 'Rwanda', 'code' => 250],
+ ['title' => '卢森堡', 'english' => 'Luxembourg', 'code' => 352],
+ ['title' => '印尼', 'english' => 'Indonesia', 'code' => 62],
+ ['title' => '印度', 'english' => 'India', 'code' => 91918919],
+ ['title' => '危地马拉', 'english' => 'Guatemala', 'code' => 502],
+ ['title' => '厄瓜多尔', 'english' => 'Ecuador', 'code' => 593],
+ ['title' => '厄立特里亚', 'english' => 'Eritrea', 'code' => 291],
+ ['title' => '叙利亚', 'english' => 'Syria', 'code' => 963],
+ ['title' => '古巴', 'english' => 'Cuba', 'code' => 53],
+ ['title' => '吉尔吉斯斯坦', 'english' => 'Kyrgyzstan', 'code' => 996],
+ ['title' => '吉布提', 'english' => 'Djibouti', 'code' => 253],
+ ['title' => '哥伦比亚', 'english' => 'Colombia', 'code' => 57],
+ ['title' => '哥斯达黎加', 'english' => 'Costa Rica', 'code' => 506],
+ ['title' => '喀麦隆', 'english' => 'Cameroon', 'code' => 237],
+ ['title' => '图瓦卢', 'english' => 'Tuvalu', 'code' => 688],
+ ['title' => '土库曼斯坦', 'english' => 'Turkmenistan', 'code' => 993],
+ ['title' => '土耳其', 'english' => 'Turkey', 'code' => 90],
+ ['title' => '圣卢西亚', 'english' => 'Saint Lucia', 'code' => 1758],
+ ['title' => '圣基茨和尼维斯', 'english' => 'Saint Kitts and Nevis', 'code' => 1869],
+ ['title' => '圣多美和普林西比', 'english' => 'Sao Tome and Principe', 'code' => 239],
+ ['title' => '圣文森特和格林纳丁斯', 'english' => 'Saint Vincent and the Grenadines', 'code' => 1784],
+ ['title' => '圣皮埃尔和密克隆群岛', 'english' => 'Saint Pierre and Miquelon', 'code' => 508],
+ ['title' => '圣赫勒拿岛', 'english' => 'Saint Helena', 'code' => 290],
+ ['title' => '圣马力诺', 'english' => 'San Marino', 'code' => 378],
+ ['title' => '圭亚那', 'english' => 'Guyana', 'code' => 592],
+ ['title' => '坦桑尼亚', 'english' => 'Tanzania', 'code' => 255],
+ ['title' => '埃及', 'english' => 'Egypt', 'code' => 20],
+ ['title' => '埃塞俄比亚', 'english' => 'Ethiopia', 'code' => 251],
+ ['title' => '基里巴斯', 'english' => 'Kiribati', 'code' => 686],
+ ['title' => '塔吉克斯坦', 'english' => 'Tajikistan', 'code' => 992],
+ ['title' => '塞内加尔', 'english' => 'Senegal', 'code' => 221],
+ ['title' => '塞尔维亚', 'english' => 'Serbia and Montenegro', 'code' => 381],
+ ['title' => '塞拉利昂', 'english' => 'Sierra Leone', 'code' => 232],
+ ['title' => '塞浦路斯', 'english' => 'Cyprus', 'code' => 357],
+ ['title' => '塞舌尔', 'english' => 'Seychelles', 'code' => 248],
+ ['title' => '墨西哥', 'english' => 'Mexico', 'code' => 52],
+ ['title' => '多哥', 'english' => 'Togo', 'code' => 228],
+ ['title' => '多米尼克', 'english' => 'Dominica', 'code' => 1767],
+ ['title' => '奥地利', 'english' => 'Austria', 'code' => 43],
+ ['title' => '委内瑞拉', 'english' => 'Venezuela', 'code' => 58],
+ ['title' => '孟加拉', 'english' => 'Bangladesh', 'code' => 880],
+ ['title' => '安哥拉', 'english' => 'Angola', 'code' => 244],
+ ['title' => '安圭拉岛', 'english' => 'Anguilla', 'code' => 1264],
+ ['title' => '安道尔', 'english' => 'Andorra', 'code' => 376],
+ ['title' => '密克罗尼西亚', 'english' => 'Federated States of Micronesia', 'code' => 691],
+ ['title' => '尼加拉瓜', 'english' => 'Nicaragua', 'code' => 505],
+ ['title' => '尼日利亚', 'english' => 'Nigeria', 'code' => 234],
+ ['title' => '尼日尔', 'english' => 'Niger', 'code' => 227],
+ ['title' => '尼泊尔', 'english' => 'Nepal', 'code' => 977],
+ ['title' => '巴勒斯坦', 'english' => 'Palestine', 'code' => 970],
+ ['title' => '巴哈马', 'english' => 'The Bahamas', 'code' => 1242],
+ ['title' => '巴基斯坦', 'english' => 'Pakistan', 'code' => 92],
+ ['title' => '巴巴多斯', 'english' => 'Barbados', 'code' => 1246],
+ ['title' => '巴布亚新几内亚', 'english' => 'Papua New Guinea', 'code' => 675],
+ ['title' => '巴拉圭', 'english' => 'Paraguay', 'code' => 595],
+ ['title' => '巴拿马', 'english' => 'Panama', 'code' => 507],
+ ['title' => '巴林', 'english' => 'Bahrain', 'code' => 973],
+ ['title' => '巴西', 'english' => 'Brazil', 'code' => 55],
+ ['title' => '布基纳法索', 'english' => ' Burkina Faso', 'code' => 226],
+ ['title' => '布隆迪', 'english' => 'Burundi', 'code' => 257],
+ ['title' => '希腊', 'english' => ' Greece', 'code' => 30],
+ ['title' => '帕劳', 'english' => 'Palau', 'code' => 680],
+ ['title' => '库克群岛', 'english' => ' Cook Islands', 'code' => 682],
+ ['title' => '开曼群岛', 'english' => 'Cayman Islands', 'code' => 1345],
+ ['title' => '德国', 'english' => ' Germany', 'code' => 49],
+ ['title' => '意大利', 'english' => 'Italy', 'code' => 39],
+ ['title' => '所罗门群岛', 'english' => ' Solomon Islands', 'code' => 677],
+ ['title' => '托克劳', 'english' => 'Tokelau', 'code' => 690],
+ ['title' => '拉脱维亚', 'english' => 'Latvia', 'code' => 371],
+ ['title' => '挪威', 'english' => 'Norway', 'code' => 47],
+ ['title' => '捷克共和国', 'english' => 'Czech Republic', 'code' => 420],
+ ['title' => '摩尔多瓦', 'english' => 'Moldova', 'code' => 373],
+ ['title' => '摩洛哥', 'english' => 'Morocco', 'code' => 212],
+ ['title' => '摩纳哥', 'english' => 'Monaco', 'code' => 377],
+ ['title' => '文莱', 'english' => 'Brunei Darussalam', 'code' => 673],
+ ['title' => '斐济', 'english' => 'Fiji', 'code' => 679],
+ ['title' => '斯威士兰王国', 'english' => 'The Kingdom of Swaziland', 'code' => 268],
+ ['title' => '斯洛伐克', 'english' => 'Slovakia', 'code' => 421],
+ ['title' => '斯洛文尼亚', 'english' => 'Slovenia', 'code' => 386],
+ ['title' => '斯里兰卡', 'english' => 'Sri Lanka', 'code' => 94],
+ ['title' => '新加坡', 'english' => 'Singapore ', 'code' => 65],
+ ['title' => '新喀里多尼亚', 'english' => 'New Caledonia', 'code' => 687],
+ ['title' => '新西兰', 'english' => 'New Zealand', 'code' => 64],
+ ['title' => '日本', 'english' => 'Japan', 'code' => 81],
+ ['title' => '智利', 'english' => 'Chile', 'code' => 56],
+ ['title' => '朝鲜', 'english' => 'Korea, North', 'code' => 850],
+ ['title' => '柬埔寨 ', 'english' => 'Cambodia', 'code' => 855],
+ ['title' => '格林纳达', 'english' => 'Grenada', 'code' => 1473],
+ ['title' => '格陵兰', 'english' => 'Greenland', 'code' => 299],
+ ['title' => '格鲁吉亚', 'english' => 'Georgia', 'code' => 995],
+ ['title' => '比利时', 'english' => 'Belgium', 'code' => 32],
+ ['title' => '毛里塔尼亚', 'english' => 'Mauritania', 'code' => 222],
+ ['title' => '毛里求斯', 'english' => 'Mauritius', 'code' => 230],
+ ['title' => '汤加', 'english' => 'Tonga', 'code' => 676],
+ ['title' => '沙特阿拉伯', 'english' => 'Saudi Arabia', 'code' => 966],
+ ['title' => '法国', 'english' => 'France', 'code' => 33],
+ ['title' => '法属圭亚那', 'english' => 'French Guiana', 'code' => 594],
+ ['title' => '法属波利尼西亚', 'english' => 'French Polynesia', 'code' => 689],
+ ['title' => '法属西印度群岛', 'english' => 'french west indies', 'code' => 596],
+ ['title' => '法罗群岛', 'english' => 'Faroe Islands', 'code' => 298],
+ ['title' => '波兰', 'english' => 'Poland', 'code' => 48],
+ ['title' => '波多黎各', 'english' => 'The Commonwealth of Puerto Rico', 'code' => 17871939],
+ ['title' => '波黑', 'english' => 'Bosnia and Herzegovina ', 'code' => 387],
+ ['title' => '泰国', 'english' => 'Thailand', 'code' => 66],
+ ['title' => '津巴布韦', 'english' => 'Zimbabwe', 'code' => 263],
+ ['title' => '洪都拉斯', 'english' => 'Honduras', 'code' => 504],
+ ['title' => '海地', 'english' => 'Haiti', 'code' => 509],
+ ['title' => '澳大利亚', 'english' => 'Australia', 'code' => 61],
+ ['title' => '澳门', 'english' => 'Macao', 'code' => 853],
+ ['title' => '爱尔兰', 'english' => 'Ireland', 'code' => 353],
+ ['title' => '爱沙尼亚', 'english' => 'Estonia', 'code' => 372],
+ ['title' => '牙买加 ', 'english' => 'Jamaica', 'code' => 1876],
+ ['title' => '特克斯和凯科斯群岛', 'english' => 'Turks and Caicos Islands', 'code' => 1649],
+ ['title' => '特立尼达和多巴哥', 'english' => 'Trinidad and Tobago', 'code' => 1868],
+ ['title' => '玻利维亚', 'english' => 'Bolivia', 'code' => 591],
+ ['title' => '瑙鲁', 'english' => 'Nauru', 'code' => 674],
+ ['title' => '瑞典', 'english' => 'Sweden', 'code' => 46],
+ ['title' => '瑞士', 'english' => 'Switzerland', 'code' => 41],
+ ['title' => '瓜德罗普', 'english' => 'Guadeloupe', 'code' => 590],
+ ['title' => '瓦利斯和富图纳群岛', 'english' => 'Wallis et Futuna', 'code' => 681],
+ ['title' => '瓦努阿图', 'english' => 'Vanuatu', 'code' => 678],
+ ['title' => '留尼汪 ', 'english' => 'Reunion', 'code' => 262],
+ ['title' => '白俄罗斯', 'english' => 'Belarus', 'code' => 375],
+ ['title' => '百慕大', 'english' => 'Bermuda', 'code' => 1441],
+ ['title' => '直布罗陀', 'english' => 'Gibraltar', 'code' => 350],
+ ['title' => '福克兰群岛', 'english' => 'Falkland', 'code' => 500],
+ ['title' => '科威特', 'english' => 'Kuwait', 'code' => 965],
+ ['title' => '科摩罗和马约特', 'english' => 'Comoros', 'code' => 269],
+ ['title' => '科特迪瓦', 'english' => 'Cote d’Ivoire', 'code' => 225],
+ ['title' => '秘鲁', 'english' => 'Peru', 'code' => 51],
+ ['title' => '突尼斯', 'english' => 'Tunisia', 'code' => 216],
+ ['title' => '立陶宛', 'english' => 'Lithuania', 'code' => 370],
+ ['title' => '索马里', 'english' => 'Somalia', 'code' => 252],
+ ['title' => '约旦', 'english' => 'Jordan', 'code' => 962],
+ ['title' => '纳米比亚', 'english' => 'Namibia', 'code' => 264],
+ ['title' => '纽埃岛', 'english' => 'Island of Niue', 'code' => 683],
+ ['title' => '缅甸 ', 'english' => 'Burma', 'code' => 95],
+ ['title' => '罗马尼亚', 'english' => 'Romania', 'code' => 40],
+ ['title' => '美国', 'english' => 'United States of America', 'code' => 1],
+ ['title' => '美属维京群岛', 'english' => 'Virgin Islands', 'code' => 1340],
+ ['title' => '美属萨摩亚', 'english' => 'American Samoa', 'code' => 1684],
+ ['title' => '老挝', 'english' => 'Laos', 'code' => 856],
+ ['title' => '肯尼亚', 'english' => 'Kenya', 'code' => 254],
+ ['title' => '芬兰', 'english' => 'Finland', 'code' => 358],
+ ['title' => '苏丹', 'english' => 'Sudan', 'code' => 249],
+ ['title' => '苏里南', 'english' => 'Suriname', 'code' => 597],
+ ['title' => '英国', 'english' => 'United Kingdom', 'code' => 44],
+ ['title' => '英属维京群岛', 'english' => 'British Virgin Islands', 'code' => 1284],
+ ['title' => '荷兰', 'english' => 'Netherlands', 'code' => 31],
+ ['title' => '荷属安的列斯', 'english' => 'Netherlands Antilles', 'code' => 599],
+ ['title' => '莫桑比克', 'english' => 'Mozambique', 'code' => 258],
+ ['title' => '莱索托', 'english' => 'Lesotho', 'code' => 266],
+ ['title' => '菲律宾', 'english' => 'Philippines', 'code' => 63],
+ ['title' => '萨尔瓦多', 'english' => 'El Salvador', 'code' => 503],
+ ['title' => '萨摩亚', 'english' => 'Samoa', 'code' => 685],
+ ['title' => '葡萄牙', 'english' => 'Portugal', 'code' => 351],
+ ['title' => '蒙古', 'english' => 'Mongolia', 'code' => 976],
+ ['title' => '西班牙', 'english' => 'Spain', 'code' => 34],
+ ['title' => '贝宁', 'english' => 'Benin', 'code' => 229],
+ ['title' => '赞比亚', 'english' => 'Zambia', 'code' => 260],
+ ['title' => '赤道几内亚', 'english' => 'Equatorial Guinea', 'code' => 240],
+ ['title' => '越南', 'english' => 'Vietnam', 'code' => 84],
+ ['title' => '阿塞拜疆', 'english' => 'Azerbaijan', 'code' => 994],
+ ['title' => '阿富汗', 'english' => 'Afghanistan', 'code' => 93],
+ ['title' => '阿尔及利亚', 'english' => 'Algeria', 'code' => 213],
+ ['title' => '阿尔巴尼亚', 'english' => 'Albania', 'code' => 355],
+ ['title' => '阿拉伯联合酋长国', 'english' => 'United Arab Emirates', 'code' => 971],
+ ['title' => '阿曼', 'english' => 'Oman', 'code' => 968],
+ ['title' => '阿根廷', 'english' => 'Argentina', 'code' => 54],
+ ['title' => '阿鲁巴', 'english' => 'Aruba', 'code' => 297],
+ ['title' => '韩国', 'english' => 'Korea, South)', 'code' => 82],
+ ['title' => '香港', 'english' => 'Hong Kong(SAR)', 'code' => 852],
+ ['title' => '马其顿', 'english' => 'Macedonia', 'code' => 389],
+ ['title' => '马尔代夫', 'english' => 'Maldives ', 'code' => 960],
+ ['title' => '马拉维', 'english' => ' Malawi', 'code' => 265],
+ ['title' => '马来西亚', 'english' => 'Malaysia', 'code' => 60],
+ ['title' => '马绍尔群岛', 'english' => 'Marshall Islands', 'code' => 692],
+ ['title' => '马耳他', 'english' => 'Malta', 'code' => 356],
+ ['title' => '马达加斯加', 'english' => 'Madagascar', 'code' => 261],
+ ['title' => '马里', 'english' => 'Mali', 'code' => 223],
+ ['title' => '黎巴嫩', 'english' => 'Lebanon', 'code' => 961],
+ ['title' => '黑山共和国', 'english' => 'The Republic of Montenegro', 'code' => 382],
+ ];
+ }
+
+}
diff --git a/vendor/zoujingli/think-library/src/service/NodeService.php b/vendor/zoujingli/think-library/src/service/NodeService.php
index ecaa0f1d3..ad97631b9 100644
--- a/vendor/zoujingli/think-library/src/service/NodeService.php
+++ b/vendor/zoujingli/think-library/src/service/NodeService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
diff --git a/vendor/zoujingli/think-library/src/service/ProcessService.php b/vendor/zoujingli/think-library/src/service/ProcessService.php
index 69d89e00c..2d3f6024f 100644
--- a/vendor/zoujingli/think-library/src/service/ProcessService.php
+++ b/vendor/zoujingli/think-library/src/service/ProcessService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
diff --git a/vendor/zoujingli/think-library/src/service/QueueService.php b/vendor/zoujingli/think-library/src/service/QueueService.php
index caa8fb869..faeb72cf8 100644
--- a/vendor/zoujingli/think-library/src/service/QueueService.php
+++ b/vendor/zoujingli/think-library/src/service/QueueService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php
index 76af2ad9b..c5eea2eda 100644
--- a/vendor/zoujingli/think-library/src/service/SystemService.php
+++ b/vendor/zoujingli/think-library/src/service/SystemService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
diff --git a/vendor/zoujingli/think-library/src/service/TokenService.php b/vendor/zoujingli/think-library/src/service/TokenService.php
index 4a09dd319..f079a2c70 100644
--- a/vendor/zoujingli/think-library/src/service/TokenService.php
+++ b/vendor/zoujingli/think-library/src/service/TokenService.php
@@ -3,14 +3,14 @@
// +----------------------------------------------------------------------
// | 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 )
// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
diff --git a/vendor/zoujingli/think-library/src/storage/AliossStorage.php b/vendor/zoujingli/think-library/src/storage/AliossStorage.php
index 9787538b1..8b48e6fc7 100644
--- a/vendor/zoujingli/think-library/src/storage/AliossStorage.php
+++ b/vendor/zoujingli/think-library/src/storage/AliossStorage.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/storage/LocalStorage.php b/vendor/zoujingli/think-library/src/storage/LocalStorage.php
index 30fd140eb..9f86a1a07 100644
--- a/vendor/zoujingli/think-library/src/storage/LocalStorage.php
+++ b/vendor/zoujingli/think-library/src/storage/LocalStorage.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/storage/QiniuStorage.php b/vendor/zoujingli/think-library/src/storage/QiniuStorage.php
index e06051fa1..05cce036b 100644
--- a/vendor/zoujingli/think-library/src/storage/QiniuStorage.php
+++ b/vendor/zoujingli/think-library/src/storage/QiniuStorage.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 )
// +----------------------------------------------------------------------
diff --git a/vendor/zoujingli/think-library/src/storage/bin/mimes.php b/vendor/zoujingli/think-library/src/storage/bin/mimes.php
index 831911f81..38739f739 100644
--- a/vendor/zoujingli/think-library/src/storage/bin/mimes.php
+++ b/vendor/zoujingli/think-library/src/storage/bin/mimes.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 )
// +----------------------------------------------------------------------