From d70fd67d15675ecc9d30cf15447cdbbff72d003e Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 3 Apr 2020 10:31:10 +0800 Subject: [PATCH] ComposerUpdate --- app/index/controller/Index.php | 19 ---------- composer.lock | 18 +++++----- vendor/composer/installed.json | 20 +++++------ vendor/services.php | 2 +- .../topthink/think-helper/src/Collection.php | 20 +++++------ .../src/service/ExpressService.php | 35 ++++++++----------- 6 files changed, 45 insertions(+), 69 deletions(-) diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index c1b460bac..b6ea67e5a 100644 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -16,7 +16,6 @@ namespace app\index\controller; use think\admin\Controller; -use think\admin\service\QueueService; /** * Class Index @@ -28,22 +27,4 @@ class Index extends Controller { $this->redirect(url('@admin/login')); } - - /** - * 创建测试进度任务 - * @param null $code - * @throws \think\Exception - * @throws \think\admin\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - */ - public function test($code = null) - { - if (empty($code)) { - $code = sysqueue('测试', 'xadmin:tests'); - $this->redirect(url("@index/index/test/code/{$code}")); - } - dump(QueueService::instance()->progress($code)); - } } \ No newline at end of file diff --git a/composer.lock b/composer.lock index 532bc7d1b..1462a5405 100644 --- a/composer.lock +++ b/composer.lock @@ -626,16 +626,16 @@ }, { "name": "topthink/think-helper", - "version": "v3.1.3", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/top-think/think-helper.git", - "reference": "4d85dfd3778623bbb1de3648f1dcd0c82f4439f4" + "reference": "c28d37743bda4a0455286ca85b17b5791d626e10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-helper/zipball/4d85dfd3778623bbb1de3648f1dcd0c82f4439f4", - "reference": "4d85dfd3778623bbb1de3648f1dcd0c82f4439f4", + "url": "https://api.github.com/repos/top-think/think-helper/zipball/c28d37743bda4a0455286ca85b17b5791d626e10", + "reference": "c28d37743bda4a0455286ca85b17b5791d626e10", "shasum": "", "mirrors": [ { @@ -667,7 +667,7 @@ } ], "description": "The ThinkPHP6 Helper Package", - "time": "2019-09-30T02:36:48+00:00" + "time": "2019-11-08T08:01:10+00:00" }, { "name": "topthink/think-multi-app", @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "e031f91b1c3d64b190f202e6e913bfa301d2ce14" + "reference": "c161f6c8dec3e80a5efb82342f55e0273d530c3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e031f91b1c3d64b190f202e6e913bfa301d2ce14", - "reference": "e031f91b1c3d64b190f202e6e913bfa301d2ce14", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c161f6c8dec3e80a5efb82342f55e0273d530c3f", + "reference": "c161f6c8dec3e80a5efb82342f55e0273d530c3f", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-04-01T08:17:31+00:00" + "time": "2020-04-03T02:28:18+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 23b358199..fe19a5ef5 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -639,17 +639,17 @@ }, { "name": "topthink/think-helper", - "version": "v3.1.3", - "version_normalized": "3.1.3.0", + "version": "v3.1.4", + "version_normalized": "3.1.4.0", "source": { "type": "git", "url": "https://github.com/top-think/think-helper.git", - "reference": "4d85dfd3778623bbb1de3648f1dcd0c82f4439f4" + "reference": "c28d37743bda4a0455286ca85b17b5791d626e10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-helper/zipball/4d85dfd3778623bbb1de3648f1dcd0c82f4439f4", - "reference": "4d85dfd3778623bbb1de3648f1dcd0c82f4439f4", + "url": "https://api.github.com/repos/top-think/think-helper/zipball/c28d37743bda4a0455286ca85b17b5791d626e10", + "reference": "c28d37743bda4a0455286ca85b17b5791d626e10", "shasum": "", "mirrors": [ { @@ -661,7 +661,7 @@ "require": { "php": ">=7.1.0" }, - "time": "2019-09-30T02:36:48+00:00", + "time": "2019-11-08T08:01:10+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "e031f91b1c3d64b190f202e6e913bfa301d2ce14" + "reference": "c161f6c8dec3e80a5efb82342f55e0273d530c3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e031f91b1c3d64b190f202e6e913bfa301d2ce14", - "reference": "e031f91b1c3d64b190f202e6e913bfa301d2ce14", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c161f6c8dec3e80a5efb82342f55e0273d530c3f", + "reference": "c161f6c8dec3e80a5efb82342f55e0273d530c3f", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-04-01T08:17:31+00:00", + "time": "2020-04-03T02:28:18+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 5b44f11cb..14346171e 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/topthink/think-helper/src/Collection.php b/vendor/topthink/think-helper/src/Collection.php index f3d0a838b..905f3f86b 100644 --- a/vendor/topthink/think-helper/src/Collection.php +++ b/vendor/topthink/think-helper/src/Collection.php @@ -353,7 +353,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria return $this->filter(function ($data) use ($field, $operator, $value) { if (strpos($field, '.')) { - list($field, $relation) = explode('.', $field); + [$field, $relation] = explode('.', $field); $result = $data[$field][$relation] ?? null; } else { @@ -385,10 +385,10 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria case 'not in': return is_scalar($result) && !in_array($result, $value, true); case 'between': - list($min, $max) = is_string($value) ? explode(',', $value) : $value; + [$min, $max] = is_string($value) ? explode(',', $value) : $value; return is_scalar($result) && $result >= $min && $result <= $max; case 'not between': - list($min, $max) = is_string($value) ? explode(',', $value) : $value; + [$min, $max] = is_string($value) ? explode(',', $value) : $value; return is_scalar($result) && $result > $max || $result < $min; case '==': case '=': @@ -473,11 +473,11 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria /** * 返回数据中指定的一列 * @access public - * @param string $columnKey 键名 - * @param string $indexKey 作为索引值的列 + * @param string|null $columnKey 键名 + * @param string|null $indexKey 作为索引值的列 * @return array */ - public function column(string $columnKey, string $indexKey = null) + public function column(?string $columnKey, string $indexKey = null) { return array_column($this->items, $columnKey, $indexKey); } @@ -509,13 +509,13 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria * @param string $order 排序 * @return $this */ - public function order(string $field, string $order = null) + public function order(string $field, string $order = 'asc') { return $this->sort(function ($a, $b) use ($field, $order) { $fieldA = $a[$field] ?? null; $fieldB = $b[$field] ?? null; - return 'desc' == strtolower($order) ? strcmp($fieldB, $fieldA) : strcmp($fieldA, $fieldB); + return 'desc' == strtolower($order) ? $fieldB > $fieldA : $fieldA > $fieldB; }); } @@ -535,7 +535,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } /** - * 获取最后一个单元数据 + * 获取最第一个单元数据 * * @access public * @param callable|null $callback @@ -548,7 +548,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria } /** - * 获取第一个单元数据 + * 获取最后一个单元数据 * * @access public * @param callable|null $callback diff --git a/vendor/zoujingli/think-library/src/service/ExpressService.php b/vendor/zoujingli/think-library/src/service/ExpressService.php index 25c0253fc..61b380c43 100644 --- a/vendor/zoujingli/think-library/src/service/ExpressService.php +++ b/vendor/zoujingli/think-library/src/service/ExpressService.php @@ -26,17 +26,12 @@ use think\admin\Service; */ class ExpressService extends Service { - /** - * 网络请求令牌 - * @var string - */ - protected $token; /** * 网络请求参数 * @var array */ - protected $config; + protected $options; /** * 快递服务初始化 @@ -47,8 +42,7 @@ class ExpressService extends Service $clentip = $this->app->request->ip(); $cookies = "{$this->app->getRootPath()}runtime/.express.cookie"; $headers = ['Host:express.baidu.com', "CLIENT-IP:{$clentip}", "X-FORWARDED-FOR:{$clentip}"]; - $this->config = ['cookie_file' => $cookies, 'headers' => $headers]; - $this->token = $this->getExpressToken(); + $this->options = ['cookie_file' => $cookies, 'headers' => $headers]; return $this; } @@ -76,11 +70,11 @@ class ExpressService extends Service /** * 获取快递公司列表 + * @param array $data * @return array */ - public function getExpressList() + public function getExpressList($data = []) { - $data = []; if (preg_match('/"currentData":.*?\[(.*?)],/', $this->getWapBaiduHtml(), $matches)) { foreach (json_decode("[{$matches['1']}]") as $item) $data[$item->value] = $item->text; unset($data['_auto']); @@ -100,21 +94,21 @@ class ExpressService extends Service private function doExpress($code, $number) { $qid = CodeExtend::uniqidNumber(19, '7740'); - $url = "https://express.baidu.com/express/api/express?tokenV2={$this->token}&appid=4001&nu={$number}&com={$code}&qid={$qid}&new_need_di=1&source_xcx=0&vcode=&token=&sourceId=4155&cb=callback"; - return json_decode(str_replace('/**/callback(', '', trim(HttpExtend::get($url, [], $this->config), ')')), true); + $url = "{$this->getExpressQueryApi()}&appid=4001&nu={$number}&com={$code}&qid={$qid}&new_need_di=1&source_xcx=0&vcode=&token=&sourceId=4155&cb=callback"; + return json_decode(str_replace('/**/callback(', '', trim(HttpExtend::get($url, [], $this->options), ')')), true); } /** - * 获取接口请求令牌 + * 获取快递查询接口 * @return string */ - private function getExpressToken() + private function getExpressQueryApi() { - if (preg_match('/express\?tokenV2=(.*?)",/', $this->getWapBaiduHtml(), $matches)) { - return $matches[1]; + if (preg_match('/"expSearchApi":.*?"(.*?)",/', $this->getWapBaiduHtml(), $matches)) { + return str_replace('\\', '', $matches[1]); } else { $this->app->cache->delete('express_kuaidi_html'); - return $this->getExpressToken(); + return $this->getExpressQueryApi(); } } @@ -124,9 +118,10 @@ class ExpressService extends Service */ private function getWapBaiduHtml() { - $content = $this->app->cache->get('express_kuaidi_html'); - while (empty($content) || stristr($content, '百度安全验证') > -1 || stripos($content, 'tokenV2') === -1) { - $content = HttpExtend::get('https://m.baidu.com/s?word=快递查询&rand=' . microtime(true), [], $this->config); + $content = $this->app->cache->get('express_kuaidi_html', ''); + while (empty($content) || stripos($content, '"expSearchApi":') === -1) { + $uniqid = str_replace('.', '', microtime(true)); + $content = HttpExtend::get("https://m.baidu.com/s?word=快递查询&rand={$uniqid}", [], $this->options); } $this->app->cache->set('express_kuaidi_html', $content, 30); return $content;