diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 2f5586424..145caaa0c 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -573,8 +573,8 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.44", - "version_normalized": "3.4.44.0", + "version": "v3.4.45", + "version_normalized": "3.4.45.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -963,12 +963,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "670baa69b68333030bf6abb551e32cebb737eeed" + "reference": "3a7ff93e03acdcf5c723c7c4edcb36c9c9828e6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/670baa69b68333030bf6abb551e32cebb737eeed", - "reference": "670baa69b68333030bf6abb551e32cebb737eeed", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3a7ff93e03acdcf5c723c7c4edcb36c9c9828e6a", + "reference": "3a7ff93e03acdcf5c723c7c4edcb36c9c9828e6a", "shasum": "", "mirrors": [ { @@ -985,7 +985,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-09-27T02:22:50+00:00", + "time": "2020-09-27T03:40:51+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 9cd4e4309..22b1f2429 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/service/ExpressService.php b/vendor/zoujingli/think-library/src/service/ExpressService.php index eb3dc0935..b61acbef5 100644 --- a/vendor/zoujingli/think-library/src/service/ExpressService.php +++ b/vendor/zoujingli/think-library/src/service/ExpressService.php @@ -78,7 +78,9 @@ class ExpressService extends Service if (isset($result['data']['info']['context']) && isset($result['data']['info']['state'])) { $state = intval($result['data']['info']['state']); $status = in_array($state, [0, 1, 5]) ? 2 : ($state === 3 ? 3 : 4); - foreach ($result['data']['info']['context'] as $vo) $list[] = ['time' => date('Y-m-d H:i:s', $vo['time']), 'context' => $vo['desc']]; + foreach ($result['data']['info']['context'] as $vo) { + $list[] = ['time' => date('Y-m-d H:i:s', intval($vo['time'])), 'context' => $vo['desc']]; + } $result = ['message' => $result['msg'], 'status' => $status, 'express' => $code, 'number' => $number, 'data' => $list]; $this->app->cache->set($ckey, $result, 10); return $result;