From 105d6a0a53d43d4d6a15b462139403567e8dda0c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 13 Mar 2020 14:10:49 +0800
Subject: [PATCH] ComposerUpdate

---
 app/admin/view/config/index.html                      | 11 ++++-------
 composer.lock                                         |  8 ++++----
 vendor/composer/installed.json                        |  8 ++++----
 vendor/services.php                                   |  2 +-
 .../think-library/src/service/ExpressService.php      |  2 +-
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html
index f4245d585..28832b63d 100644
--- a/app/admin/view/config/index.html
+++ b/app/admin/view/config/index.html
@@ -70,18 +70,17 @@
 </div>
 
 <div class="think-box-shadow padding-40 padding-top-30 padding-bottom-30">
-
     <table class="layui-table" lay-even>
         <caption class="color-green font-w7 text-left">系统信息 System Information</caption>
         <tbody>
-        <tr>
-            <td>管理程序</td>
-            <td>ThinkAdmin Version {$app->config->get('app.thinkadmin_ver','v6')}</td>
-        </tr>
         <tr>
             <td>核心框架</td>
             <td>ThinkPHP Version {$app->version()}</td>
         </tr>
+        <tr>
+            <td>管理程序</td>
+            <td>ThinkAdmin Version {$app->config->get('app.thinkadmin_ver','v6')}</td>
+        </tr>
         <tr>
             <td>服务器信息</td>
             <td>{:php_uname()}</td>
@@ -100,8 +99,6 @@
         </tr>
         </tbody>
     </table>
-
 </div>
 
-
 {/block}
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 4e2549ebb..f4cfb4ed3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -909,12 +909,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "56bec8b70dd7eb4a40c03b59b5a20b85dfb8888d"
+                "reference": "40ecfc8d32b1aff78de297c28ec7886b6dbf6643"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/56bec8b70dd7eb4a40c03b59b5a20b85dfb8888d",
-                "reference": "56bec8b70dd7eb4a40c03b59b5a20b85dfb8888d",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/40ecfc8d32b1aff78de297c28ec7886b6dbf6643",
+                "reference": "40ecfc8d32b1aff78de297c28ec7886b6dbf6643",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -958,7 +958,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2020-03-11T02:14:54+00:00"
+            "time": "2020-03-12T02:42:38+00:00"
         },
         {
             "name": "zoujingli/wechat-developer",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b01bd8ffd..d46740205 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": "56bec8b70dd7eb4a40c03b59b5a20b85dfb8888d"
+            "reference": "40ecfc8d32b1aff78de297c28ec7886b6dbf6643"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/56bec8b70dd7eb4a40c03b59b5a20b85dfb8888d",
-            "reference": "56bec8b70dd7eb4a40c03b59b5a20b85dfb8888d",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/40ecfc8d32b1aff78de297c28ec7886b6dbf6643",
+            "reference": "40ecfc8d32b1aff78de297c28ec7886b6dbf6643",
             "shasum": "",
             "mirrors": [
                 {
@@ -956,7 +956,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-03-11T02:14:54+00:00",
+        "time": "2020-03-12T02:42:38+00:00",
         "type": "library",
         "extra": {
             "think": {
diff --git a/vendor/services.php b/vendor/services.php
index 632c302d4..b00e83a3d 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-03-11 17:54:13
+// This file is automatically generated at:2020-03-13 14:10:34
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',
diff --git a/vendor/zoujingli/think-library/src/service/ExpressService.php b/vendor/zoujingli/think-library/src/service/ExpressService.php
index b8732f000..b900b1650 100644
--- a/vendor/zoujingli/think-library/src/service/ExpressService.php
+++ b/vendor/zoujingli/think-library/src/service/ExpressService.php
@@ -125,7 +125,7 @@ class ExpressService extends Service
     {
         $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=73124161428372&rnd=' . uniqid(), [], $this->options);
+            $content = HttpExtend::get('https://m.baidu.com/s?word=快递查询&rnd=' . uniqid(), [], $this->options);
         }
         $this->app->cache->set('express_kuaidi_html', $content, 30);
         return $content;