From 4cc07b238aa602c61776c18de2224ea8a8d60a06 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 30 Nov 2020 14:12:04 +0800 Subject: [PATCH] ComposerUpdate --- vendor/composer/autoload_classmap.php | 2 +- vendor/composer/autoload_static.php | 2 +- vendor/composer/installed.json | 12 ++++++------ vendor/services.php | 2 +- vendor/zoujingli/think-library/src/Library.php | 13 ++++++------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index b1bdacb0a..4c42d7d84 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -200,7 +200,6 @@ return array( 'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => $baseDir . '/app/admin/controller/api/Upload.php', 'app\\data\\controller\\Config' => $baseDir . '/app/data/controller/Config.php', - 'app\\data\\controller\\Message' => $baseDir . '/app/data/controller/Message.php', 'app\\data\\controller\\NewsItem' => $baseDir . '/app/data/controller/NewsItem.php', 'app\\data\\controller\\NewsMark' => $baseDir . '/app/data/controller/NewsMark.php', 'app\\data\\controller\\ShopGoods' => $baseDir . '/app/data/controller/ShopGoods.php', @@ -215,6 +214,7 @@ return array( 'app\\data\\controller\\StoreUsed' => $baseDir . '/app/data/controller/StoreUsed.php', 'app\\data\\controller\\StoreUser' => $baseDir . '/app/data/controller/StoreUser.php', 'app\\data\\controller\\User' => $baseDir . '/app/data/controller/User.php', + 'app\\data\\controller\\UserMessage' => $baseDir . '/app/data/controller/UserMessage.php', 'app\\data\\controller\\api\\Auth' => $baseDir . '/app/data/controller/api/Auth.php', 'app\\data\\controller\\api\\Data' => $baseDir . '/app/data/controller/api/Data.php', 'app\\data\\controller\\api\\Goods' => $baseDir . '/app/data/controller/api/Goods.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 3af110b61..633a60fe7 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -328,7 +328,6 @@ class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b 'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => __DIR__ . '/../..' . '/app/admin/controller/api/Upload.php', 'app\\data\\controller\\Config' => __DIR__ . '/../..' . '/app/data/controller/Config.php', - 'app\\data\\controller\\Message' => __DIR__ . '/../..' . '/app/data/controller/Message.php', 'app\\data\\controller\\NewsItem' => __DIR__ . '/../..' . '/app/data/controller/NewsItem.php', 'app\\data\\controller\\NewsMark' => __DIR__ . '/../..' . '/app/data/controller/NewsMark.php', 'app\\data\\controller\\ShopGoods' => __DIR__ . '/../..' . '/app/data/controller/ShopGoods.php', @@ -343,6 +342,7 @@ class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b 'app\\data\\controller\\StoreUsed' => __DIR__ . '/../..' . '/app/data/controller/StoreUsed.php', 'app\\data\\controller\\StoreUser' => __DIR__ . '/../..' . '/app/data/controller/StoreUser.php', 'app\\data\\controller\\User' => __DIR__ . '/../..' . '/app/data/controller/User.php', + 'app\\data\\controller\\UserMessage' => __DIR__ . '/../..' . '/app/data/controller/UserMessage.php', 'app\\data\\controller\\api\\Auth' => __DIR__ . '/../..' . '/app/data/controller/api/Auth.php', 'app\\data\\controller\\api\\Data' => __DIR__ . '/../..' . '/app/data/controller/api/Data.php', 'app\\data\\controller\\api\\Goods' => __DIR__ . '/../..' . '/app/data/controller/api/Goods.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 41b30ca20..92d05b761 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -533,8 +533,8 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.46", - "version_normalized": "3.4.46.0", + "version": "v3.4.47", + "version_normalized": "3.4.47.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -937,12 +937,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "5b98a7ea56e25ca1887ab4f8ec74c715f3500aa7" + "reference": "a1ea81986d6c5e90af3a172cbec70cfc8fbfc7bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/5b98a7ea56e25ca1887ab4f8ec74c715f3500aa7", - "reference": "5b98a7ea56e25ca1887ab4f8ec74c715f3500aa7", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a1ea81986d6c5e90af3a172cbec70cfc8fbfc7bf", + "reference": "a1ea81986d6c5e90af3a172cbec70cfc8fbfc7bf", "shasum": "", "mirrors": [ { @@ -959,7 +959,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-11-23T06:25:57+00:00", + "time": "2020-11-30T06:02:53+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 0a04b4551..1766e5de2 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php index 7a9b5f7b6..cb7e49f9e 100644 --- a/vendor/zoujingli/think-library/src/Library.php +++ b/vendor/zoujingli/think-library/src/Library.php @@ -48,13 +48,14 @@ class Library extends Service */ public function boot() { - // 多应用中间键处理 + // 服务初始化处理 $this->app->event->listen('HttpRun', function (Request $request) { + // 配置默认输入过滤 + $request->filter(['trim']); + // 注册多应用中间键 $this->app->middleware->add(Multiple::class); - // 解决 HTTP 调用 Console 之后 URL 问题 - if (!$this->app->request->isCli()) { - $request->setHost($request->host()); - } + // 解决 HTTP 调用 Console 之后 URL 生成的问题 + if (!$request->isCli()) $request->setHost($request->host()); }); // 替换 ThinkPHP 地址 $this->app->bind('think\route\Url', BuildUrl::class); @@ -71,8 +72,6 @@ class Library extends Service */ public function register() { - // 输入默认过滤 - $this->app->request->filter(['trim']); // 加载中文语言 $this->app->lang->load(__DIR__ . '/lang/zh-cn.php', 'zh-cn'); $this->app->lang->load(__DIR__ . '/lang/en-us.php', 'en-us');