From a1d834cc4d8996ed995ca105903225bc1648acc6 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 13 Nov 2019 14:52:26 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../zoujingli/think-library/src/ThinkLibrary.php | 7 ++++--- .../think-library/src/helper/PageHelper.php | 10 ++++------ .../think-library/src/queue/ListenQueue.php | 8 ++++---- 9 files changed, 33 insertions(+), 34 deletions(-) diff --git a/composer.lock b/composer.lock index cabf773e3..14779c2eb 100644 --- a/composer.lock +++ b/composer.lock @@ -783,12 +783,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "db1bc2c31e0850dc2b3dfa622757bc69bc19adb3" + "reference": "ad940b565ff7432ede780d57aeae2a05bfd925a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/db1bc2c31e0850dc2b3dfa622757bc69bc19adb3", - "reference": "db1bc2c31e0850dc2b3dfa622757bc69bc19adb3", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ad940b565ff7432ede780d57aeae2a05bfd925a6", + "reference": "ad940b565ff7432ede780d57aeae2a05bfd925a6", "shasum": "", "mirrors": [ { @@ -832,7 +832,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-11-12T02:49:58+00:00" + "time": "2019-11-13T06:45:23+00:00" } ], "packages-dev": [], diff --git a/vendor/autoload.php b/vendor/autoload.php index 283095c86..def29b908 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitd0e0e12040e0346563a00e9de898c5b7::getLoader(); +return ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 64e99fa7c..16cb011d3 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitd0e0e12040e0346563a00e9de898c5b7 +class ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitd0e0e12040e0346563a00e9de898c5b7 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitd0e0e12040e0346563a00e9de898c5b7', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitd0e0e12040e0346563a00e9de898c5b7', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40', '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\ComposerStaticInitd0e0e12040e0346563a00e9de898c5b7::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit53454ac98c72727d5ff48461854fbb40::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitd0e0e12040e0346563a00e9de898c5b7 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitd0e0e12040e0346563a00e9de898c5b7::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit53454ac98c72727d5ff48461854fbb40::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequired0e0e12040e0346563a00e9de898c5b7($fileIdentifier, $file); + composerRequire53454ac98c72727d5ff48461854fbb40($fileIdentifier, $file); } return $loader; } } -function composerRequired0e0e12040e0346563a00e9de898c5b7($fileIdentifier, $file) +function composerRequire53454ac98c72727d5ff48461854fbb40($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 fefecb4de..aeea31784 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitd0e0e12040e0346563a00e9de898c5b7 +class ComposerStaticInit53454ac98c72727d5ff48461854fbb40 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -470,9 +470,9 @@ class ComposerStaticInitd0e0e12040e0346563a00e9de898c5b7 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitd0e0e12040e0346563a00e9de898c5b7::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitd0e0e12040e0346563a00e9de898c5b7::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitd0e0e12040e0346563a00e9de898c5b7::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit53454ac98c72727d5ff48461854fbb40::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit53454ac98c72727d5ff48461854fbb40::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit53454ac98c72727d5ff48461854fbb40::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 2ca52cfb5..f1b8e0357 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -805,12 +805,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "db1bc2c31e0850dc2b3dfa622757bc69bc19adb3" + "reference": "ad940b565ff7432ede780d57aeae2a05bfd925a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/db1bc2c31e0850dc2b3dfa622757bc69bc19adb3", - "reference": "db1bc2c31e0850dc2b3dfa622757bc69bc19adb3", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ad940b565ff7432ede780d57aeae2a05bfd925a6", + "reference": "ad940b565ff7432ede780d57aeae2a05bfd925a6", "shasum": "", "mirrors": [ { @@ -826,7 +826,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-11-12T02:49:58+00:00", + "time": "2019-11-13T06:45:23+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 8adacc5cd..9edba3803 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/ThinkLibrary.php b/vendor/zoujingli/think-library/src/ThinkLibrary.php index f40a03437..e2a86e615 100644 --- a/vendor/zoujingli/think-library/src/ThinkLibrary.php +++ b/vendor/zoujingli/think-library/src/ThinkLibrary.php @@ -46,8 +46,9 @@ class ThinkLibrary extends Service public function boot() { // 注册访问中间键 - if (in_array($this->app->request->method(), ['get', 'post', 'options'])) { - $this->app->middleware->add(function (Request $request, \Closure $next, $header = []) { + if (stripos('get,post,options', $this->app->request->method()) !== false) { + $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'; @@ -58,7 +59,7 @@ class ThinkLibrary extends Service if ($request->isOptions()) { return response()->code(204)->header($header); } elseif (AuthService::instance($this->app)->check()) { - return $next($request)->header($header); + return $next($request)->code(200)->header($header); } elseif (AuthService::instance($this->app)->isLogin()) { return json(['code' => 0, 'msg' => '抱歉，没有访问该操作的权限！'])->header($header); } else { diff --git a/vendor/zoujingli/think-library/src/helper/PageHelper.php b/vendor/zoujingli/think-library/src/helper/PageHelper.php index b198fc48c..18ed69a90 100644 --- a/vendor/zoujingli/think-library/src/helper/PageHelper.php +++ b/vendor/zoujingli/think-library/src/helper/PageHelper.php @@ -89,16 +89,14 @@ class PageHelper extends Helper $limit = intval($this->app->request->get('limit', cookie('page-limit'))); cookie('page-limit', $limit = $limit >= 10 ? $limit : 20); if ($this->limit > 0) $limit = $this->limit; - $rows = []; - // $paginate = $this->query->paginate($limit, $this->total, ['query' => ($query = $this->app->request->get())]); - $query = $this->app->request->get(); - $paginate = $this->query->paginate($limit, $this->total); + list($options, $query) = [[], $this->app->request->get()]; + $paginate = $this->query->paginate(['list_rows' => $limit, 'query' => $query], $this->total); foreach ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200] as $num) { list($query['limit'], $query['page'], $selected) = [$num, '1', $limit === $num ? 'selected' : '']; $url = url('@admin') . '#' . $this->app->request->baseUrl() . '?' . urldecode(http_build_query($query)); - array_push($rows, ""); + array_push($options, ""); } - $select = ""; + $select = ""; $html = "
共 {$paginate->total()} 条记录，每页显示 {$select} 条，共 {$paginate->lastPage()} 页当前显示第 {$paginate->currentPage()} 页。{$paginate->render()}
"; $this->class->assign('pagehtml', preg_replace('|href="(.*?)"|', 'data-open="$1" onclick="return false" href="$1"', $html)); $result = ['page' => ['limit' => intval($limit), 'total' => intval($paginate->total()), 'pages' => intval($paginate->lastPage()), 'current' => intval($paginate->currentPage())], 'list' => $paginate->items()]; diff --git a/vendor/zoujingli/think-library/src/queue/ListenQueue.php b/vendor/zoujingli/think-library/src/queue/ListenQueue.php index 308595fc8..ddc0b53b4 100644 --- a/vendor/zoujingli/think-library/src/queue/ListenQueue.php +++ b/vendor/zoujingli/think-library/src/queue/ListenQueue.php @@ -53,16 +53,16 @@ class ListenQueue extends Command while (true) { foreach ($this->app->db->name('SystemQueue')->where([['status', '=', '1'], ['exec_time', '<=', time()]])->order('exec_time asc')->select() as $vo) { try { - $this->app->db->name('SystemQueue')->where(['id' => $vo['id']])->update(['status' => '2', 'enter_time' => time(), 'attempts' => $vo['attempts'] + 1]); + $this->app->db->name('SystemQueue')->where(['id' => $vo['id']])->update(['status' => '2', 'enter_time' => time(), 'exec_desc' => '', 'attempts' => $vo['attempts'] + 1]); if ($process->query($command = $process->think("xtask:_work {$vo['id']} -"))) { - $output->comment("正在执行 --> [{$vo['id']}] {$vo['title']}"); + $output->comment("正在执行 -> [{$vo['id']}] {$vo['title']}"); } else { $process->create($command); - $output->info("创建成功 --> [{$vo['id']}] {$vo['title']}"); + $output->info("创建成功 -> [{$vo['id']}] {$vo['title']}"); } } catch (\Exception $e) { $this->app->db->name('SystemQueue')->where(['id' => $vo['id']])->update(['status' => '4', 'outer_time' => time(), 'exec_desc' => $e->getMessage()]); - $output->error("创建失败 --> [{$vo['id']}] {$vo['title']}，{$e->getMessage()}"); + $output->error("创建失败 -> [{$vo['id']}] {$vo['title']}，{$e->getMessage()}"); } } sleep(1);