From 94c430f49157d09674f643e8451e42c16502bf80 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Sun, 29 Nov 2020 09:29:14 +0800 Subject: [PATCH] update --- extend/catcher/CatchAdmin.php | 2 ++ extend/catcher/CatchAdminService.php | 2 ++ extend/catcher/CatchAuth.php | 2 ++ extend/catcher/CatchCacheKeys.php | 2 ++ extend/catcher/CatchConsole.php | 9 +++-- extend/catcher/CatchExceptionHandle.php | 2 ++ extend/catcher/CatchModelCollection.php | 2 ++ extend/catcher/CatchQuery.php | 2 ++ extend/catcher/CatchResponse.php | 36 +++++++++---------- extend/catcher/CatchUpload.php | 2 ++ extend/catcher/Code.php | 2 ++ extend/catcher/ModuleService.php | 2 ++ extend/catcher/Tree.php | 2 ++ extend/catcher/Utils.php | 2 ++ extend/catcher/base/CatchController.php | 2 ++ extend/catcher/base/CatchCronTask.php | 2 ++ extend/catcher/base/CatchModel.php | 2 ++ extend/catcher/base/CatchRepository.php | 2 ++ extend/catcher/base/CatchRequest.php | 2 ++ extend/catcher/base/CatchValidate.php | 2 ++ extend/catcher/exceptions/CatchException.php | 2 ++ extend/catcher/exceptions/FailedException.php | 2 ++ .../exceptions/FiledNotFoundException.php | 2 ++ .../exceptions/LoginFailedException.php | 2 ++ .../PermissionForbiddenException.php | 2 ++ .../exceptions/ValidateFailedException.php | 2 ++ .../exceptions/WechatResponseException.php | 2 ++ extend/catcher/facade/FileSystem.php | 2 ++ extend/catcher/facade/Http.php | 2 ++ extend/catcher/facade/Trie.php | 2 ++ extend/catcher/library/BackUpDatabase.php | 2 ++ extend/catcher/library/Composer.php | 2 ++ extend/catcher/library/Compress.php | 2 ++ extend/catcher/library/Errors.php | 2 ++ extend/catcher/library/FileSystem.php | 2 ++ extend/catcher/library/InstallCatchModule.php | 2 ++ extend/catcher/library/InstallLocalModule.php | 2 ++ extend/catcher/library/ParseClass.php | 4 ++- extend/catcher/library/ProgressBar.php | 2 ++ extend/catcher/library/Trie.php | 2 ++ extend/catcher/library/WeChat.php | 2 ++ extend/catcher/library/Zip.php | 2 ++ extend/catcher/library/client/Http.php | 2 ++ extend/catcher/library/client/Response.php | 2 ++ extend/catcher/library/excel/Excel.php | 2 ++ .../catcher/library/excel/ExcelContract.php | 2 ++ extend/catcher/library/excel/Factory.php | 2 ++ extend/catcher/library/excel/MacroExcel.php | 2 ++ .../library/excel/ShouldTaskContract.php | 2 ++ extend/catcher/library/rate/GrantLimit.php | 2 ++ extend/catcher/library/rate/RateLimiter.php | 2 ++ extend/catcher/library/rate/Redis.php | 2 ++ .../library/rate/SlidingWindowLimit.php | 2 ++ .../middlewares/JsonResponseMiddleware.php | 2 ++ extend/catcher/traits/db/BaseOptionsTrait.php | 1 + extend/catcher/traits/db/ScopeTrait.php | 2 ++ extend/catcher/traits/db/TransTrait.php | 2 ++ extend/catcher/validates/SensitiveWord.php | 2 ++ extend/catcher/validates/Sometimes.php | 2 ++ .../catcher/validates/ValidateInterface.php | 2 ++ 60 files changed, 140 insertions(+), 22 deletions(-) diff --git a/extend/catcher/CatchAdmin.php b/extend/catcher/CatchAdmin.php index bd5390f..5e07f85 100644 --- a/extend/catcher/CatchAdmin.php +++ b/extend/catcher/CatchAdmin.php @@ -1,4 +1,6 @@ getExtension() === 'php') { - $lastPath = str_replace($this->parseNamespace(), '',pathinfo($command, PATHINFO_DIRNAME)); + $lastPath = str_replace($this->parseNamespace(), '', pathinfo($command->getPathname(), PATHINFO_DIRNAME)); $namespace = $this->namespace . str_replace(DIRECTORY_SEPARATOR, '\\', $lastPath) . '\\'; - $commandClass = $namespace . pathinfo($command, PATHINFO_FILENAME); + $commandClass = $namespace . pathinfo($command->getPathname(), PATHINFO_FILENAME); $commands[] = $commandClass; } } diff --git a/extend/catcher/CatchExceptionHandle.php b/extend/catcher/CatchExceptionHandle.php index 3f068ee..e86ea2f 100644 --- a/extend/catcher/CatchExceptionHandle.php +++ b/extend/catcher/CatchExceptionHandle.php @@ -1,4 +1,6 @@ $code, - 'message' => $msg, - 'data' => $data, - ]); + return json([ + 'code' => $code, + 'message' => $msg, + 'data' => $data, + ]); } /** @@ -35,14 +35,14 @@ class CatchResponse */ public static function paginate(Paginator $list) { - return json([ - 'code' => Code::SUCCESS, - 'message' => 'success', - 'count' => $list->total(), - 'current' => $list->currentPage(), - 'limit' => $list->listRows(), - 'data' => $list->getCollection(), - ]); + return json([ + 'code' => Code::SUCCESS, + 'message' => 'success', + 'count' => $list->total(), + 'current' => $list->currentPage(), + 'limit' => $list->listRows(), + 'data' => $list->getCollection(), + ]); } /** @@ -55,9 +55,9 @@ class CatchResponse */ public static function fail($msg = '', $code = Code::FAILED): Json { - return json([ - 'code' => $code, - 'message' => $msg, - ]); + return json([ + 'code' => $code, + 'message' => $msg, + ]); } } diff --git a/extend/catcher/CatchUpload.php b/extend/catcher/CatchUpload.php index 422d1b9..1ce64e2 100644 --- a/extend/catcher/CatchUpload.php +++ b/extend/catcher/CatchUpload.php @@ -1,4 +1,6 @@