From b3677f40b38f42b8d08c877b662dba046fe2a6d1 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 31 Jul 2019 11:08:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]CompoesrUpdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/zoujingli/think-library/src/File.php | 12 +++++++++--- .../think-library/src/command/sync/Plugs.php | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/vendor/autoload.php b/vendor/autoload.php index a9b543f76..fbc1f315b 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInita4736b8e26b3d9588498333bda302ae0::getLoader(); +return ComposerAutoloaderInit3f46c2633b90dc529f1c66b4dabe4fa2::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 3760901c3..9498dcbe3 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInita4736b8e26b3d9588498333bda302ae0 +class ComposerAutoloaderInit3f46c2633b90dc529f1c66b4dabe4fa2 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInita4736b8e26b3d9588498333bda302ae0 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInita4736b8e26b3d9588498333bda302ae0', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit3f46c2633b90dc529f1c66b4dabe4fa2', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInita4736b8e26b3d9588498333bda302ae0', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit3f46c2633b90dc529f1c66b4dabe4fa2', '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\ComposerStaticInita4736b8e26b3d9588498333bda302ae0::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit3f46c2633b90dc529f1c66b4dabe4fa2::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInita4736b8e26b3d9588498333bda302ae0 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInita4736b8e26b3d9588498333bda302ae0::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit3f46c2633b90dc529f1c66b4dabe4fa2::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirea4736b8e26b3d9588498333bda302ae0($fileIdentifier, $file); + composerRequire3f46c2633b90dc529f1c66b4dabe4fa2($fileIdentifier, $file); } return $loader; } } -function composerRequirea4736b8e26b3d9588498333bda302ae0($fileIdentifier, $file) +function composerRequire3f46c2633b90dc529f1c66b4dabe4fa2($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 9abe1b5aa..7f0b1af0d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInita4736b8e26b3d9588498333bda302ae0 +class ComposerStaticInit3f46c2633b90dc529f1c66b4dabe4fa2 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -347,9 +347,9 @@ class ComposerStaticInita4736b8e26b3d9588498333bda302ae0 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInita4736b8e26b3d9588498333bda302ae0::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInita4736b8e26b3d9588498333bda302ae0::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInita4736b8e26b3d9588498333bda302ae0::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit3f46c2633b90dc529f1c66b4dabe4fa2::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit3f46c2633b90dc529f1c66b4dabe4fa2::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit3f46c2633b90dc529f1c66b4dabe4fa2::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 759ad3ba5..7dd1c0951 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -502,12 +502,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "c278499d1e7be0db3b76388112ae26038205d052" + "reference": "b13d79c63a28ee81c31a7f2503ca82635bce8e1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c278499d1e7be0db3b76388112ae26038205d052", - "reference": "c278499d1e7be0db3b76388112ae26038205d052", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b13d79c63a28ee81c31a7f2503ca82635bce8e1d", + "reference": "b13d79c63a28ee81c31a7f2503ca82635bce8e1d", "shasum": "", "mirrors": [ { @@ -526,7 +526,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-07-20T03:04:58+00:00", + "time": "2019-07-31T03:00:34+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/src/File.php b/vendor/zoujingli/think-library/src/File.php index 01ddfffcb..422f79ac7 100644 --- a/vendor/zoujingli/think-library/src/File.php +++ b/vendor/zoujingli/think-library/src/File.php @@ -165,15 +165,21 @@ class File /** * 下载文件到本地 * @param string $url 文件URL地址 - * @param boolean $force 是否强制重新下载文件 + * @param boolean $force 是否强制下载 + * @param integer $expire 文件保留时间 * @return array */ - public static function down($url, $force = false) + public static function down($url, $force = false, $expire = 0) { try { $file = self::instance('local'); $name = self::name($url, '', 'down/'); - if (empty($force) && $file->has($name)) return $file->info($name); + if ($file->has($name) && empty($force)) { + if (empty($expire)) return $file->info($name); + if (filemtime($file->path($name)) + $expire > time()) { + return $file->info($name); + } + } return $file->save($name, file_get_contents($url)); } catch (\Exception $e) { Log::error(__METHOD__ . " File download failed [ {$url} ] {$e->getMessage()}"); diff --git a/vendor/zoujingli/think-library/src/command/sync/Plugs.php b/vendor/zoujingli/think-library/src/command/sync/Plugs.php index 4966009ed..890da45d6 100644 --- a/vendor/zoujingli/think-library/src/command/sync/Plugs.php +++ b/vendor/zoujingli/think-library/src/command/sync/Plugs.php @@ -32,7 +32,7 @@ class Plugs extends Sync protected function configure() { $this->modules = ['public/static/']; - $this->setName('xsync:plugs')->setDescription('从远程覆盖本地Plugs资源插件等代码'); + $this->setName('xsync:plugs')->setDescription('从远程覆盖本地Plugs资源插件所有代码'); } /**