From d524fb4e890dd06da8c4fe2f0853e34944cd0e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= <dongyu.li@luxcreo.ai>
Date: Sun, 23 Jun 2024 18:13:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(core-middleware):=20=E4=BF=AE=E5=A4=8D=20Js?=
 =?UTF-8?q?onResource=20=E4=B8=8D=E8=B5=B0=E5=93=8D=E5=BA=94=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>
---
 .idea/HDK-Core.iml                      | 1 -
 src/Middleware/CommonCoreMiddleware.php | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/HDK-Core.iml b/.idea/HDK-Core.iml
index b9c238c..d0399cc 100644
--- a/.idea/HDK-Core.iml
+++ b/.idea/HDK-Core.iml
@@ -4,7 +4,6 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Singularity\HDK\Core\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Singularity\HDK\Test\Core\" />
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/runtime" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/adbario/php-dot-notation" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/alibabacloud/credentials" />
diff --git a/src/Middleware/CommonCoreMiddleware.php b/src/Middleware/CommonCoreMiddleware.php
index f055844..f3d4600 100644
--- a/src/Middleware/CommonCoreMiddleware.php
+++ b/src/Middleware/CommonCoreMiddleware.php
@@ -18,6 +18,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpMessage\Server\ResponsePlusProxy;
 use Hyperf\HttpMessage\Stream\SwooleStream;
 use Hyperf\HttpServer\CoreMiddleware;
+use Hyperf\Resource\Json\JsonResource;
 use Lmc\HttpConstants\Header;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -51,7 +52,7 @@ class CommonCoreMiddleware extends CoreMiddleware
     ): ResponsePlusInterface {
         $style = $this->apiStyleService->get();
 
-        if (!($response instanceof ResponseInterface)) {
+        if (!($response instanceof ResponseInterface) || $response instanceof JsonResource) {
             $response = $style === ApiStyleService::RESTFUL
                 ? $this->transferToRestfulResponse($response, $request)
                 : $this->transferToClassicResponse($response, $request);