ComposerUpdate

composer.json

@@ -28,7 +28,7 @@
     "topthink/framework": "^6.0",
     "topthink/think-view": "^1.0",
     "zoujingli/ip2region": "^1.0",
-    "zoujingli/think-library": "^6.0",
+    "zoujingli/think-library": "6.0.x-dev",
     "zoujingli/wechat-developer": "^1.2"
   },
   "autoload": {

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitc847eb2c7a922ed862fa0bfb18edd00b::getLoader();
+return ComposerAutoloaderInit33b66ed99ea8fcca84c95dfb0e7ed409::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitc847eb2c7a922ed862fa0bfb18edd00b
+class ComposerAutoloaderInit33b66ed99ea8fcca84c95dfb0e7ed409
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ class ComposerAutoloaderInitc847eb2c7a922ed862fa0bfb18edd00b
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc847eb2c7a922ed862fa0bfb18edd00b', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit33b66ed99ea8fcca84c95dfb0e7ed409', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitc847eb2c7a922ed862fa0bfb18edd00b', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit33b66ed99ea8fcca84c95dfb0e7ed409', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitc847eb2c7a922ed862fa0bfb18edd00b::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -51,19 +51,19 @@ class ComposerAutoloaderInitc847eb2c7a922ed862fa0bfb18edd00b
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitc847eb2c7a922ed862fa0bfb18edd00b::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirec847eb2c7a922ed862fa0bfb18edd00b($fileIdentifier, $file);
+            composerRequire33b66ed99ea8fcca84c95dfb0e7ed409($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirec847eb2c7a922ed862fa0bfb18edd00b($fileIdentifier, $file)
+function composerRequire33b66ed99ea8fcca84c95dfb0e7ed409($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitc847eb2c7a922ed862fa0bfb18edd00b
+class ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409
 {
     public static $files = array (
         '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@@ -669,10 +669,10 @@ class ComposerStaticInitc847eb2c7a922ed862fa0bfb18edd00b
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitc847eb2c7a922ed862fa0bfb18edd00b::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitc847eb2c7a922ed862fa0bfb18edd00b::$prefixDirsPsr4;
-            $loader->fallbackDirsPsr0 = ComposerStaticInitc847eb2c7a922ed862fa0bfb18edd00b::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInitc847eb2c7a922ed862fa0bfb18edd00b::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409::$prefixDirsPsr4;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit33b66ed99ea8fcca84c95dfb0e7ed409::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -958,17 +958,17 @@
     },
     {
         "name": "zoujingli/think-library",
-        "version": "v6.0.14",
-        "version_normalized": "6.0.14.0",
+        "version": "v6.0.x-dev",
+        "version_normalized": "6.0.9999999.9999999-dev",
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "fd4e99d0ed04c87778cc47a3ca911cd1ef84a38b"
+            "reference": "3eb8593446d09583fd3bb431b48b861a2676409a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/fd4e99d0ed04c87778cc47a3ca911cd1ef84a38b",
-            "reference": "fd4e99d0ed04c87778cc47a3ca911cd1ef84a38b",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3eb8593446d09583fd3bb431b48b861a2676409a",
+            "reference": "3eb8593446d09583fd3bb431b48b861a2676409a",
             "shasum": "",
             "mirrors": [
                 {
@@ -985,7 +985,7 @@
             "ext-mbstring": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-09-24T08:15:19+00:00",
+        "time": "2020-09-24T08:42:51+00:00",
         "type": "library",
         "extra": {
             "think": {

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-09-24 16:20:22
+// This file is automatically generated at:2020-09-24 16:53:08
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',

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

@@ -285,9 +285,9 @@ class Queue extends Command
                     // 自定义任务，支持返回消息（支持异常结束，异常码可选择 3|4 设置任务状态）
                     $class = $this->app->make($command, [], true);
                     if ($class instanceof \think\admin\Queue) {
-                        $this->updateQueue(3, $class->initialize($this->queue)->execute($this->queue->data));
+                        $this->updateQueue(3, $class->initialize($this->queue)->execute($this->queue->data) ?: '');
                     } elseif ($class instanceof \think\admin\service\QueueService) {
-                        $this->updateQueue(3, $class->initialize($this->queue->code)->execute($this->queue->data));
+                        $this->updateQueue(3, $class->initialize($this->queue->code)->execute($this->queue->data) ?: '');
                     } else {
                         throw new \think\admin\Exception("自定义 {$command} 未继承 Queue 或 QueueService");
                     }
@@ -306,8 +306,8 @@ class Queue extends Command
 
     /**
      * 修改当前任务状态
-     * @param integer $status 任务状态
-     * @param string $message 消息内容
+     * @param int $status 任务状态
+     * @param mixed $message 消息内容
      * @param boolean $isSplit 是否分隔
      * @throws \think\db\exception\DbException
      */