mirror of
http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore.git
synced 2026-01-15 05:55:12 +08:00
fix(core-middleware): 修复 JsonResource 不走响应格式化的问题
Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>
This commit is contained in:
1
.idea/HDK-Core.iml
generated
1
.idea/HDK-Core.iml
generated
@@ -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" />
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user