[更新]ComposerUpdate

This commit is contained in:
Anyon 2019-08-23 14:34:23 +08:00
parent 5df85351c4
commit e2631d9e13
5 changed files with 48 additions and 48 deletions

2
vendor/autoload.php vendored
View File

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

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitbfcf25155179f008f50849f77bcb0b42
class ComposerAutoloaderInit3701d42b49858bbe27d4213a715461de
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInitbfcf25155179f008f50849f77bcb0b42
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitbfcf25155179f008f50849f77bcb0b42', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit3701d42b49858bbe27d4213a715461de', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitbfcf25155179f008f50849f77bcb0b42', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit3701d42b49858bbe27d4213a715461de', '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\ComposerStaticInitbfcf25155179f008f50849f77bcb0b42::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit3701d42b49858bbe27d4213a715461de::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInitbfcf25155179f008f50849f77bcb0b42
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitbfcf25155179f008f50849f77bcb0b42::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit3701d42b49858bbe27d4213a715461de::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirebfcf25155179f008f50849f77bcb0b42($fileIdentifier, $file);
composerRequire3701d42b49858bbe27d4213a715461de($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequirebfcf25155179f008f50849f77bcb0b42($fileIdentifier, $file)
function composerRequire3701d42b49858bbe27d4213a715461de($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitbfcf25155179f008f50849f77bcb0b42
class ComposerStaticInit3701d42b49858bbe27d4213a715461de
{
public static $files = array (
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@ -314,9 +314,9 @@ class ComposerStaticInitbfcf25155179f008f50849f77bcb0b42
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitbfcf25155179f008f50849f77bcb0b42::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitbfcf25155179f008f50849f77bcb0b42::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitbfcf25155179f008f50849f77bcb0b42::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit3701d42b49858bbe27d4213a715461de::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit3701d42b49858bbe27d4213a715461de::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit3701d42b49858bbe27d4213a715461de::$classMap;
}, null, ClassLoader::class);
}

View File

@ -401,12 +401,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "afe81cd88d632bdbbbd6514325be8cb625652854"
"reference": "debd3bda528707423332c8ef7977386735adb57d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/afe81cd88d632bdbbbd6514325be8cb625652854",
"reference": "afe81cd88d632bdbbbd6514325be8cb625652854",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/debd3bda528707423332c8ef7977386735adb57d",
"reference": "debd3bda528707423332c8ef7977386735adb57d",
"shasum": "",
"mirrors": [
{
@ -425,7 +425,7 @@
"qiniu/php-sdk": "^7.2",
"topthink/framework": "5.1.*"
},
"time": "2019-08-21T05:42:24+00:00",
"time": "2019-08-22T01:34:34+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

View File

@ -58,11 +58,20 @@ class Task extends Command
$this->root = str_replace('\\', '/', env('ROOT_PATH'));
$this->bin = "php {$this->root}think";
$this->cmd = "{$this->bin} xtask:listen";
// 识别 ThinkAdmin 版本
$this->version = config('app.thinkadmin_ver');
if (empty($this->version)) $this->version = 'v4';
}
/**
* 检查进程是否存在
* @return boolean|integer
*/
protected function checkProcess()
{
$list = $this->queryProcess();
return empty($list[0]['pid']) ? false : $list[0]['pid'];
}
/**
* 创建消息任务进程
*/
@ -77,16 +86,6 @@ class Task extends Command
}
}
/**
* 检查进程是否存在
* @return boolean|integer
*/
protected function checkProcess()
{
$list = $this->queryProcess();
return empty($list[0]['pid']) ? false : $list[0]['pid'];
}
/**
* 查询相关进程列表
* @return array
@ -112,27 +111,6 @@ class Task extends Command
return $list;
}
/**
* 消息空白字符过滤
* @param string $content
* @param string $char
* @return string
*/
protected function _space($content, $char = ' ')
{
return preg_replace('|\s+|', $char, trim($content));
}
/**
* 判断是否包含字符串
* @param string $content
* @param string $substring
* @return boolean
*/
protected function _issub($content, $substr)
{
return stripos($this->_space($content), $this->_space($substr)) !== false;
}
/**
* 关闭任务进程
@ -159,4 +137,26 @@ class Task extends Command
return PATH_SEPARATOR === ';';
}
/**
* 消息空白字符过滤
* @param string $content
* @param string $char
* @return string
*/
protected function _space($content, $char = ' ')
{
return preg_replace('|\s+|', $char, trim($content));
}
/**
* 判断是否包含字符串
* @param string $content
* @param string $substr
* @return boolean
*/
protected function _issub($content, $substr)
{
return stripos($this->_space($content), $this->_space($substr)) !== false;
}
}