chore(release): 1.0.0-beta.4

Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>

.idea/HDK-Core.iml

@@ -177,6 +177,14 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/carbonphp/carbon-doctrine-types" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php82" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/clue/ndjson-react" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/evenement/evenement" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/cache" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/child-process" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/dns" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/event-loop" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/socket" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/stream" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/php.xml

@@ -192,12 +192,25 @@
       <path value="$PROJECT_DIR$/vendor/spatie/pest-plugin-test-time" />
       <path value="$PROJECT_DIR$/vendor/carbonphp/carbon-doctrine-types" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php82" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/vendor/facade/ignition-contracts" />
+      <path value="$PROJECT_DIR$/vendor/cooper/hyperf-pest" />
+      <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
+      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
+      <path value="$PROJECT_DIR$/vendor/react/child-process" />
+      <path value="$PROJECT_DIR$/vendor/react/cache" />
+      <path value="$PROJECT_DIR$/vendor/react/dns" />
+      <path value="$PROJECT_DIR$/vendor/react/stream" />
+      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
+      <path value="$PROJECT_DIR$/vendor/react/socket" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
   <component name="PhpStan">
     <PhpStan_settings>
       <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
+      <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
+      <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
     </PhpStan_settings>
   </component>
   <component name="PhpStanOptionsConfiguration">

.idea/phpspec.xml

@@ -47,6 +47,9 @@
       <PhpSpecSuiteConfiguration>
         <option name="myPath" value="$PROJECT_DIR$" />
       </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
     </suites>
   </component>
 </project>

CHANGELOG.md

@@ -1,4 +1,28 @@
 # 版本更新日志
+## [1.0.0-beta.4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2024-06-23)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **core-middleware:** 修复 JsonResource 不走响应格式化的问题 ([d524fb4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/d524fb4e890dd06da8c4fe2f0853e34944cd0e28))
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([d20718d](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/d20718db32a9dc05535ff66598475186e8016167))
+
+## [1.0.0-beta.3](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2024-05-17)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **i18n:** 在没有配置项目默认语言，且传入意料之外的语言时，默认为英文 ([44c26b6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/44c26b64918702062f28499d566eaa54d8aff491))
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([bac22a8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/bac22a8ea683c42f597e070e1395881b46b2bd83))
+
 ## [1.0.0-beta.2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2024-01-18)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-1.0.0-beta.2
+1.0.0-beta.4

composer.json

@@ -130,5 +130,5 @@
       "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "1.0.0-beta.2"
+  "version": "1.0.0-beta.4"
 }

src/I18n/Enum/Languages.php

@@ -22,7 +22,7 @@ enum Languages: string
         return match (mb_strtolower($language)) {
             'en', 'en_us', 'en-us', 'en-uk', 'en_uk' => self::EN,
             'zh', 'zh_cn', 'zh-cn' => self::ZH_CN,
-            default => self::from(config('translation.locale')),
+            default => self::from(config('translation.locale') ?? 'en'),
         };
     }
 }

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);