From 33e08fe5640591c2cd584bc860a21956b97f6e7e Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 16 Aug 2019 10:32:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BB=BB=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9D=9F=E7=AC=A6=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5=E5=87=BA?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/queue/task/Listen.php | 2 +- application/admin/queue/task/Work.php | 1 + vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/application/admin/queue/task/Listen.php b/application/admin/queue/task/Listen.php index 24601606d..87be10796 100644 --- a/application/admin/queue/task/Listen.php +++ b/application/admin/queue/task/Listen.php @@ -56,7 +56,7 @@ class Listen extends Task foreach (Db::name('SystemQueue')->where([['status', 'eq', '1'], ['time', '<=', time()]])->order('time asc')->select() as $item) { try { Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '2', 'start_at' => date('Y-m-d H:i:s')]); - $this->cmd = "{$this->bin} xtask:_work {$item['id']}"; + $this->cmd = "{$this->bin} xtask:_work {$item['id']} -"; if ($this->checkProcess()) { $output->comment("处理任务的子进程已经存在 --> [{$item['id']}] {$item['title']}"); } else { diff --git a/application/admin/queue/task/Work.php b/application/admin/queue/task/Work.php index 40abff7aa..d6bf9f5a9 100644 --- a/application/admin/queue/task/Work.php +++ b/application/admin/queue/task/Work.php @@ -51,6 +51,7 @@ class Work extends Task // 执行任务配置 $this->setName('xtask:_work')->setDescription('[执行]创建执行单个指定任务的进程'); $this->addArgument('id', Argument::OPTIONAL, '指定任务ID'); + $this->addArgument('sp', Argument::OPTIONAL, '指令结束符'); } /** diff --git a/vendor/autoload.php b/vendor/autoload.php index fda02a601..e20b39385 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitfc0b7e90cab7332af0db11653021f1a3::getLoader(); +return ComposerAutoloaderInitf4a8ef0e9a37763a2e0caa5f75189947::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index bc51a7507..5da1a5ae9 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitfc0b7e90cab7332af0db11653021f1a3 +class ComposerAutoloaderInitf4a8ef0e9a37763a2e0caa5f75189947 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitfc0b7e90cab7332af0db11653021f1a3 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitfc0b7e90cab7332af0db11653021f1a3', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitf4a8ef0e9a37763a2e0caa5f75189947', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitfc0b7e90cab7332af0db11653021f1a3', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitf4a8ef0e9a37763a2e0caa5f75189947', '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\ComposerStaticInitfc0b7e90cab7332af0db11653021f1a3::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitf4a8ef0e9a37763a2e0caa5f75189947::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitfc0b7e90cab7332af0db11653021f1a3 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitfc0b7e90cab7332af0db11653021f1a3::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitf4a8ef0e9a37763a2e0caa5f75189947::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirefc0b7e90cab7332af0db11653021f1a3($fileIdentifier, $file); + composerRequiref4a8ef0e9a37763a2e0caa5f75189947($fileIdentifier, $file); } return $loader; } } -function composerRequirefc0b7e90cab7332af0db11653021f1a3($fileIdentifier, $file) +function composerRequiref4a8ef0e9a37763a2e0caa5f75189947($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index be59454a4..7cde9f1ec 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitfc0b7e90cab7332af0db11653021f1a3 +class ComposerStaticInitf4a8ef0e9a37763a2e0caa5f75189947 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -314,9 +314,9 @@ class ComposerStaticInitfc0b7e90cab7332af0db11653021f1a3 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitfc0b7e90cab7332af0db11653021f1a3::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitfc0b7e90cab7332af0db11653021f1a3::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitfc0b7e90cab7332af0db11653021f1a3::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitf4a8ef0e9a37763a2e0caa5f75189947::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitf4a8ef0e9a37763a2e0caa5f75189947::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitf4a8ef0e9a37763a2e0caa5f75189947::$classMap; }, null, ClassLoader::class); }