chore(release): 1.0.3

- 将 roave/dont 的版本约束从 ^1.6.0 更改为 *
- 添加了两个新的 PhpSpecSuiteConfiguration 配置块到 .idea/phpspec.xml 文件中

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

.gitea/workflows/publish_on_tagged.yml

@@ -19,10 +19,10 @@ jobs:
         run: |
           apt-get update
           apt-get install zip
-          zip -r hdk-core.dist.zip *
+          zip -r dist.zip *
       - name: Publish to registry
         run: |
           curl --user ch4o5:4fd300672472e666014314c1c94c604c634165a9 \
-               --upload-file ./hdk-core.dist.zip \
-               https://nest.doylee.cn/api/packages/HDK/composer?version=${{ gitea.ref_name }}-alpha
+               --upload-file ./dist.zip \
+               https://nest.doylee.cn/api/packages/HDK/composer?version=${{ gitea.ref_name }}
       - run: echo "🍏 This job's status is ${{ job.status }}."

.idea/phpspec.xml

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

CHANGELOG.md

@@ -1,4 +1,36 @@
 # 版本更新日志
+### [1.0.3](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.2...v1.0.3) (2025-11-25)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **deps:** 更新 roave/dont 依赖版本约束 ([29ad0ab](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/29ad0ab1c9c7bd8a634505a390efda82d954a929))
+
+### [1.0.2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.1...v1.0.2) (2025-09-26)
+
+### [1.0.1](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0...v1.0.1) (2025-08-19)
+
+
+### 👷 Continuous Integration | CI 配置
+
+* **gitea:** 更新发布流程并简化版本号 ([bc9977a](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/bc9977a16f0a996aebccda403ceb51b65c28dddd))
+
+## [1.0.0](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.14...v1.0.0) (2025-08-18)
+
+## [1.0.0-beta.14](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.13...v1.0.0-beta.14) (2025-08-12)
+
+
+### ♻️ Code Refactoring | 代码重构
+
+* **exception:** 重构异常处理逻辑 ([3a1f912](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/3a1f912520999ec947295efed564448a85ad1039))
+
+## [1.0.0-beta.13](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.12...v1.0.0-beta.13) (2025-08-08)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **CoreMiddleware:** 修复分页头部信息设置错误 ([15da6e6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/15da6e67702cdd7d31b55ab58ba9cbbb1a698157))
+
 ## [1.0.0-beta.12](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.11...v1.0.0-beta.12) (2025-08-08)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-1.0.0-beta.12
+1.0.3

composer.json

@@ -38,7 +38,7 @@
     "jetbrains/phpstorm-attributes": "^1.0",
     "lmc/http-constants": "^1.2.0",
     "myclabs/php-enum": "^1.8.4",
-    "roave/dont": "^1.6.0",
+    "roave/dont": "*",
     "symfony/http-foundation": "^6.4",
     "symfony/polyfill-php81": "^1.28",
     "symfony/polyfill-php82": "^1.28",
@@ -136,5 +136,5 @@
       "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "1.0.0-beta.12"
+  "version": "1.0.3"
 }

src/Constants/CommonErrorCode.php

@@ -323,7 +323,7 @@ class CommonErrorCode extends AbstractConstants
 
     // 500 业务错误
 
-    #[Message('common_error.business.defaul')]
+    #[Message('common_error.business.default')]
     public const BUSINESS_ERROR = 500001;
     // 501 版本问题
     #[Message('common_error.business.old_version')]

src/Exceptions/Handler/CommonHandler.php

@@ -42,6 +42,7 @@ use Teapot\StatusCode\RFC\RFC7231;
 use Throwable;
 
 use function Hyperf\Config\config;
+use function Hyperf\Support\make;
 use function Hyperf\Translation\__;
 
 /**
@@ -54,9 +55,6 @@ use function Hyperf\Translation\__;
  */
 class CommonHandler extends ExceptionHandler
 {
-    #[Inject(required: false)]
-    private ?RequestInterface $request;
-
     #[Inject]
     private StdoutLogger $logger;
 
@@ -70,18 +68,23 @@ class CommonHandler extends ExceptionHandler
     {
         // 阻止异常冒泡
         $this->stopPropagation();
+        if ($throwable instanceof BadRequestHttpException) {
+            $request = $throwable->getRequest();
+        } else {
+            $request = make(RequestInterface::class);
+        }
         $restful = $this->apiStyleService->get();
         // $restful = config('common.response.restful');
         $code_name = config('common.response.code_name');
         $message_name = config('common.response.message_name');
         $is_testing = config('app_status') === true;
-        $this->request?->url();
+        $request?->url();
 
         $is_debug = $is_testing;
         $error_type = $throwable::class;
         $request_time = Carbon::now()->toDateTimeString();
-        $request_data = Json::encode($this->request?->getParsedBody());
-        $request_headers = Json::encode($this->request?->getHeaders());
+        $request_data = $request?->getBody()->getContents();
+        $request_headers = Json::encode($request?->getHeaders());
         // 901 程序语法错误
         // 902 SQL 语法错误
         if ($throwable instanceof QueryException) {
@@ -125,7 +128,7 @@ class CommonHandler extends ExceptionHandler
             $data = [
                 $code_name => $code,
                 $message_name => CommonErrorCode::getMessage($code, ['methods' => join(', ', $allow_method)]),
-                'currentMethod' => $this->request?->getMethod(),
+                'currentMethod' => $request?->getMethod(),
                 'allowedMethod' => $allow_method,
             ];
             $status_code = RFC7231::METHOD_NOT_ALLOWED;
@@ -257,37 +260,37 @@ class CommonHandler extends ExceptionHandler
         if ($is_debug && $is_testing) {
             $data += ['errorType' => $error_type, 'errorTrack' => $throwable->getTrace()];
         }
-        $cookies = json_encode($this->request->getCookieParams(), JSON_UNESCAPED_UNICODE);
+        $cookies = json_encode($request->getCookieParams(), JSON_UNESCAPED_UNICODE);
         $this->logger->error(
             <<<ERROR_LOG
-TYPE: {$error_type}
-[$data[$code_name]] $data[$message_name]
-{$throwable->getMessage()}
--------------------------------
-REQUEST_TIME: {$request_time}
--------------------------------
-REQUEST_HEADERS:
-{$request_headers}
--------------------------------
-REQUEST_COOKIES:
-{$cookies}
--------------------------------
-REQUEST_METHOD:
-{$this->request?->getMethod()}
--------------------------------
-REQUEST_URL:
-{$this->request?->getUri()}
--------------------------------
-REQUEST_QUERY:
-{$this->request?->getQueryString()}
--------------------------------
-REQUEST_DATA:
-{$request_data}
--------------------------------
-TRACE:
-{$throwable->getTraceAsString()}
-===============================
-ERROR_LOG,
+                TYPE: {$error_type}
+                [$data[$code_name]] $data[$message_name]
+                {$throwable->getMessage()}
+                -------------------------------
+                REQUEST_TIME: {$request_time}
+                -------------------------------
+                REQUEST_HEADERS:
+                {$request_headers}
+                -------------------------------
+                REQUEST_COOKIES:
+                {$cookies}
+                -------------------------------
+                REQUEST_METHOD:
+                {$request?->getMethod()}
+                -------------------------------
+                REQUEST_URL:
+                {$request?->getUri()}
+                -------------------------------
+                REQUEST_QUERY:
+                {$request?->getUri()->getQuery()}
+                -------------------------------
+                REQUEST_DATA:
+                {$request_data}
+                -------------------------------
+                TRACE:
+                {$throwable->getTraceAsString()}
+                ===============================
+                ERROR_LOG,
         );
         $data = Json::encode($data);
         if ($restful === ApiStyleService::RESTFUL) {

src/Middleware/CommonCoreMiddleware.php

@@ -77,7 +77,7 @@ class CommonCoreMiddleware extends CoreMiddleware
                 ->withHeader('Per-Page', (string)$response->perPage())
                 ->withHeader('Total', (string)$response->total())
                 ->withHeader('Current-Page', (string)$response->currentPage())
-                ->withHeader('Total-Pages', (string)$response->hasPages());
+                ->withHeader('Total-Pages', (string)$response->lastPage());
             $fact_response = $this->utilsService->extendLinkToHeader($fact_response, $response->nextPageUrl(), 'next');
             $fact_response = $this->utilsService->extendLinkToHeader(
                 $fact_response,
@@ -90,7 +90,10 @@ class CommonCoreMiddleware extends CoreMiddleware
                 $response->previousPageUrl(),
                 'prev'
             );
-            return $fact_response->withBody(new SwooleStream(Json::encode($response->items())));
+            return $fact_response->withBody(new SwooleStream(Json::encode($response->items())))->withHeader(
+                Header::CONTENT_TYPE,
+                'application/json',
+            );
         }
 
         return parent::transferToResponse($response, $request);