From 8616c5f61cc8e69c9d61f42f5dc5d18e7c79fd7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= Date: Mon, 19 Jun 2023 18:16:41 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=80=82=E9=85=8D=E5=B7=B2=E5=BC=83?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李东云 --- publish/common.php | 2 ++ src/Exceptions/Forbidden.php | 2 ++ src/Exceptions/Handler/CommonHandler.php | 5 ++++- src/Middleware/ClassicCoreMiddleware.php | 4 +++- src/Middleware/CommonCoreMiddleware.php | 4 +++- src/Middleware/InternationalizationMiddleware.php | 2 ++ src/Service/ApiStyleService.php | 2 ++ src/Service/EmailService.php | 2 ++ src/Service/OssService.php | 4 +++- src/Service/SmsService.php | 4 +++- tests/Unit/OssServiceTest.php | 2 +- 11 files changed, 27 insertions(+), 6 deletions(-) diff --git a/publish/common.php b/publish/common.php index d9cc0a2..0197a8e 100644 --- a/publish/common.php +++ b/publish/common.php @@ -9,6 +9,8 @@ declare(strict_types=1); +use function Hyperf\Support\env; + return [ // 响应 'response' => [ diff --git a/src/Exceptions/Forbidden.php b/src/Exceptions/Forbidden.php index 76583df..0759376 100644 --- a/src/Exceptions/Forbidden.php +++ b/src/Exceptions/Forbidden.php @@ -7,6 +7,8 @@ use Singularity\HDK\Core\Constants\CommonErrorCode; use Teapot\StatusCode\RFC\RFC7231; use Throwable; +use function Hyperf\Config\config; + /** * 用户无权访问 */ diff --git a/src/Exceptions/Handler/CommonHandler.php b/src/Exceptions/Handler/CommonHandler.php index 018de1a..b2cade5 100644 --- a/src/Exceptions/Handler/CommonHandler.php +++ b/src/Exceptions/Handler/CommonHandler.php @@ -13,6 +13,7 @@ declare(strict_types=1); namespace Singularity\HDK\Core\Exceptions\Handler; use Carbon\Carbon; +use Hyperf\Codec\Json; use Hyperf\Database\Exception\QueryException; use Hyperf\Database\Model\ModelNotFoundException; use Hyperf\Di\Annotation\Inject; @@ -24,7 +25,6 @@ use Hyperf\HttpMessage\Exception\MethodNotAllowedHttpException; use Hyperf\HttpMessage\Exception\NotFoundHttpException; use Hyperf\HttpMessage\Stream\SwooleStream; use Hyperf\HttpServer\Contract\RequestInterface; -use Hyperf\Utils\Codec\Json; use Hyperf\Validation\ValidationException; use Lmc\HttpConstants\Header; use Psr\Http\Message\ResponseInterface; @@ -37,6 +37,9 @@ use Teapot\StatusCode\RFC\RFC4918; use Teapot\StatusCode\RFC\RFC7231; use Throwable; +use function Hyperf\Config\config; +use function Hyperf\Translation\__; + /** * 通用异常处理 * Singularity\HDK\Utils\Exceptions\Handler\CommonHandler@hyperf-development-kit diff --git a/src/Middleware/ClassicCoreMiddleware.php b/src/Middleware/ClassicCoreMiddleware.php index b5b55a9..771277c 100644 --- a/src/Middleware/ClassicCoreMiddleware.php +++ b/src/Middleware/ClassicCoreMiddleware.php @@ -10,18 +10,20 @@ namespace Singularity\HDK\Core\Middleware; +use Hyperf\Codec\Json; use Hyperf\Contract\Arrayable; use Hyperf\Contract\Jsonable; use Hyperf\Contract\LengthAwarePaginatorInterface; use Hyperf\Di\Annotation\Inject; use Hyperf\HttpMessage\Stream\SwooleStream; use Hyperf\HttpServer\CoreMiddleware; -use Hyperf\Utils\Codec\Json; use Lmc\HttpConstants\Header; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Singularity\HDK\Core\Service\UtilsService; +use function Hyperf\Config\config; + /** * Singularity\HDK\Utils\Middleware\ClassicCoreMiddleware@hyperf-development-kit * diff --git a/src/Middleware/CommonCoreMiddleware.php b/src/Middleware/CommonCoreMiddleware.php index 545d492..58c5e74 100644 --- a/src/Middleware/CommonCoreMiddleware.php +++ b/src/Middleware/CommonCoreMiddleware.php @@ -10,19 +10,21 @@ namespace Singularity\HDK\Core\Middleware; +use Hyperf\Codec\Json; use Hyperf\Contract\Arrayable; use Hyperf\Contract\Jsonable; use Hyperf\Contract\LengthAwarePaginatorInterface; use Hyperf\Di\Annotation\Inject; use Hyperf\HttpMessage\Stream\SwooleStream; use Hyperf\HttpServer\CoreMiddleware; -use Hyperf\Utils\Codec\Json; use Lmc\HttpConstants\Header; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Singularity\HDK\Core\Service\ApiStyleService; use Singularity\HDK\Core\Service\UtilsService; +use function Hyperf\Config\config; + /** * Singularity\HDK\Core\Middleware\CommonCoreMiddleware@HDK-Core * diff --git a/src/Middleware/InternationalizationMiddleware.php b/src/Middleware/InternationalizationMiddleware.php index 923d65b..b77cef4 100644 --- a/src/Middleware/InternationalizationMiddleware.php +++ b/src/Middleware/InternationalizationMiddleware.php @@ -14,6 +14,8 @@ use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; use Symfony\Component\HttpFoundation\Request; +use function Hyperf\Config\config; + /** * Singularity\HDK\Utils\Middleware\InternationalizationMiddleware@HDK * diff --git a/src/Service/ApiStyleService.php b/src/Service/ApiStyleService.php index 867fbbc..cbdb64d 100644 --- a/src/Service/ApiStyleService.php +++ b/src/Service/ApiStyleService.php @@ -11,6 +11,8 @@ namespace Singularity\HDK\Core\Service; use Hyperf\Context\Context; +use function Hyperf\Config\config; + class ApiStyleService { public const RESTFUL = 'restful'; diff --git a/src/Service/EmailService.php b/src/Service/EmailService.php index 6dc4ff9..8e1cac0 100644 --- a/src/Service/EmailService.php +++ b/src/Service/EmailService.php @@ -18,6 +18,8 @@ use Symfony\Component\Mailer\Transport; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; +use function Hyperf\Config\config; + /** * 邮箱验证码 */ diff --git a/src/Service/OssService.php b/src/Service/OssService.php index 074ca0d..bac8130 100644 --- a/src/Service/OssService.php +++ b/src/Service/OssService.php @@ -9,7 +9,9 @@ namespace Singularity\HDK\Core\Service; -use Hyperf\Utils\Codec\Json; +use Hyperf\Codec\Json; + +use function Hyperf\Config\config; class OssService { diff --git a/src/Service/SmsService.php b/src/Service/SmsService.php index 388f14a..8bf65fa 100644 --- a/src/Service/SmsService.php +++ b/src/Service/SmsService.php @@ -6,12 +6,14 @@ use AlibabaCloud\SDK\Dysmsapi\V20170525\Dysmsapi; use AlibabaCloud\SDK\Dysmsapi\V20170525\Models\SendSmsRequest; use AlibabaCloud\Tea\Exception\TeaError; use Darabonba\OpenApi\Models\Config; +use Hyperf\Codec\Json; use Hyperf\HttpMessage\Exception\ServerErrorHttpException; -use Hyperf\Utils\Codec\Json; use Singularity\HDK\Core\Constants\CommonErrorCode; use Singularity\HDK\Core\Exceptions\ValidateException; use UnexpectedValueException; +use function Hyperf\Config\config; + /** * 短信服务 */ diff --git a/tests/Unit/OssServiceTest.php b/tests/Unit/OssServiceTest.php index dea5285..afc5493 100644 --- a/tests/Unit/OssServiceTest.php +++ b/tests/Unit/OssServiceTest.php @@ -7,7 +7,7 @@ * Created on 2023/1/9 */ -use Hyperf\Utils\Codec\Json; +use Hyperf\Codec\Json; use Singularity\HDK\Core\Service\OssService; use function Spatie\PestPluginTestTime\testTime;