blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-03-25 10:22:50 +08:00
parent 6b7a6b43df
commit b685f33734
16 changed files with 94 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/admin/controller/Queue.php
View File

@ -72,11 +72,17 @@ class Queue extends Controller
/** /**
* 重启系统任务 * 重启系统任务
* @auth true * @auth true
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/ */
public function redo() public function redo()
{ {
$this->_save($this->table, ['status' => '1']); $data = $this->_vali(['code.require' => '任务编号不能为空！']);
$queue = QueueService::instance()->initialize($data['code'])->reset();
$queue->progress(1, '>>> 任务重置成功 <<<', 0.00);
$this->success('任务重置成功！', $queue->code);
} }
/** /**

14
app/admin/view/queue/index.html
View File

@ -106,20 +106,14 @@
<span class="layui-badge layui-bg-green">处理中</span> <span class="layui-badge layui-bg-green">处理中</span>
{elseif $vo.status eq 3} {elseif $vo.status eq 3}
<span class="layui-badge layui-bg-blue">处理完成</span> <span class="layui-badge layui-bg-blue">处理完成</span>
{elseif $vo.status eq 4} {elseif $vo.status eq 4 and auth('redo')}
<span class="layui-badge layui-bg-red margin-right-5">处理失败</span> <span class="layui-badge layui-bg-red margin-right-5">处理失败</span>
<a class="layui-badge layui-bg-green" data-tips-text="重置该任务" data-action="{:url('redo')}" data-value="id#{$vo.id}"> <a class="layui-badge layui-bg-green" data-confirm="确定要重置该任务吗？" data-tips-text="重置该任务" data-queue="{:url('redo')}?code={$vo.code}"><i class="layui-icon font-s12">&#xe669;</i></a>
<i class="layui-icon font-s12">&#xe669;</i>
</a>
{/eq} {/eq}
{if auth("remove") } {if auth("remove") }
<a data-action='{:url("remove")}' data-confirm="确定要删除该任务吗？" data-value="id#{$vo.id}" data-tips-text="删除该任务" class='layui-badge layui-bg-red margin-left-5'> <a data-action='{:url("remove")}' data-confirm="确定要删除该任务吗？" data-value="id#{$vo.id}" data-tips-text="删除该任务" class='layui-badge layui-bg-red margin-left-5'><i class="layui-icon">&#xe640;</i></a>
<i class="layui-icon">&#xe640;</i>
</a>
{/if} {/if}
<a onclick="$.loadQueue('{$vo.code}',false)" data-tips-text="任务进度信息" class='layui-badge layui-bg-orange margin-left-5'> <a onclick="$.loadQueue('{$vo.code}',false)" data-tips-text="任务进度信息" class='layui-badge layui-bg-orange margin-left-5'><i class="layui-icon">&#xe705;</i></a>
<i class="layui-icon">&#xe705;</i>
</a>
</div> </div>
<div class="color-desc">{$vo.exec_desc|raw|default="没有获取到状态描述"}</div> <div class="color-desc">{$vo.exec_desc|raw|default="没有获取到状态描述"}</div>
</td> </td>

18
composer.lock generated
View File

@ -391,16 +391,16 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.1.2", "version": "1.1.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -440,7 +440,7 @@
"psr", "psr",
"psr-3" "psr-3"
], ],
"time": "2019-11-01T11:05:21+00:00" "time": "2020-03-23T09:12:05+00:00"
}, },
{ {
"name": "psr/simple-cache", "name": "psr/simple-cache",
@ -909,12 +909,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "a247fea1b1a6b9bbc9f378f944531f222800fab5" "reference": "ec34c3a4e22f6f9a484c4728db0c63e6c9e0371e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a247fea1b1a6b9bbc9f378f944531f222800fab5", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ec34c3a4e22f6f9a484c4728db0c63e6c9e0371e",
"reference": "a247fea1b1a6b9bbc9f378f944531f222800fab5", "reference": "ec34c3a4e22f6f9a484c4728db0c63e6c9e0371e",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -958,7 +958,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2020-03-24T06:40:00+00:00" "time": "2020-03-25T02:06:11+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",

2
vendor/autoload.php vendored
View File

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

2
vendor/composer/autoload_classmap.php vendored
View File

@ -115,7 +115,7 @@ return array(
'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', 'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php', 'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php', 'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',

14
vendor/composer/autoload_real.php vendored
View File

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

10
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInitd7300eea771f6ce10908a45ed531efa1 class ComposerStaticInit4ceee63a2cdf20349907f5909444af96
{ {
public static $files = array ( public static $files = array (
'9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@ -248,7 +248,7 @@ class ComposerStaticInitd7300eea771f6ce10908a45ed531efa1
'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php', 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', 'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php', 'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php', 'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
@ -634,9 +634,9 @@ class ComposerStaticInitd7300eea771f6ce10908a45ed531efa1
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitd7300eea771f6ce10908a45ed531efa1::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit4ceee63a2cdf20349907f5909444af96::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd7300eea771f6ce10908a45ed531efa1::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit4ceee63a2cdf20349907f5909444af96::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd7300eea771f6ce10908a45ed531efa1::$classMap; $loader->classMap = ComposerStaticInit4ceee63a2cdf20349907f5909444af96::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

20
vendor/composer/installed.json vendored
View File

@ -396,17 +396,17 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.1.2", "version": "1.1.3",
"version_normalized": "1.1.2.0", "version_normalized": "1.1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
"reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -418,7 +418,7 @@
"require": { "require": {
"php": ">=5.3.0" "php": ">=5.3.0"
}, },
"time": "2019-11-01T11:05:21+00:00", "time": "2020-03-23T09:12:05+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -935,12 +935,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "a247fea1b1a6b9bbc9f378f944531f222800fab5" "reference": "ec34c3a4e22f6f9a484c4728db0c63e6c9e0371e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a247fea1b1a6b9bbc9f378f944531f222800fab5", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ec34c3a4e22f6f9a484c4728db0c63e6c9e0371e",
"reference": "a247fea1b1a6b9bbc9f378f944531f222800fab5", "reference": "ec34c3a4e22f6f9a484c4728db0c63e6c9e0371e",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -956,7 +956,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-03-24T06:40:00+00:00", "time": "2020-03-25T02:06:11+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

1
vendor/psr/log/.gitignore vendored
View File

@ -1 +0,0 @@
vendor

38
vendor/psr/log/Psr/Log/LoggerInterface.php vendored
View File

@ -22,8 +22,8 @@ interface LoggerInterface
/** /**
* System is unusable. * System is unusable.
* *
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
*/ */
@ -35,8 +35,8 @@ interface LoggerInterface
* Example: Entire website down, database unavailable, etc. This should * Example: Entire website down, database unavailable, etc. This should
* trigger the SMS alerts and wake you up. * trigger the SMS alerts and wake you up.
* *
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
*/ */
@ -47,8 +47,8 @@ interface LoggerInterface
* *
* Example: Application component unavailable, unexpected exception. * Example: Application component unavailable, unexpected exception.
* *
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
*/ */
@ -58,8 +58,8 @@ interface LoggerInterface
* Runtime errors that do not require immediate action but should typically * Runtime errors that do not require immediate action but should typically
* be logged and monitored. * be logged and monitored.
* *
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
*/ */
@ -71,8 +71,8 @@ interface LoggerInterface
* Example: Use of deprecated APIs, poor use of an API, undesirable things * Example: Use of deprecated APIs, poor use of an API, undesirable things
* that are not necessarily wrong. * that are not necessarily wrong.
* *
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
*/ */
@ -81,8 +81,8 @@ interface LoggerInterface
/** /**
* Normal but significant events. * Normal but significant events.
* *
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
*/ */
@ -93,8 +93,8 @@ interface LoggerInterface
* *
* Example: User logs in, SQL logs. * Example: User logs in, SQL logs.
* *
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
*/ */
@ -103,8 +103,8 @@ interface LoggerInterface
/** /**
* Detailed debug information. * Detailed debug information.
* *
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
*/ */
@ -113,9 +113,9 @@ interface LoggerInterface
/** /**
* Logs with an arbitrary level. * Logs with an arbitrary level.
* *
* @param mixed $level * @param mixed $level
* @param string $message * @param string $message
* @param array $context * @param mixed[] $context
* *
* @return void * @return void
* *

18
vendor/psr/log/Psr/Log/Test/DummyTest.php vendored Normal file
View File

@ -0,0 +1,18 @@
<?php
namespace Psr\Log\Test;
/**
* This class is internal and does not follow the BC promise.
*
* Do NOT use this class in any way.
*
* @internal
*/
class DummyTest
{
public function __toString()
{
return 'DummyTest';
}
}

8
vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php vendored
View File

@ -136,11 +136,3 @@ abstract class LoggerInterfaceTest extends TestCase
$this->assertEquals($expected, $this->getLogs()); $this->assertEquals($expected, $this->getLogs());
} }
} }
class DummyTest
{
public function __toString()
{
return 'DummyTest';
}
}

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-03-24 14:58:02 // This file is automatically generated at:2020-03-25 10:13:48
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

5
vendor/zoujingli/think-library/src/Command.php vendored
View File

@ -65,6 +65,9 @@ class Command extends ThinkCommand
protected function setQueueProgress($status = null, $message = null, $progress = null) protected function setQueueProgress($status = null, $message = null, $progress = null)
{ {
if (defined('WorkQueueCode')) { if (defined('WorkQueueCode')) {
if (!$this->queue instanceof QueueService) {
$this->queue = QueueService::instance();
}
if ($this->queue->code !== WorkQueueCode) { if ($this->queue->code !== WorkQueueCode) {
$this->queue->initialize(WorkQueueCode); $this->queue->initialize(WorkQueueCode);
} }
@ -85,7 +88,7 @@ class Command extends ThinkCommand
protected function setQueueMessage($status, $message) protected function setQueueMessage($status, $message)
{ {
if (defined('WorkQueueCode')) { if (defined('WorkQueueCode')) {
throw new Exception($message, $status); throw new Exception($message, $status, WorkQueueCode);
} elseif (is_string($message)) { } elseif (is_string($message)) {
$this->output->writeln($message); $this->output->writeln($message);
} }

4
vendor/zoujingli/think-library/src/command/queue/WorkQueue.php vendored
View File

@ -94,7 +94,7 @@ class WorkQueue extends Queue
if (method_exists($command, 'instance') && ($class = $command::instance()) instanceof QueueService) { if (method_exists($command, 'instance') && ($class = $command::instance()) instanceof QueueService) {
$this->update('3', $class->initialize($this->code)->execute(json_decode($this->queue['exec_data'], true) ?: [])); $this->update('3', $class->initialize($this->code)->execute(json_decode($this->queue['exec_data'], true) ?: []));
} else { } else {
throw new \think\Exception("自定义 {$command} 未继承 QueueService"); throw new \think\admin\Exception("自定义 {$command} 未继承 QueueService");
} }
} else { } else {
// 自定义指令，不支持返回消息（支持异常结束，异常码可选择 3|4 设置任务状态） // 自定义指令，不支持返回消息（支持异常结束，异常码可选择 3|4 设置任务状态）
@ -102,7 +102,7 @@ class WorkQueue extends Queue
$this->update('3', $this->app->console->call(array_shift($attr), $attr)->fetch(), false); $this->update('3', $this->app->console->call(array_shift($attr), $attr)->fetch(), false);
} }
} }
} catch (\Exception $exception) { } catch (\Exception|\Error $exception) {
$code = $exception->getCode(); $code = $exception->getCode();
if (intval($code) !== 3) $code = 4; if (intval($code) !== 3) $code = 4;
$this->update($code, $exception->getMessage()); $this->update($code, $exception->getMessage());

12
vendor/zoujingli/think-library/src/service/QueueService.php vendored
View File

@ -107,7 +107,7 @@ class QueueService extends Service
} }
/** /**
* 添加清理定时清理任务 * 添加定时清理任务
* @return $this * @return $this
* @throws \think\admin\Exception * @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
@ -116,7 +116,7 @@ class QueueService extends Service
*/ */
public function addCleanQueue() public function addCleanQueue()
{ {
return $this->register('清理7天前记录及执行超时的任务', "xtask:clean", 0, [], 0, 3600); return $this->register('定时清理系统任务数据', "xtask:clean", 0, [], 0, 3600);
} }
/** /**
@ -176,21 +176,21 @@ class QueueService extends Service
$data = $this->app->cache->get("queue_{$this->code}_progress", [ $data = $this->app->cache->get("queue_{$this->code}_progress", [
'code' => $this->code, 'status' => $status, 'message' => $message, 'progress' => $progress, 'history' => [], 'code' => $this->code, 'status' => $status, 'message' => $message, 'progress' => $progress, 'history' => [],
]); ]);
} catch (\Exception|\TypeError $exception) { } catch (\Exception|\Error $exception) {
return $this->progress($status, $message, $progress); return $this->progress($status, $message, $progress);
} }
if (is_numeric($status)) $data['status'] = intval($status); if (is_numeric($status)) $data['status'] = intval($status);
if (is_numeric($progress)) $progress = sprintf("%.2f", $progress); if (is_numeric($progress)) $progress = sprintf("%.2f", $progress);
if (is_string($message) && is_null($progress)) { if (is_string($message) && is_null($progress)) {
$data['message'] = $message; $data['message'] = $message;
$data['history'][] = ['message' => $message, 'progress' => $data['progress']]; $data['history'][] = ['message' => $message, 'progress' => $data['progress'], 'datetime' => date('Y-m-d H:i:s')];
} elseif (is_null($message) && is_numeric($progress)) { } elseif (is_null($message) && is_numeric($progress)) {
$data['progress'] = $progress; $data['progress'] = $progress;
$data['history'][] = ['message' => $data['message'], 'progress' => $progress]; $data['history'][] = ['message' => $data['message'], 'progress' => $progress, 'datetime' => date('Y-m-d H:i:s')];
} elseif (is_string($message) && is_numeric($progress)) { } elseif (is_string($message) && is_numeric($progress)) {
$data['message'] = $message; $data['message'] = $message;
$data['progress'] = $progress; $data['progress'] = $progress;
$data['history'][] = ['message' => $message, 'progress' => $progress]; $data['history'][] = ['message' => $message, 'progress' => $progress, 'datetime' => date('Y-m-d H:i:s')];
} }
if (is_string($message) || is_numeric($progress)) { if (is_string($message) || is_numeric($progress)) {
if (count($data['history']) > 10) { if (count($data['history']) > 10) {