From fe98588f9b6e88343d76836520bc29392a2bce6d Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 24 Aug 2020 14:45:44 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../zoujingli/think-library/src/service/ModuleService.php | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 6f2a76316..718c362b8 100644 --- a/composer.lock +++ b/composer.lock @@ -937,12 +937,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "62a79d2ab6f1e4bf79e2c5bac8f1e659109a9242" + "reference": "29bdf3342f44b803db8206ca9cfba4415f1b7e44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/62a79d2ab6f1e4bf79e2c5bac8f1e659109a9242", - "reference": "62a79d2ab6f1e4bf79e2c5bac8f1e659109a9242", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/29bdf3342f44b803db8206ca9cfba4415f1b7e44", + "reference": "29bdf3342f44b803db8206ca9cfba4415f1b7e44", "shasum": "", "mirrors": [ { @@ -987,7 +987,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://thinkadmin.top", - "time": "2020-08-24T06:25:31+00:00" + "time": "2020-08-24T06:41:53+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index df9269cc0..d001792b3 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -963,12 +963,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "62a79d2ab6f1e4bf79e2c5bac8f1e659109a9242" + "reference": "29bdf3342f44b803db8206ca9cfba4415f1b7e44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/62a79d2ab6f1e4bf79e2c5bac8f1e659109a9242", - "reference": "62a79d2ab6f1e4bf79e2c5bac8f1e659109a9242", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/29bdf3342f44b803db8206ca9cfba4415f1b7e44", + "reference": "29bdf3342f44b803db8206ca9cfba4415f1b7e44", "shasum": "", "mirrors": [ { @@ -985,7 +985,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-08-24T06:25:31+00:00", + "time": "2020-08-24T06:41:53+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index cc8c6a8ef..cbeef3a48 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/service/ModuleService.php b/vendor/zoujingli/think-library/src/service/ModuleService.php index df1c6e629..deaa9710b 100644 --- a/vendor/zoujingli/think-library/src/service/ModuleService.php +++ b/vendor/zoujingli/think-library/src/service/ModuleService.php @@ -163,8 +163,8 @@ class ModuleService extends Service { $data = $this->app->cache->get('moduleAllowRule', []); if (is_array($data) && count($data) > 0) return $data; - $data = ['config', 'public/static']; - foreach (array_keys($this->getModules()) as $name) $data[] = 'app/' . $name; + $data = ['config', 'public/static', 'public/router.php', 'public/index.php']; + foreach (array_keys($this->getModules()) as $name) $data[] = "app/{$name}"; $this->app->cache->set('moduleAllowRule', $data, 30); return $data; }