From ab2078464558cfe1c9f3ce584ff468f4abc756bb Mon Sep 17 00:00:00 2001 From: Anyon Date: Tue, 19 Nov 2019 10:16:04 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 18 +++++----- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 ++++---- vendor/composer/autoload_static.php | 8 ++--- vendor/composer/installed.json | 20 +++++------ vendor/services.php | 2 +- vendor/topthink/think-orm/src/Model.php | 22 +++++++++--- .../topthink/think-orm/src/db/BaseQuery.php | 20 +++++------ vendor/topthink/think-orm/src/db/Builder.php | 16 ++++----- .../topthink/think-orm/src/db/CacheItem.php | 6 ++-- .../topthink/think-orm/src/db/Connection.php | 2 +- vendor/topthink/think-orm/src/db/Fetch.php | 2 +- vendor/topthink/think-orm/src/db/Mongo.php | 28 ++++++++++++++- .../think-orm/src/db/PDOConnection.php | 23 ++++++++---- vendor/topthink/think-orm/src/db/Query.php | 2 +- .../think-orm/src/db/builder/Mongo.php | 14 ++++---- .../think-orm/src/db/builder/Mysql.php | 4 +-- .../think-orm/src/db/builder/Oracle.php | 4 +-- .../think-orm/src/db/builder/Pgsql.php | 6 ++-- .../think-orm/src/db/builder/Sqlite.php | 2 +- .../think-orm/src/db/builder/Sqlsrv.php | 4 +-- .../src/db/concern/JoinAndViewQuery.php | 4 +-- .../src/db/concern/ModelRelationQuery.php | 4 +-- .../src/db/concern/ResultOperation.php | 2 +- .../think-orm/src/db/connector/Mongo.php | 11 ++++++ .../think-orm/src/db/connector/Mysql.php | 2 +- .../think-orm/src/db/connector/Oracle.php | 4 +-- .../think-orm/src/db/connector/Pgsql.php | 4 +-- .../think-orm/src/db/connector/Sqlite.php | 4 +-- .../think-orm/src/db/connector/Sqlsrv.php | 2 +- .../think-orm/src/model/concern/Attribute.php | 10 +++--- .../src/model/concern/Conversion.php | 6 ++-- .../src/model/concern/RelationShip.php | 12 +++---- .../src/model/relation/BelongsToMany.php | 9 +++-- .../think-orm/src/model/relation/OneToOne.php | 2 +- vendor/zoujingli/think-library/src/Helper.php | 2 +- .../zoujingli/think-library/src/Library.php | 35 +++++++++---------- .../think-library/src/command/Install.php | 2 +- .../think-library/src/queue/ListenQueue.php | 6 ++-- .../think-library/src/queue/QueryQueue.php | 2 +- .../think-library/src/queue/StartQueue.php | 10 +++--- .../think-library/src/queue/StateQueue.php | 2 +- .../think-library/src/queue/StopQueue.php | 2 +- .../think-library/src/queue/WorkQueue.php | 2 +- 44 files changed, 208 insertions(+), 150 deletions(-) diff --git a/composer.lock b/composer.lock index 2260adfea..f1fa636b5 100644 --- a/composer.lock +++ b/composer.lock @@ -595,16 +595,16 @@ }, { "name": "topthink/think-orm", - "version": "v2.0.27", + "version": "v2.0.28", "source": { "type": "git", "url": "https://github.com/top-think/think-orm.git", - "reference": "02affaaccade2cdd8bbb2d2f5d15e46113e6eb50" + "reference": "ff5f112f5559497222f2716385b5a709ab82741b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-orm/zipball/02affaaccade2cdd8bbb2d2f5d15e46113e6eb50", - "reference": "02affaaccade2cdd8bbb2d2f5d15e46113e6eb50", + "url": "https://api.github.com/repos/top-think/think-orm/zipball/ff5f112f5559497222f2716385b5a709ab82741b", + "reference": "ff5f112f5559497222f2716385b5a709ab82741b", "shasum": "", "mirrors": [ { @@ -642,7 +642,7 @@ "database", "orm" ], - "time": "2019-10-23T02:16:50+00:00" + "time": "2019-11-17T07:53:45+00:00" }, { "name": "topthink/think-template", @@ -783,12 +783,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "9e636a7be3d7c468cb73c40c48835bf51cef6864" + "reference": "bb5ec20e7047c582f1ae6e5faea7e3ecdf5a2da6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9e636a7be3d7c468cb73c40c48835bf51cef6864", - "reference": "9e636a7be3d7c468cb73c40c48835bf51cef6864", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bb5ec20e7047c582f1ae6e5faea7e3ecdf5a2da6", + "reference": "bb5ec20e7047c582f1ae6e5faea7e3ecdf5a2da6", "shasum": "", "mirrors": [ { @@ -832,7 +832,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-11-18T11:43:36+00:00" + "time": "2019-11-19T02:13:00+00:00" } ], "packages-dev": [], diff --git a/vendor/autoload.php b/vendor/autoload.php index 3f2f6eaf3..7be6160be 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitdc48cac423beab724a7102138067b2f9::getLoader(); +return ComposerAutoloaderInit927a7ea59f5590e9e57c74d6ecc97142::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index c7587187f..765e50759 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitdc48cac423beab724a7102138067b2f9 +class ComposerAutoloaderInit927a7ea59f5590e9e57c74d6ecc97142 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitdc48cac423beab724a7102138067b2f9 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitdc48cac423beab724a7102138067b2f9', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit927a7ea59f5590e9e57c74d6ecc97142', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitdc48cac423beab724a7102138067b2f9', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit927a7ea59f5590e9e57c74d6ecc97142', '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\ComposerStaticInitdc48cac423beab724a7102138067b2f9::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit927a7ea59f5590e9e57c74d6ecc97142::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitdc48cac423beab724a7102138067b2f9 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitdc48cac423beab724a7102138067b2f9::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit927a7ea59f5590e9e57c74d6ecc97142::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiredc48cac423beab724a7102138067b2f9($fileIdentifier, $file); + composerRequire927a7ea59f5590e9e57c74d6ecc97142($fileIdentifier, $file); } return $loader; } } -function composerRequiredc48cac423beab724a7102138067b2f9($fileIdentifier, $file) +function composerRequire927a7ea59f5590e9e57c74d6ecc97142($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 53d0c59c0..f002697a0 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitdc48cac423beab724a7102138067b2f9 +class ComposerStaticInit927a7ea59f5590e9e57c74d6ecc97142 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -470,9 +470,9 @@ class ComposerStaticInitdc48cac423beab724a7102138067b2f9 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitdc48cac423beab724a7102138067b2f9::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitdc48cac423beab724a7102138067b2f9::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitdc48cac423beab724a7102138067b2f9::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit927a7ea59f5590e9e57c74d6ecc97142::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit927a7ea59f5590e9e57c74d6ecc97142::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit927a7ea59f5590e9e57c74d6ecc97142::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f373a7f95..7c03e701b 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -608,17 +608,17 @@ }, { "name": "topthink/think-orm", - "version": "v2.0.27", - "version_normalized": "2.0.27.0", + "version": "v2.0.28", + "version_normalized": "2.0.28.0", "source": { "type": "git", "url": "https://github.com/top-think/think-orm.git", - "reference": "02affaaccade2cdd8bbb2d2f5d15e46113e6eb50" + "reference": "ff5f112f5559497222f2716385b5a709ab82741b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-orm/zipball/02affaaccade2cdd8bbb2d2f5d15e46113e6eb50", - "reference": "02affaaccade2cdd8bbb2d2f5d15e46113e6eb50", + "url": "https://api.github.com/repos/top-think/think-orm/zipball/ff5f112f5559497222f2716385b5a709ab82741b", + "reference": "ff5f112f5559497222f2716385b5a709ab82741b", "shasum": "", "mirrors": [ { @@ -634,7 +634,7 @@ "psr/simple-cache": "^1.0", "topthink/think-helper": "^3.1" }, - "time": "2019-10-23T02:16:50+00:00", + "time": "2019-11-17T07:53:45+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -805,12 +805,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "9e636a7be3d7c468cb73c40c48835bf51cef6864" + "reference": "bb5ec20e7047c582f1ae6e5faea7e3ecdf5a2da6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9e636a7be3d7c468cb73c40c48835bf51cef6864", - "reference": "9e636a7be3d7c468cb73c40c48835bf51cef6864", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bb5ec20e7047c582f1ae6e5faea7e3ecdf5a2da6", + "reference": "bb5ec20e7047c582f1ae6e5faea7e3ecdf5a2da6", "shasum": "", "mirrors": [ { @@ -826,7 +826,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-11-18T11:43:36+00:00", + "time": "2019-11-19T02:13:00+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index e2b7b2aa9..6cb297c46 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/topthink/think-orm/src/Model.php b/vendor/topthink/think-orm/src/Model.php index d1a971043..9609478ad 100644 --- a/vendor/topthink/think-orm/src/Model.php +++ b/vendor/topthink/think-orm/src/Model.php @@ -85,6 +85,12 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab */ protected $name; + /** + * 主键值 + * @var string + */ + protected $key; + /** * 数据表名称 * @var string @@ -575,9 +581,13 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab $db->startTrans(); try { - $where = $this->getWhere(); + $this->key = null; + $where = $this->getWhere(); + $result = $db->where($where) ->strict(false) + ->cache(true) + ->setOption('key', $this->key) ->field($allowFields) ->update($data); @@ -635,14 +645,15 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab $result = $db->strict(false) ->field($allowFields) ->replace($this->replace) - ->insert($this->data, false, $sequence); + ->sequence($sequence) + ->insert($this->data, true); // 获取自动增长主键 - if ($result && $insertId = $db->getLastInsID($sequence)) { + if ($result) { $pk = $this->getPk(); if (is_string($pk) && (!isset($this->data[$pk]) || '' == $this->data[$pk])) { - $this->data[$pk] = $insertId; + $this->data[$pk] = $result; } } @@ -676,7 +687,8 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab $pk = $this->getPk(); if (is_string($pk) && isset($this->data[$pk])) { - $where = [[$pk, '=', $this->data[$pk]]]; + $where = [[$pk, '=', $this->data[$pk]]]; + $this->key = $this->data[$pk]; } elseif (is_array($pk)) { foreach ($pk as $field) { if (isset($this->data[$field])) { diff --git a/vendor/topthink/think-orm/src/db/BaseQuery.php b/vendor/topthink/think-orm/src/db/BaseQuery.php index 83362a28e..1f97e63e2 100644 --- a/vendor/topthink/think-orm/src/db/BaseQuery.php +++ b/vendor/topthink/think-orm/src/db/BaseQuery.php @@ -490,8 +490,8 @@ abstract class BaseQuery // 子查询 } elseif (false === strpos($table, ',')) { if (strpos($table, ' ')) { - list($item, $alias) = explode(' ', $table); - $table = []; + [$item, $alias] = explode(' ', $table); + $table = []; $this->alias([$item => $alias]); $table[$item] = $alias; } @@ -502,7 +502,7 @@ abstract class BaseQuery foreach ($tables as $item) { $item = trim($item); if (strpos($item, ' ')) { - list($item, $alias) = explode(' ', $item); + [$item, $alias] = explode(' ', $item); $this->alias([$item => $alias]); $table[$item] = $alias; } else { @@ -750,10 +750,10 @@ abstract class BaseQuery * @access public * @param mixed $key 缓存key * @param integer|\DateTime $expire 缓存有效期 - * @param string $tag 缓存标签 + * @param string|array $tag 缓存标签 * @return $this */ - public function cache($key = true, $expire = null, string $tag = null) + public function cache($key = true, $expire = null, $tag = null) { if (false === $key || !$this->getConnection()->getCache()) { return $this; @@ -1179,11 +1179,11 @@ abstract class BaseQuery if (isset($options['page'])) { // 根据页数计算limit - list($page, $listRows) = $options['page']; - $page = $page > 0 ? $page : 1; - $listRows = $listRows ?: (is_numeric($options['limit']) ? $options['limit'] : 20); - $offset = $listRows * ($page - 1); - $options['limit'] = $offset . ',' . $listRows; + [$page, $listRows] = $options['page']; + $page = $page > 0 ? $page : 1; + $listRows = $listRows ?: (is_numeric($options['limit']) ? $options['limit'] : 20); + $offset = $listRows * ($page - 1); + $options['limit'] = $offset . ',' . $listRows; } $this->options = $options; diff --git a/vendor/topthink/think-orm/src/db/Builder.php b/vendor/topthink/think-orm/src/db/Builder.php index c2a86d30a..1b01c98fe 100644 --- a/vendor/topthink/think-orm/src/db/Builder.php +++ b/vendor/topthink/think-orm/src/db/Builder.php @@ -156,9 +156,9 @@ abstract class Builder } if (false !== strpos($key, '->')) { - list($key, $name) = explode('->', $key, 2); - $item = $this->parseKey($query, $key); - $result[$item] = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key . '->' . $name, $val, $bind) . ')'; + [$key, $name] = explode('->', $key, 2); + $item = $this->parseKey($query, $key); + $result[$item] = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key . '->' . $name, $val, $bind) . ')'; } elseif (false === strpos($key, '.') && !in_array($key, $fields, true)) { if ($options['strict']) { throw new Exception('fields not exists:[' . $key . ']'); @@ -300,7 +300,7 @@ abstract class Builder if (!empty($options['soft_delete'])) { // 附加软删除条件 - list($field, $condition) = $options['soft_delete']; + [$field, $condition] = $options['soft_delete']; $binds = $query->getFieldsBindType(); $whereStr = $whereStr ? '( ' . $whereStr . ' ) AND ' : ''; @@ -591,7 +591,7 @@ abstract class Builder protected function parseColumn(Query $query, string $key, $exp, array $value, string $field, int $bindType): string { // 字段比较查询 - list($op, $field) = $value; + [$op, $field] = $value; if (!in_array(trim($op), ['=', '<>', '>', '>=', '<', '<='])) { throw new Exception('where express error:' . var_export($value, true)); @@ -802,7 +802,7 @@ abstract class Builder // 获取时间字段类型 if (strpos($key, '.')) { - list($table, $key) = explode('.', $key); + [$table, $key] = explode('.', $key); if (isset($options['alias']) && $pos = array_search($table, $options['alias'])) { $table = $pos; @@ -858,10 +858,10 @@ abstract class Builder $joinStr = ''; foreach ($join as $item) { - list($table, $type, $on) = $item; + [$table, $type, $on] = $item; if (strpos($on, '=')) { - list($val1, $val2) = explode('=', $on, 2); + [$val1, $val2] = explode('=', $on, 2); $condition = $this->parseKey($query, $val1) . '=' . $this->parseKey($query, $val2); } else { diff --git a/vendor/topthink/think-orm/src/db/CacheItem.php b/vendor/topthink/think-orm/src/db/CacheItem.php index 6e82523b7..839f38409 100644 --- a/vendor/topthink/think-orm/src/db/CacheItem.php +++ b/vendor/topthink/think-orm/src/db/CacheItem.php @@ -96,7 +96,7 @@ class CacheItem /** * 获取缓存Tag * @access public - * @return string + * @return string|array */ public function getTag() { @@ -139,10 +139,10 @@ class CacheItem /** * 为此缓存项设置所属标签 * @access public - * @param string $tag + * @param string|array $tag * @return $this */ - public function tag(string $tag = null) + public function tag($tag = null) { $this->tag = $tag; return $this; diff --git a/vendor/topthink/think-orm/src/db/Connection.php b/vendor/topthink/think-orm/src/db/Connection.php index ba51920d4..fb9f74b2b 100644 --- a/vendor/topthink/think-orm/src/db/Connection.php +++ b/vendor/topthink/think-orm/src/db/Connection.php @@ -236,7 +236,7 @@ abstract class Connection */ protected function parseCache(BaseQuery $query, array $cache): CacheItem { - list($key, $expire, $tag) = $cache; + [$key, $expire, $tag] = $cache; if ($key instanceof CacheItem) { $cacheItem = $key; diff --git a/vendor/topthink/think-orm/src/db/Fetch.php b/vendor/topthink/think-orm/src/db/Fetch.php index 38f797c27..76658e6b2 100644 --- a/vendor/topthink/think-orm/src/db/Fetch.php +++ b/vendor/topthink/think-orm/src/db/Fetch.php @@ -303,7 +303,7 @@ class Fetch if (!empty($options['soft_delete'])) { // 软删除 - list($field, $condition) = $options['soft_delete']; + [$field, $condition] = $options['soft_delete']; if ($condition) { $this->query->setOption('soft_delete', null); $this->query->setOption('data', [$field => $condition]); diff --git a/vendor/topthink/think-orm/src/db/Mongo.php b/vendor/topthink/think-orm/src/db/Mongo.php index 6f94f3c6a..7d2e46999 100644 --- a/vendor/topthink/think-orm/src/db/Mongo.php +++ b/vendor/topthink/think-orm/src/db/Mongo.php @@ -615,7 +615,7 @@ class Mongo extends BaseQuery $query = $this->options($options)->limit($count); if (strpos($column, '.')) { - list($alias, $key) = explode('.', $column); + [$alias, $key] = explode('.', $column); } else { $key = $column; } @@ -712,4 +712,30 @@ class Mongo extends BaseQuery return $options; } + /** + * 获取字段类型信息 + * @access public + * @return array + */ + public function getFieldsType(): array + { + if (!empty($this->options['field_type'])) { + return $this->options['field_type']; + } + + return []; + } + + /** + * 获取字段类型信息 + * @access public + * @param string $field 字段名 + * @return string|null + */ + public function getFieldType(string $field) + { + $fieldType = $this->getFieldsType(); + + return $fieldType[$field] ?? null; + } } diff --git a/vendor/topthink/think-orm/src/db/PDOConnection.php b/vendor/topthink/think-orm/src/db/PDOConnection.php index b15d42bef..5cce2e110 100644 --- a/vendor/topthink/think-orm/src/db/PDOConnection.php +++ b/vendor/topthink/think-orm/src/db/PDOConnection.php @@ -98,6 +98,12 @@ abstract class PDOConnection extends Connection implements ConnectionInterface */ protected $transTimes = 0; + /** + * 重连次数 + * @var int + */ + protected $reConnectTimes = 0; + /** * 查询结果类型 * @var int @@ -329,7 +335,7 @@ abstract class PDOConnection extends Connection implements ConnectionInterface return []; } - list($tableName) = explode(' ', $tableName); + [$tableName] = explode(' ', $tableName); if (!strpos($tableName, '.')) { $schema = $this->getConfig('database') . '.' . $tableName; @@ -703,9 +709,12 @@ abstract class PDOConnection extends Connection implements ConnectionInterface $this->trigger('', $master); } + $this->reConnectTimes = 0; + return $this->PDOStatement; } catch (\Throwable | \Exception $e) { - if ($this->isBreak($e)) { + if ($this->reConnectTimes < 4 && $this->isBreak($e)) { + ++$this->reConnectTimes; return $this->close()->getPDOStatement($sql, $bind, $master, $procedure); } @@ -1070,7 +1079,7 @@ abstract class PDOConnection extends Connection implements ConnectionInterface public function aggregate(BaseQuery $query, string $aggregate, $field, bool $force = false) { if (is_string($field) && 0 === stripos($field, 'DISTINCT ')) { - list($distinct, $field) = explode(' ', $field); + [$distinct, $field] = explode(' ', $field); } $field = $aggregate . '(' . (!empty($distinct) ? 'DISTINCT ' : '') . $this->builder->parseKey($query, $field, true) . ') AS think_' . strtolower($aggregate); @@ -1141,11 +1150,11 @@ abstract class PDOConnection extends Connection implements ConnectionInterface if (strpos($column, ',')) { $column = null; } elseif (strpos($column, '.')) { - list($alias, $column) = explode('.', $column); + [$alias, $column] = explode('.', $column); } if (strpos($key, '.')) { - list($alias, $key) = explode('.', $key); + [$alias, $key] = explode('.', $key); } $result = array_column($resultSet, $column, $key); @@ -1348,9 +1357,11 @@ abstract class PDOConnection extends Connection implements ConnectionInterface $this->parseSavepoint('trans' . $this->transTimes) ); } + $this->reConnectTimes = 0; } catch (\Exception $e) { - if ($this->isBreak($e)) { + if ($this->reConnectTimes < 4 && $this->isBreak($e)) { --$this->transTimes; + ++$this->reConnectTimes; $this->close()->startTrans(); } throw $e; diff --git a/vendor/topthink/think-orm/src/db/Query.php b/vendor/topthink/think-orm/src/db/Query.php index ba0e5e565..f03938476 100644 --- a/vendor/topthink/think-orm/src/db/Query.php +++ b/vendor/topthink/think-orm/src/db/Query.php @@ -460,7 +460,7 @@ class Query extends BaseQuery $query = $this->options($options)->limit($count); if (strpos($column, '.')) { - list($alias, $key) = explode('.', $column); + [$alias, $key] = explode('.', $column); } else { $key = $column; } diff --git a/vendor/topthink/think-orm/src/db/builder/Mongo.php b/vendor/topthink/think-orm/src/db/builder/Mongo.php index 85b060034..823156bc3 100644 --- a/vendor/topthink/think-orm/src/db/builder/Mongo.php +++ b/vendor/topthink/think-orm/src/db/builder/Mongo.php @@ -58,7 +58,7 @@ class Mongo protected function parseKey(Query $query, string $key): string { if (0 === strpos($key, '__TABLE__.')) { - list($collection, $key) = explode('.', $key, 2); + [$collection, $key] = explode('.', $key, 2); } if ('id' == $key && $this->connection->getConfig('pk_convert_id')) { @@ -205,8 +205,8 @@ class Mongo $options = $query->getOptions(); if (!empty($options['soft_delete'])) { // 附加软删除条件 - list($field, $condition) = $options['soft_delete']; - $filter['$and'][] = $this->parseWhereItem($query, $field, $condition); + [$field, $condition] = $options['soft_delete']; + $filter['$and'][] = $this->parseWhereItem($query, $field, $condition); } return $filter; @@ -220,7 +220,7 @@ class Mongo if (!is_array($val)) { $val = ['=', $val]; } - list($exp, $value) = $val; + [$exp, $value] = $val; // 对一个字段使用多个查询条件 if (is_array($exp)) { @@ -523,8 +523,8 @@ class Mongo */ public function aggregate(Query $query, array $extra): Command { - $options = $query->getOptions(); - list($fun, $field) = $extra; + $options = $query->getOptions(); + [$fun, $field] = $extra; if ('id' == $field && $this->connection->getConfig('pk_convert_id')) { $field = '_id'; @@ -568,7 +568,7 @@ class Mongo { $options = $query->getOptions(); - list($aggregate, $groupBy) = $extra; + [$aggregate, $groupBy] = $extra; $groups = ['_id' => []]; diff --git a/vendor/topthink/think-orm/src/db/builder/Mysql.php b/vendor/topthink/think-orm/src/db/builder/Mysql.php index 33aec85a1..977ff9b9e 100644 --- a/vendor/topthink/think-orm/src/db/builder/Mysql.php +++ b/vendor/topthink/think-orm/src/db/builder/Mysql.php @@ -315,10 +315,10 @@ class Mysql extends Builder if (strpos($key, '->') && false === strpos($key, '(')) { // JSON字段支持 - list($field, $name) = explode('->', $key, 2); + [$field, $name] = explode('->', $key, 2); return 'json_extract(' . $this->parseKey($query, $field) . ', \'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->', '.', $name) . '\')'; } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) { - list($table, $key) = explode('.', $key, 2); + [$table, $key] = explode('.', $key, 2); $alias = $query->getOptions('alias'); diff --git a/vendor/topthink/think-orm/src/db/builder/Oracle.php b/vendor/topthink/think-orm/src/db/builder/Oracle.php index 8b6e225d6..77ad3c81e 100644 --- a/vendor/topthink/think-orm/src/db/builder/Oracle.php +++ b/vendor/topthink/think-orm/src/db/builder/Oracle.php @@ -75,8 +75,8 @@ class Oracle extends Builder if (strpos($key, '->') && false === strpos($key, '(')) { // JSON字段支持 - list($field, $name) = explode($key, '->'); - $key = $field . '."' . $name . '"'; + [$field, $name] = explode($key, '->'); + $key = $field . '."' . $name . '"'; } return $key; diff --git a/vendor/topthink/think-orm/src/db/builder/Pgsql.php b/vendor/topthink/think-orm/src/db/builder/Pgsql.php index e1c2856b6..4b581df91 100644 --- a/vendor/topthink/think-orm/src/db/builder/Pgsql.php +++ b/vendor/topthink/think-orm/src/db/builder/Pgsql.php @@ -76,10 +76,10 @@ class Pgsql extends Builder if (strpos($key, '->') && false === strpos($key, '(')) { // JSON字段支持 - list($field, $name) = explode('->', $key); - $key = '"' . $field . '"' . '->>\'' . $name . '\''; + [$field, $name] = explode('->', $key); + $key = '"' . $field . '"' . '->>\'' . $name . '\''; } elseif (strpos($key, '.')) { - list($table, $key) = explode('.', $key, 2); + [$table, $key] = explode('.', $key, 2); $alias = $query->getOptions('alias'); diff --git a/vendor/topthink/think-orm/src/db/builder/Sqlite.php b/vendor/topthink/think-orm/src/db/builder/Sqlite.php index bf8f129b4..87a84ebd2 100644 --- a/vendor/topthink/think-orm/src/db/builder/Sqlite.php +++ b/vendor/topthink/think-orm/src/db/builder/Sqlite.php @@ -74,7 +74,7 @@ class Sqlite extends Builder $key = trim($key); if (strpos($key, '.')) { - list($table, $key) = explode('.', $key, 2); + [$table, $key] = explode('.', $key, 2); $alias = $query->getOptions('alias'); diff --git a/vendor/topthink/think-orm/src/db/builder/Sqlsrv.php b/vendor/topthink/think-orm/src/db/builder/Sqlsrv.php index cd06c3427..80cb166b6 100644 --- a/vendor/topthink/think-orm/src/db/builder/Sqlsrv.php +++ b/vendor/topthink/think-orm/src/db/builder/Sqlsrv.php @@ -78,7 +78,7 @@ class Sqlsrv extends Builder $array[] = $this->parseRand($query); } else { if (is_numeric($key)) { - list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' '); + [$key, $sort] = explode(' ', strpos($val, ' ') ? $val : $val . ' '); } else { $sort = $val; } @@ -121,7 +121,7 @@ class Sqlsrv extends Builder $key = trim($key); if (strpos($key, '.') && !preg_match('/[,\'\"\(\)\[\s]/', $key)) { - list($table, $key) = explode('.', $key, 2); + [$table, $key] = explode('.', $key, 2); $alias = $query->getOptions('alias'); diff --git a/vendor/topthink/think-orm/src/db/concern/JoinAndViewQuery.php b/vendor/topthink/think-orm/src/db/concern/JoinAndViewQuery.php index cd48ab282..c33d1ed2f 100644 --- a/vendor/topthink/think-orm/src/db/concern/JoinAndViewQuery.php +++ b/vendor/topthink/think-orm/src/db/concern/JoinAndViewQuery.php @@ -109,7 +109,7 @@ trait JoinAndViewQuery // 使用别名 if (strpos($join, ' ')) { // 使用别名 - list($table, $alias) = explode(' ', $join); + [$table, $alias] = explode(' ', $join); } else { $table = $join; if (false === strpos($join, '.')) { @@ -209,7 +209,7 @@ trait JoinAndViewQuery foreach ($options['order'] as $key => $val) { if (is_numeric($key) && is_string($val)) { if (strpos($val, ' ')) { - list($field, $sort) = explode(' ', $val); + [$field, $sort] = explode(' ', $val); if (array_key_exists($field, $options['map'])) { $options['order'][$options['map'][$field]] = $sort; unset($options['order'][$key]); diff --git a/vendor/topthink/think-orm/src/db/concern/ModelRelationQuery.php b/vendor/topthink/think-orm/src/db/concern/ModelRelationQuery.php index 9a2113795..92e4417a3 100644 --- a/vendor/topthink/think-orm/src/db/concern/ModelRelationQuery.php +++ b/vendor/topthink/think-orm/src/db/concern/ModelRelationQuery.php @@ -414,7 +414,7 @@ trait ModelRelationQuery if (!empty($this->options['with_attr'])) { foreach ($this->options['with_attr'] as $name => $val) { if (strpos($name, '.')) { - list($relation, $field) = explode('.', $name); + [$relation, $field] = explode('.', $name); $withRelationAttr[$relation][$field] = $val; unset($this->options['with_attr'][$name]); @@ -458,7 +458,7 @@ trait ModelRelationQuery if (!empty($options['with_attr']) && empty($withRelationAttr)) { foreach ($options['with_attr'] as $name => $val) { if (strpos($name, '.')) { - list($relation, $field) = explode('.', $name); + [$relation, $field] = explode('.', $name); $withRelationAttr[$relation][$field] = $val; unset($options['with_attr'][$name]); diff --git a/vendor/topthink/think-orm/src/db/concern/ResultOperation.php b/vendor/topthink/think-orm/src/db/concern/ResultOperation.php index 563f98938..f761d1ef9 100644 --- a/vendor/topthink/think-orm/src/db/concern/ResultOperation.php +++ b/vendor/topthink/think-orm/src/db/concern/ResultOperation.php @@ -130,7 +130,7 @@ trait ResultOperation if (strpos($name, '.')) { // 支持JSON字段 获取器定义 - list($key, $field) = explode('.', $name); + [$key, $field] = explode('.', $name); if (isset($result[$key])) { $result[$key][$field] = $closure($result[$key][$field] ?? null, $result[$key]); diff --git a/vendor/topthink/think-orm/src/db/connector/Mongo.php b/vendor/topthink/think-orm/src/db/connector/Mongo.php index 647c286e1..4eb631b4e 100644 --- a/vendor/topthink/think-orm/src/db/connector/Mongo.php +++ b/vendor/topthink/think-orm/src/db/connector/Mongo.php @@ -1011,6 +1011,17 @@ class Mongo extends Connection implements ConnectionInterface return $this->command($command, $db); } + + /** + * 获取数据库字段 + * @access public + * @param mixed $tableName 数据表名 + * @return array + */ + public function getTableFields($tableName): array + { + return []; + } /** * 执行数据库事务 diff --git a/vendor/topthink/think-orm/src/db/connector/Mysql.php b/vendor/topthink/think-orm/src/db/connector/Mysql.php index e82f4f052..1db3152ae 100644 --- a/vendor/topthink/think-orm/src/db/connector/Mysql.php +++ b/vendor/topthink/think-orm/src/db/connector/Mysql.php @@ -53,7 +53,7 @@ class Mysql extends PDOConnection */ public function getFields(string $tableName): array { - list($tableName) = explode(' ', $tableName); + [$tableName] = explode(' ', $tableName); if (false === strpos($tableName, '`')) { if (strpos($tableName, '.')) { diff --git a/vendor/topthink/think-orm/src/db/connector/Oracle.php b/vendor/topthink/think-orm/src/db/connector/Oracle.php index 1c8032382..236d8bfa1 100644 --- a/vendor/topthink/think-orm/src/db/connector/Oracle.php +++ b/vendor/topthink/think-orm/src/db/connector/Oracle.php @@ -50,8 +50,8 @@ class Oracle extends PDOConnection */ public function getFields(string $tableName): array { - list($tableName) = explode(' ', $tableName); - $sql = "select a.column_name,data_type,DECODE (nullable, 'Y', 0, 1) notnull,data_default, DECODE (A .column_name,b.column_name,1,0) pk from all_tab_columns a,(select column_name from all_constraints c, all_cons_columns col where c.constraint_name = col.constraint_name and c.constraint_type = 'P' and c.table_name = '" . strtoupper($tableName) . "' ) b where table_name = '" . strtoupper($tableName) . "' and a.column_name = b.column_name (+)"; + [$tableName] = explode(' ', $tableName); + $sql = "select a.column_name,data_type,DECODE (nullable, 'Y', 0, 1) notnull,data_default, DECODE (A .column_name,b.column_name,1,0) pk from all_tab_columns a,(select column_name from all_constraints c, all_cons_columns col where c.constraint_name = col.constraint_name and c.constraint_type = 'P' and c.table_name = '" . strtoupper($tableName) . "' ) b where table_name = '" . strtoupper($tableName) . "' and a.column_name = b.column_name (+)"; $pdo = $this->getPDOStatement($sql); $result = $pdo->fetchAll(PDO::FETCH_ASSOC); diff --git a/vendor/topthink/think-orm/src/db/connector/Pgsql.php b/vendor/topthink/think-orm/src/db/connector/Pgsql.php index 1310b9739..fec8f8401 100644 --- a/vendor/topthink/think-orm/src/db/connector/Pgsql.php +++ b/vendor/topthink/think-orm/src/db/connector/Pgsql.php @@ -56,8 +56,8 @@ class Pgsql extends PDOConnection */ public function getFields(string $tableName): array { - list($tableName) = explode(' ', $tableName); - $sql = 'select fields_name as "field",fields_type as "type",fields_not_null as "null",fields_key_name as "key",fields_default as "default",fields_default as "extra" from table_msg(\'' . $tableName . '\');'; + [$tableName] = explode(' ', $tableName); + $sql = 'select fields_name as "field",fields_type as "type",fields_not_null as "null",fields_key_name as "key",fields_default as "default",fields_default as "extra" from table_msg(\'' . $tableName . '\');'; $pdo = $this->getPDOStatement($sql); $result = $pdo->fetchAll(PDO::FETCH_ASSOC); diff --git a/vendor/topthink/think-orm/src/db/connector/Sqlite.php b/vendor/topthink/think-orm/src/db/connector/Sqlite.php index 12a051712..c664f202d 100644 --- a/vendor/topthink/think-orm/src/db/connector/Sqlite.php +++ b/vendor/topthink/think-orm/src/db/connector/Sqlite.php @@ -41,8 +41,8 @@ class Sqlite extends PDOConnection */ public function getFields(string $tableName): array { - list($tableName) = explode(' ', $tableName); - $sql = 'PRAGMA table_info( ' . $tableName . ' )'; + [$tableName] = explode(' ', $tableName); + $sql = 'PRAGMA table_info( ' . $tableName . ' )'; $pdo = $this->getPDOStatement($sql); $result = $pdo->fetchAll(PDO::FETCH_ASSOC); diff --git a/vendor/topthink/think-orm/src/db/connector/Sqlsrv.php b/vendor/topthink/think-orm/src/db/connector/Sqlsrv.php index 1a5fffe4e..63b2df009 100644 --- a/vendor/topthink/think-orm/src/db/connector/Sqlsrv.php +++ b/vendor/topthink/think-orm/src/db/connector/Sqlsrv.php @@ -55,7 +55,7 @@ class Sqlsrv extends PDOConnection */ public function getFields(string $tableName): array { - list($tableName) = explode(' ', $tableName); + [$tableName] = explode(' ', $tableName); $sql = "SELECT column_name, data_type, column_default, is_nullable FROM information_schema.tables AS t diff --git a/vendor/topthink/think-orm/src/model/concern/Attribute.php b/vendor/topthink/think-orm/src/model/concern/Attribute.php index a89b0b0f0..5c0eea75a 100644 --- a/vendor/topthink/think-orm/src/model/concern/Attribute.php +++ b/vendor/topthink/think-orm/src/model/concern/Attribute.php @@ -398,9 +398,9 @@ trait Attribute } if (is_array($type)) { - list($type, $param) = $type; + [$type, $param] = $type; } elseif (strpos($type, ':')) { - list($type, $param) = explode(':', $type, 2); + [$type, $param] = explode(':', $type, 2); } switch ($type) { @@ -563,9 +563,9 @@ trait Attribute } if (is_array($type)) { - list($type, $param) = $type; + [$type, $param] = $type; } elseif (strpos($type, ':')) { - list($type, $param) = explode(':', $type, 2); + [$type, $param] = explode(':', $type, 2); } switch ($type) { @@ -637,7 +637,7 @@ trait Attribute $name = $this->getRealFieldName($name); if (strpos($name, '.')) { - list($name, $key) = explode('.', $name); + [$name, $key] = explode('.', $name); $this->withAttr[$name][$key] = $callback; } else { diff --git a/vendor/topthink/think-orm/src/model/concern/Conversion.php b/vendor/topthink/think-orm/src/model/concern/Conversion.php index 178ad0fb6..e12d0affb 100644 --- a/vendor/topthink/think-orm/src/model/concern/Conversion.php +++ b/vendor/topthink/think-orm/src/model/concern/Conversion.php @@ -132,7 +132,7 @@ trait Conversion foreach ($this->visible as $key => $val) { if (is_string($val)) { if (strpos($val, '.')) { - list($relation, $name) = explode('.', $val); + [$relation, $name] = explode('.', $val); $this->visible[$relation][] = $name; } else { $this->visible[$val] = true; @@ -145,7 +145,7 @@ trait Conversion foreach ($this->hidden as $key => $val) { if (is_string($val)) { if (strpos($val, '.')) { - list($relation, $name) = explode('.', $val); + [$relation, $name] = explode('.', $val); $this->hidden[$relation][] = $name; } else { $this->hidden[$val] = true; @@ -192,7 +192,7 @@ trait Conversion $item[$key] = $relation ? $relation->append($name) ->toArray() : []; } elseif (strpos($name, '.')) { - list($key, $attr) = explode('.', $name); + [$key, $attr] = explode('.', $name); // 追加关联对象属性 $relation = $this->getRelation($key, true); $item[$key] = $relation ? $relation->append([$attr]) diff --git a/vendor/topthink/think-orm/src/model/concern/RelationShip.php b/vendor/topthink/think-orm/src/model/concern/RelationShip.php index dd75b8e1e..7b0d4a76a 100644 --- a/vendor/topthink/think-orm/src/model/concern/RelationShip.php +++ b/vendor/topthink/think-orm/src/model/concern/RelationShip.php @@ -148,7 +148,7 @@ trait RelationShip $subRelation = $relation; $relation = $key; } elseif (strpos($relation, '.')) { - list($relation, $subRelation) = explode('.', $relation, 2); + [$relation, $subRelation] = explode('.', $relation, 2); } $method = Str::camel($relation); @@ -263,7 +263,7 @@ trait RelationShip $subRelation = $relation; $relation = $key; } elseif (strpos($relation, '.')) { - list($relation, $subRelation) = explode('.', $relation, 2); + [$relation, $subRelation] = explode('.', $relation, 2); $subRelation = [$subRelation]; } @@ -312,7 +312,7 @@ trait RelationShip $subRelation = $relation; $relation = $key; } elseif (strpos($relation, '.')) { - list($relation, $subRelation) = explode('.', $relation, 2); + [$relation, $subRelation] = explode('.', $relation, 2); $subRelation = [$subRelation]; } @@ -549,7 +549,7 @@ trait RelationShip } if (is_array($morph)) { - list($morphType, $foreignKey) = $morph; + [$morphType, $foreignKey] = $morph; } else { $morphType = $morph . '_type'; $foreignKey = $morph . '_id'; @@ -581,7 +581,7 @@ trait RelationShip $type = $type ?: get_class($this); if (is_array($morph)) { - list($morphType, $foreignKey) = $morph; + [$morphType, $foreignKey] = $morph; } else { $morphType = $morph . '_type'; $foreignKey = $morph . '_id'; @@ -608,7 +608,7 @@ trait RelationShip // 记录当前关联信息 if (is_array($morph)) { - list($morphType, $foreignKey) = $morph; + [$morphType, $foreignKey] = $morph; } else { $morphType = $morph . '_type'; $foreignKey = $morph . '_id'; diff --git a/vendor/topthink/think-orm/src/model/relation/BelongsToMany.php b/vendor/topthink/think-orm/src/model/relation/BelongsToMany.php index 16f4bf5ea..eccbfe9c5 100644 --- a/vendor/topthink/think-orm/src/model/relation/BelongsToMany.php +++ b/vendor/topthink/think-orm/src/model/relation/BelongsToMany.php @@ -133,7 +133,7 @@ class BelongsToMany extends Relation foreach ($model->getData() as $key => $val) { if (strpos($key, '__')) { - list($name, $attr) = explode('__', $key, 2); + [$name, $attr] = explode('__', $key, 2); if ('pivot' == $name) { $pivot[$attr] = $val; @@ -206,12 +206,11 @@ class BelongsToMany extends Relation * @access public * @param int|array $listRows * @param int|bool $simple - * @param array $config * @return Paginator */ - public function paginate($listRows = null, $simple = false, $config = []): Paginator + public function paginate($listRows = null, $simple = false): Paginator { - $result = $this->buildQuery()->paginate($listRows, $simple, $config); + $result = $this->buildQuery()->paginate($listRows, $simple); $this->hydratePivot($result); return $result; @@ -448,7 +447,7 @@ class BelongsToMany extends Relation $pivot = []; foreach ($set->getData() as $key => $val) { if (strpos($key, '__')) { - list($name, $attr) = explode('__', $key, 2); + [$name, $attr] = explode('__', $key, 2); if ('pivot' == $name) { $pivot[$attr] = $val; unset($set->$key); diff --git a/vendor/topthink/think-orm/src/model/relation/OneToOne.php b/vendor/topthink/think-orm/src/model/relation/OneToOne.php index e3eb48a4a..540fcc295 100644 --- a/vendor/topthink/think-orm/src/model/relation/OneToOne.php +++ b/vendor/topthink/think-orm/src/model/relation/OneToOne.php @@ -234,7 +234,7 @@ abstract class OneToOne extends Relation // 重新组装模型数据 foreach ($result->getData() as $key => $val) { if (strpos($key, '__')) { - list($name, $attr) = explode('__', $key, 2); + [$name, $attr] = explode('__', $key, 2); if ($name == $relation) { $list[$name][$attr] = $val; unset($result->$key); diff --git a/vendor/zoujingli/think-library/src/Helper.php b/vendor/zoujingli/think-library/src/Helper.php index 7504981ac..7155c6d63 100644 --- a/vendor/zoujingli/think-library/src/Helper.php +++ b/vendor/zoujingli/think-library/src/Helper.php @@ -70,7 +70,7 @@ abstract class Helper * @param array $args 额外参数 * @return static */ - public static function instance($args = []) + public static function instance(array $args = []) { return Container::getInstance()->invokeClass(static::class, $args); } diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php index f1cb01d4b..a493f96c2 100644 --- a/vendor/zoujingli/think-library/src/Library.php +++ b/vendor/zoujingli/think-library/src/Library.php @@ -28,32 +28,21 @@ use think\Service; class Library extends Service { /** - * 服务注册 + * 注册服务 */ public function register() { - // 注册会话中间键 - $this->app->middleware->add(SessionInit::class); - // 动态加入应用函数 - foreach (glob($this->app->getAppPath() . '*/sys.php') as $file) { - \Composer\Autoload\includeFile($file); - } - } - - /** - * 服务启动 - */ - public function boot() - { - // 注册访问中间键 - if (!$this->app->request->isCli()) { + if (PHP_SAPI !== 'cli') { + // 注册会话中间键 + $this->app->middleware->add(SessionInit::class); + // 注册访问中间键 $this->app->middleware->add(function (Request $request, \Closure $next) { $header = []; if (($origin = $request->header('origin', '*')) !== '*') { $header['Access-Control-Allow-Origin'] = $origin; $header['Access-Control-Allow-Methods'] = 'GET,POST,PATCH,PUT,DELETE'; $header['Access-Control-Allow-Headers'] = 'Authorization,Content-Type,If-Match,If-Modified-Since,If-None-Match,If-Unmodified-Since,X-Requested-With'; - $header['Access-Control-Expose-Headers'] = 'User-Form-Token'; + $header['Access-Control-Expose-Headers'] = 'User-Form-Token,User-Token,Token'; } // 访问模式及访问权限检查 if ($request->isOptions()) { @@ -67,6 +56,17 @@ class Library extends Service } }, 'route'); } + // 动态加入应用函数 + foreach (glob($this->app->getAppPath() . '*/sys.php') as $file) { + \Composer\Autoload\includeFile($file); + } + } + + /** + * 启动服务 + */ + public function boot() + { // 注册系统任务指令 $this->commands([ 'think\admin\queue\WorkQueue', @@ -78,5 +78,4 @@ class Library extends Service 'think\admin\command\Install', ]); } - } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php index e13b0768b..6277ca8a0 100644 --- a/vendor/zoujingli/think-library/src/command/Install.php +++ b/vendor/zoujingli/think-library/src/command/Install.php @@ -64,7 +64,7 @@ class Install extends Command protected function configure() { $this->setName('xtask:install'); - $this->setDescription("[安装]在线安装或更新指定模块文件"); + $this->setDescription("[安装]安装或更新指定模块"); $this->addArgument('name', Argument::OPTIONAL, '模块名称', ''); } diff --git a/vendor/zoujingli/think-library/src/queue/ListenQueue.php b/vendor/zoujingli/think-library/src/queue/ListenQueue.php index b078713b3..52d00eba1 100644 --- a/vendor/zoujingli/think-library/src/queue/ListenQueue.php +++ b/vendor/zoujingli/think-library/src/queue/ListenQueue.php @@ -32,7 +32,7 @@ class ListenQueue extends Command */ protected function configure() { - $this->setName('xtask:listen')->setDescription('[监听]常驻异步任务循环监听主进程'); + $this->setName('xtask:listen')->setDescription('[监听]启动任务监听主进程'); } /** @@ -46,10 +46,10 @@ class ListenQueue extends Command protected function execute(Input $input, Output $output) { $this->app->db->name('SystemQueue')->count(); - if (($process = ProcessService::instance($this->app))->iswin()) { + if (($process = ProcessService::instance())->iswin()) { $this->setProcessTitle("ThinkAdmin 监听主进程 {$process->version()}"); } - $output->comment('============ 异步任务监听中 ============'); + $output->comment('============ 任务监听中 ============'); while (true) { foreach ($this->app->db->name('SystemQueue')->where([['status', '=', '1'], ['exec_time', '<=', time()]])->order('exec_time asc')->limit(100)->select() as $vo) { try { diff --git a/vendor/zoujingli/think-library/src/queue/QueryQueue.php b/vendor/zoujingli/think-library/src/queue/QueryQueue.php index 6e94f3504..b4500c70b 100644 --- a/vendor/zoujingli/think-library/src/queue/QueryQueue.php +++ b/vendor/zoujingli/think-library/src/queue/QueryQueue.php @@ -32,7 +32,7 @@ class QueryQueue extends Command */ protected function configure() { - $this->setName('xtask:query')->setDescription('[控制]查询正在执行的所有任务进程'); + $this->setName('xtask:query')->setDescription('[控制]查询正在运行的进程'); } /** diff --git a/vendor/zoujingli/think-library/src/queue/StartQueue.php b/vendor/zoujingli/think-library/src/queue/StartQueue.php index dcb04a737..7346bd7e5 100644 --- a/vendor/zoujingli/think-library/src/queue/StartQueue.php +++ b/vendor/zoujingli/think-library/src/queue/StartQueue.php @@ -21,7 +21,7 @@ use think\console\Input; use think\console\Output; /** - * 检查并创建异步任务监听主进程 + * 检查并创建监听主进程 * Class StartQueue * @package think\admin\queue */ @@ -33,7 +33,7 @@ class StartQueue extends Command */ protected function configure() { - $this->setName('xtask:start')->setDescription('[控制]创建异步任务守护监听主进程'); + $this->setName('xtask:start')->setDescription('[控制]创建守护监听主进程'); } /** @@ -47,14 +47,14 @@ class StartQueue extends Command $process = ProcessService::instance(); $command = $process->think("xtask:listen"); if (count($result = $process->query($command)) > 0) { - $output->info("异步任务监听主进程{$result['0']['pid']}已经启动！"); + $output->info("监听主进程{$result['0']['pid']}已经启动！"); } else { $process->create($command); sleep(1); if (count($result = $process->query($command)) > 0) { - $output->info("异步任务监听主进程{$result['0']['pid']}启动成功！"); + $output->info("监听主进程{$result['0']['pid']}启动成功！"); } else { - $output->error('异步任务监听主进程创建失败！'); + $output->error('监听主进程创建失败！'); } } } diff --git a/vendor/zoujingli/think-library/src/queue/StateQueue.php b/vendor/zoujingli/think-library/src/queue/StateQueue.php index 496996c1f..6d375dde5 100644 --- a/vendor/zoujingli/think-library/src/queue/StateQueue.php +++ b/vendor/zoujingli/think-library/src/queue/StateQueue.php @@ -32,7 +32,7 @@ class StateQueue extends Command */ protected function configure() { - $this->setName('xtask:state')->setDescription('[控制]查看异步任务监听主进程状态'); + $this->setName('xtask:state')->setDescription('[控制]查看监听主进程状态'); } /** diff --git a/vendor/zoujingli/think-library/src/queue/StopQueue.php b/vendor/zoujingli/think-library/src/queue/StopQueue.php index 15301b14f..b5b609f71 100644 --- a/vendor/zoujingli/think-library/src/queue/StopQueue.php +++ b/vendor/zoujingli/think-library/src/queue/StopQueue.php @@ -33,7 +33,7 @@ class StopQueue extends Command */ protected function configure() { - $this->setName('xtask:stop')->setDescription('[控制]平滑停止所有的异步任务进程'); + $this->setName('xtask:stop')->setDescription('[控制]平滑停止所有的进程'); } /** diff --git a/vendor/zoujingli/think-library/src/queue/WorkQueue.php b/vendor/zoujingli/think-library/src/queue/WorkQueue.php index da7b22674..75279d0d2 100644 --- a/vendor/zoujingli/think-library/src/queue/WorkQueue.php +++ b/vendor/zoujingli/think-library/src/queue/WorkQueue.php @@ -48,7 +48,7 @@ class WorkQueue extends Command */ protected function configure() { - $this->setName('xtask:_work')->setDescription('[执行]创建执行单个指定任务的进程'); + $this->setName('xtask:_work')->setDescription('[执行]创建指令任务的进程'); $this->addArgument('code', Argument::OPTIONAL, '任务编号'); $this->addArgument('splt', Argument::OPTIONAL, '指令结束符'); }