ComposerUpdate

app/admin/controller/Oplog.php

@@ -56,9 +56,8 @@ class Oplog extends Controller
     {
         $ip = new \Ip2Region();
         foreach ($data as &$vo) {
-            $result = $ip->btreeSearch($vo['geoip']);
-            $vo['isp'] = isset($result['region']) ? $result['region'] : '';
-            $vo['isp'] = str_replace(['内网IP', '0', '|'], '', $vo['isp']);
+            $isp = $ip->btreeSearch($vo['geoip']);
+            $vo['isp'] = str_replace(['内网IP', '0', '|'], '', $isp['region'] ?? '');
         }
     }
 

composer.lock

@@ -878,16 +878,16 @@
         },
         {
             "name": "zoujingli/ip2region",
-            "version": "v1.0.7",
+            "version": "v1.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ip2region.git",
-                "reference": "f898a7d90cfacd54433de4028190c336164f2ae4"
+                "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/f898a7d90cfacd54433de4028190c336164f2ae4",
-                "reference": "f898a7d90cfacd54433de4028190c336164f2ae4",
+                "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6",
+                "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -921,7 +921,7 @@
             "keywords": [
                 "Ip2Region"
             ],
-            "time": "2019-10-29T09:03:57+00:00"
+            "time": "2020-07-06T05:33:26+00:00"
         },
         {
             "name": "zoujingli/think-library",
@@ -929,12 +929,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "25f945ee112d0177cfb75942901fdd4b3bed2f07"
+                "reference": "ad82946e618337bcf51eeadf29c0aa72b5ecac5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/25f945ee112d0177cfb75942901fdd4b3bed2f07",
-                "reference": "25f945ee112d0177cfb75942901fdd4b3bed2f07",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ad82946e618337bcf51eeadf29c0aa72b5ecac5b",
+                "reference": "ad82946e618337bcf51eeadf29c0aa72b5ecac5b",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -978,7 +978,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2020-07-04T11:52:45+00:00"
+            "time": "2020-07-05T06:30:42+00:00"
         },
         {
             "name": "zoujingli/wechat-developer",

vendor/composer/installed.json

@@ -901,17 +901,17 @@
     },
     {
         "name": "zoujingli/ip2region",
-        "version": "v1.0.7",
-        "version_normalized": "1.0.7.0",
+        "version": "v1.0.8",
+        "version_normalized": "1.0.8.0",
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ip2region.git",
-            "reference": "f898a7d90cfacd54433de4028190c336164f2ae4"
+            "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/f898a7d90cfacd54433de4028190c336164f2ae4",
-            "reference": "f898a7d90cfacd54433de4028190c336164f2ae4",
+            "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6",
+            "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6",
             "shasum": "",
             "mirrors": [
                 {
@@ -923,7 +923,7 @@
         "require": {
             "php": ">=5.3"
         },
-        "time": "2019-10-29T09:03:57+00:00",
+        "time": "2020-07-06T05:33:26+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -955,12 +955,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "25f945ee112d0177cfb75942901fdd4b3bed2f07"
+            "reference": "ad82946e618337bcf51eeadf29c0aa72b5ecac5b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/25f945ee112d0177cfb75942901fdd4b3bed2f07",
-            "reference": "25f945ee112d0177cfb75942901fdd4b3bed2f07",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ad82946e618337bcf51eeadf29c0aa72b5ecac5b",
+            "reference": "ad82946e618337bcf51eeadf29c0aa72b5ecac5b",
             "shasum": "",
             "mirrors": [
                 {
@@ -976,7 +976,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-07-04T11:52:45+00:00",
+        "time": "2020-07-05T06:30:42+00:00",
         "type": "library",
         "extra": {
             "think": {

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-07-05 12:36:34
+// This file is automatically generated at:2020-07-06 13:55:11
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',

vendor/zoujingli/think-library/src/Command.php

@@ -26,7 +26,7 @@ use think\console\Output;
  * Class Command
  * @package think\admin
  */
-class Command extends ThinkCommand
+abstract class Command extends ThinkCommand
 {
     /**
      * 任务控制服务

vendor/zoujingli/think-library/src/command/Queue.php

@@ -233,7 +233,7 @@ class Queue extends Command
         $this->output->writeln("\tYou can exit with <info>`CTRL-C`</info>");
         $this->output->writeln('============== LISTENING ==============');
         while (true) {
-            list($last, $where) = [microtime(true), [['status', '=', 1], ['exec_time', '<=', time()]]];
+            [$start, $where] = [microtime(true), [['status', '=', 1], ['exec_time', '<=', time()]]];
             $this->app->db->name($this->table)->where($where)->order('exec_time asc')->chunk(100, function (Collection $result) {
                 foreach ($result->toArray() as $vo) try {
                     $command = $this->process->think("xadmin:queue dorun {$vo['code']} -");
@@ -250,7 +250,7 @@ class Queue extends Command
                     $this->output->error("Execution failed -> [{$vo['code']}] {$vo['title']}，{$exception->getMessage()}");
                 }
             });
-            if (microtime(true) - $last < 0.5000) {
+            if (microtime(true) - $start < 0.5000) {
                 usleep(500000);
             }
         }