chore(release): 0.2.7

style(cs-fixer): prettier
fix(extend): 修复了解析不到为空不为数组的问题
2026-01-15 07:15:06 +08:00 · 2023-02-02 07:45:00 +00:00 · 2023-02-02 15:44:48 +08:00 · 2023-02-02 15:44:26 +08:00 · 2023-02-01 21:11:13 +08:00 · 2023-01-16 22:34:23 +08:00
41 changed files with 2031 additions and 3173 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 vendor/
 .phpunit.result.cache
-.php-cs-fixer.cache
-runtime/
+.php-cs-fixer.cache
--- a/.idea/HDK-Core.iml
+++ b/.idea/HDK-Core.iml
@@ -2,6 +2,7 @@
 <module type="WEB_MODULE" version="4">
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
      <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\" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
@@ -63,6 +64,8 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/http-message" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/exception-handler" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/macroable" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/resource" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/paginator" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/engine" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/pool" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/event" />
@@ -91,6 +94,7 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php81" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php72" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation-contracts" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />
@@ -131,12 +135,14 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/nunomaduro/collision" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/pestphp/pest" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/stopwatch" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/spatie/test-time" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/phpstan/phpstan" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/pestphp/pest-plugin" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/friendsofphp/php-cs-fixer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/spatie/pest-plugin-test-time" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/filp/whoops" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/deprecations" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/facade/ignition-contracts" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/coordinator" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,7 @@
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="PhpCSFixerValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PhpDocSignatureInspection" enabled="true" level="INFORMATION" enabled_by_default="true" />
    <inspection_tool class="PhpPropertyOnlyWrittenInspection" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="PhpStanGlobal" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
  </profile>
--- a/.idea/php-docker-settings.xml
+++ b/.idea/php-docker-settings.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpDockerContainerSettings">
-    <list>
-      <map>
-        <entry key="9fb85f67-19fd-423f-9358-1b155a12eb7d">
-          <value>
-            <DockerContainerSettings>
-              <option name="version" value="1" />
-              <option name="volumeBindings">
-                <list>
-                  <DockerVolumeBindingImpl>
-                    <option name="containerPath" value="/opt/project" />
-                    <option name="hostPath" value="$PROJECT_DIR$" />
-                  </DockerVolumeBindingImpl>
-                </list>
-              </option>
-            </DockerContainerSettings>
-          </value>
-        </entry>
-      </map>
-    </list>
-  </component>
-</project>
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -79,6 +79,8 @@
      <path value="$PROJECT_DIR$/vendor/hyperf/http-message" />
      <path value="$PROJECT_DIR$/vendor/hyperf/exception-handler" />
      <path value="$PROJECT_DIR$/vendor/hyperf/macroable" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/resource" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/paginator" />
      <path value="$PROJECT_DIR$/vendor/hyperf/engine" />
      <path value="$PROJECT_DIR$/vendor/hyperf/pool" />
      <path value="$PROJECT_DIR$/vendor/hyperf/event" />
@@ -107,6 +109,7 @@
      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php81" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
@@ -147,28 +150,17 @@
      <path value="$PROJECT_DIR$/vendor/pestphp/pest-plugin" />
      <path value="$PROJECT_DIR$/vendor/filp/whoops" />
      <path value="$PROJECT_DIR$/vendor/nunomaduro/collision" />
-      <path value="$PROJECT_DIR$/vendor/facade/ignition-contracts" />
+      <path value="$PROJECT_DIR$/vendor/spatie/test-time" />
+      <path value="$PROJECT_DIR$/vendor/spatie/pest-plugin-test-time" />
      <path value="$PROJECT_DIR$/vendor/friendsofphp/php-cs-fixer" />
      <path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
      <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
      <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
      <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
-      <path value="$PROJECT_DIR$/vendor/psr/clock" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/crontab" />
-      <path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
-      <path value="$PROJECT_DIR$/vendor/carbonphp/carbon-doctrine-types" />
-      <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" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/coordinator" />
    </include_path>
  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.4" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
  <component name="PhpStan">
    <PhpStan_settings>
      <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
--- a/.versionrc
+++ b/.versionrc
@@ -30,6 +30,10 @@
      "type": "perf",
      "section": "⚡ Performance Improvements | 性能优化"
    },
+    {
+      "type": "tests",
+      "section": "✅ Tests | 测试"
+    },
    {
      "type": "test",
      "section": "✅ Tests | 测试"
@@ -53,7 +57,7 @@
  ],
  "bumpFiles": [
    {
-      "filename": "MY_VERSION_TRACKER.txt",
+      "filename": "VERSION_TRACKER.txt",
      "type": "plain-text"
    },
    {
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,94 +1,90 @@
 # 版本更新日志
-### [0.1.9](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.1.8...v0.1.9) (2024-09-12)
+### [0.2.7](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.6...v0.2.7) (2023-02-02)
+
+
+### ⚡ Performance Improvements | 性能优化
+
+* **Sms:** 修改抛出的异常类型，追加方法注释 ([5a1a2a8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/5a1a2a89bd7d706a6e8d1ef567c59969d8d63554))


 ### ✨ Features | 新功能

-* **email:** 增加了单独定制发件人的方法 ([bebac59](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/bebac5992a89ebe41eb20ea926938f4b3fde2cc1))
-
-### [0.1.8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.1.7...v0.1.8) (2024-09-12)
+* **Email:** 实现了邮件发送的事件机制 ([8757908](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/8757908f3f8a6dff5516bd6e449c8dd3952ec2cd))
+* **Listener:** 添加了一个抽象监听器类，预先注入了一些属性 ([1dbad8e](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/1dbad8e5a65d299b9a56b6a5c4759be5c3736707))
+* **Sms:** 实现了短信发送的事件机制 ([5151787](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/51517879820de832395efc40bb308a736f33f131))


-### ✨ Features | 新功能
+### ✏️ Documentation | 文档

-* **email:** 增加了密送参数 ([1c05772](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/1c057722bcf407ab1faf6b5feb285e1e472fc627))
-
-
-### 📦‍ Build System | 打包构建
-
-* **composer:** 更新依赖 ([0471983](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/04719839ad518ef3c00ffb67b8b563561de36858))
-
-### [0.1.7](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.1.6...v0.1.7) (2023-07-05)
-
-
-### 📦‍ Build System | 打包构建
-
-* **composer:** 更新依赖 ([a570e19](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a570e1964e01b9e29de05f4a7607a4ed567beffa))
-
-
-### ✨ Features | 新功能
-
-* **session:** 增加了定制的 session 中间件 ([b51699b](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/b51699b0d98322df33fb3a0bccebe5f4034e2a71))
-
-### [0.1.6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.1.5...v0.1.6) (2023-03-21)
-
-
-### 🐛 Bug Fixes | Bug 修复
-
-* **middleware.i18n:** 尝试修复了多语言无法正确获取的问题 ([a7a8087](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a7a80875092653e56d8dc9351743a08933d59282))
+* **README:** 修复一直报错的文件名 ([135db1b](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/135db1bf6aeeedbb0d59405567bb4837f3221e49))
+* **Sms:** 补充所抛出异常的注释 ([b65818b](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/b65818bfb6d8368514d517c31dd6b6696b2d08be))


 ### ✅ Tests | 测试

-* **email:** 更新了邮件发送的测试账号 ([8dcf586](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/8dcf586baf1960f906d63c15f3d659b16b456048))
-
-
-### 📦‍ Build System | 打包构建
-
-* **composer:** 更新依赖 ([5ed5070](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/5ed5070f323d0ea34b8c99b5ac826dc6c24431df))
-
-### [0.1.5](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.1.4...v0.1.5) (2023-02-03)
+* **extend:** 补充测试用例 ([e41847a](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/e41847a2340916de24726f8266dca8b514b4edd3))


 ### 🐛 Bug Fixes | Bug 修复

-* **commonHandler:** 修复了一处兼容问题 ([fca8f9d](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/fca8f9d013e1d121bf8bc997710d77ff038fdae0))
-
-### [0.1.4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.1.3...v0.1.4) (2023-02-02)
+* **extend:** 修复了解析不到为空不为数组的问题 ([099ab60](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/099ab601030caef52806f5b9ec4d62fb27b08e72))


 ### 💄 Styles | 风格

-* **cs-fixer:** prettier ([24161f0](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/24161f084127602a32d9a7ca3af122eb26169fec))
+* **cs-fixer:** prettier ([a729270](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a729270fac57cd617e8f166bb59f9ccffe33358b))

-### [0.1.3](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.1.2...v0.1.3) (2023-02-02)
+### [0.2.6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.5...v0.2.6) (2023-01-16)


-### 📦‍ Build System | 打包构建
+### 💄 Styles | 风格

-* **composer:** 修复 php 版本限制 ([0b4fb23](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/0b4fb2377985dc70a2cfa5a603f73e2ced14dc8c))
-* **composer:** 修复 php 版本限制 ([eb20bc9](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/eb20bc9fdbc887d0e478a3ceaa4396001fbbbdfd))
-
-
-### ✨ Features | 新功能
-
-* **email/sms:** 添加了发送邮件和短信的事件 ([7fd7d23](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/7fd7d2305120f60b70390b49c6256b01fbec6485))
+* 移除冗余的注释 ([3d09207](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/3d092074b3784b120cabb1561a9d6b9af5c3c428))


 ### 🐛 Bug Fixes | Bug 修复

-* **extend:** 修复了解析不到为null不为数组的问题 ([c3eb95d](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/c3eb95d300f312b14204edd6b97d80b76c273ff3))
-* **extend:** 修复了解析不到为null不为数组的问题 ([a7a61bd](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a7a61bd6748ca432e95c396738ebdd7dcfe96463))
-* **extend:** 修复了解析不到为空不为数组的问题 ([6c27804](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/6c278048568c6b070192b290f54562f05c1803e6))
+* **configure:** 修复配置文件和实际应用的字段名不统一 ([d1bae3e](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/d1bae3e623dde3839acb44d4a7905c7dab78e8ce))

-### [0.1.2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.1.1...v0.1.2) (2023-01-28)
+### [0.2.5](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.4...v0.2.5) (2023-01-13)


-### 📦‍ Build System | 打包构建
+### ✨ Features | 新功能

-* **composer:** 修复 ConfigProvider 命名空间 ([1f0ef04](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/1f0ef04c7a092e2d7df1cafb94b3a50a04ee66cd))
+* **CoreMiddleware:** 增加restful场景下的分页响应处理 ([aeddb55](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/aeddb55988e714e53b7458ead8668dee6ebec63e))

-### 0.1.1 (2023-01-28)
+### [0.2.4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.3...v0.2.4) (2023-01-13)
+
+
+### ⏪ Revert | 回退
+
+* **constant:** 移除冗余的http头authentication的枚举类型 ([cdb1937](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/cdb193778fb888851682bb1671bc55dd8f0e3423))
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **oss:** 修复了oss的配置缺失和错误 ([922c780](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/922c780c49edc2cddbce3e66e6b9dfde7be364f8))
+
+### [0.2.3](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.2...v0.2.3) (2023-01-13)
+
+
+### ✏️ Documentation | 文档
+
+* **link:** 增加错误码对应的语雀文档 ([3a1f269](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/3a1f2695fef03840d9afe3578f3e7ed33da45926))
+
+
+### ✨ Features | 新功能
+
+* **constant:** 增加http头authentication的枚举类型 ([08c1f66](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/08c1f6609c3035dd7d7f39e8389b66a8ba2e34a5))
+
+### [0.2.2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.1...v0.2.2) (2023-01-13)
+
+
+### ⚡ Performance Improvements | 性能优化
+
+* **exceptions.handler:** 优化trace显示格式 ([9f9ff31](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/9f9ff31a83ea5662500c688471b78f02ff67eb15))
+
+### 0.2.1 (2023-01-13)


 ### 🎉 Init | 初始化
@@ -97,15 +93,35 @@
 * 初始化项目 ([a13779a](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a13779ab3fb617189227b9d2c0462588be8ceee5))


+### ✅ Tests | 测试
+
+* **oss:** 增加 oss 票据生成的测试文件 ([b5970d5](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/b5970d543435495706502c5b67897ff1cfd5fb85))
+* **service:** 添加了base64Wrapper的测试 ([69ce665](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/69ce66561f19e44d35b134c6d032ff69f48201a3))
+* **service:** 添加了发送邮件的测试 ([65e3485](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/65e34857e2978a9952ee89df71b1e0c9101ec69c))
+* **service:** 添加了解析 extends 的测试 ([da1d6c6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/da1d6c68d21b2739c8bb1701243e6419eae14975))
+
+
+### ✨ Features | 新功能
+
+* **utils:** 重写了构造URL的方法，增加对应的单元测试 ([9f79d14](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/9f79d1465ba6ed4b4c0d0c30e23ffa34bbeece65))
+* 迁移到了 Core 命名空间下 ([a8a582f](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a8a582f3aa0948c982e31bf8938b6f3331d8dc6d))
+
+
+### ✏️ Documentation | 文档
+
+* **core:** 添加作者信息 ([096d4e5](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/096d4e56ed30c23de1338bb6f057a91e629c6ea5))
+* **README:** 增加说明文件 ([4cf16ae](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/4cf16ae0cdcf6f7a1eb99fde95a6c3ef01bd7b2b))
+
+
 ### ⚡ Performance Improvements | 性能优化

 * **utils:** 获取真实IP方法，增加apache的处理 ([47e522c](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/47e522c67bf595282df7671f1d045e44593022bf))


-### 🚀 Chore | 构建/工程依赖/工具
+### ♻️ Code Refactoring | 代码重构

-* 移除调试用的打印语句 ([37ed1ce](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/37ed1cef77d094f6cd78dd1c97f5d2e3cf6376a3))
-* **tests:** 移除了示例测试文件 ([e705bed](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/e705bedd5d3e72887e9e5fac35926237db844116))
+* **migrate:** 迁移注解以支持hyperf3 ([480f406](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/480f406cccde21f5fb39ba431b6f633c562e5f96))
+* **migrate:** 迁移注解以支持hyperf3 ([91db3c7](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/91db3c731f651e178f830953bf97958c5ddc973d))


 ### 📦‍ Build System | 打包构建
@@ -116,23 +132,17 @@
 * **composer:** 更新依赖 ([1e4fbe5](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/1e4fbe59276ed2913aa21973f9502505115d2628))
 * **composer:** 添加依赖到开发环境 ([9f5699f](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/9f5699f39cd7a89c37e9365322c6082a97a973f4))
 * **version:** 添加changelog配置 ([4deffe0](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/4deffe055ebe8586a183103d84dcd5b97969ca7d))
+* **version:** 添加changelog配置及脚本 ([3bc4e27](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/3bc4e275a761bf71bb0ca227770b82c3d5ec76bb))
+* 迁移到hyperf3 ([9fedbb4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/9fedbb40f4c9f3221a97986dc7063d049c914728))


-### ✏️ Documentation | 文档
+### 🚀 Chore | 构建/工程依赖/工具

-* **core:** 添加作者信息 ([096d4e5](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/096d4e56ed30c23de1338bb6f057a91e629c6ea5))
-* **README:** 修复一直报错的文件名 ([135db1b](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/135db1bf6aeeedbb0d59405567bb4837f3221e49))
-* **README:** 增加说明文件 ([4cf16ae](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/4cf16ae0cdcf6f7a1eb99fde95a6c3ef01bd7b2b))
-* **README:** 提示版本过期，需要更新 ([3e2d340](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/3e2d3400b45edf4b503a91c078aaa3ef0fff553e))
+* **release:** 0.2.1-0 ([ab44630](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/ab44630db8c2d05c21bccdf0899569f911b01473))
+* 移除调试用的打印语句 ([37ed1ce](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/37ed1cef77d094f6cd78dd1c97f5d2e3cf6376a3))
+* **tests:** 移除了示例测试文件 ([e705bed](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/e705bedd5d3e72887e9e5fac35926237db844116))


-### ✨ Features | 新功能
+### 🐛 Bug Fixes | Bug 修复

-* 增加了inArray、hasExtends方法 ([c83728c](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/c83728cad28438c3bcef9d946680fe1637a6814f))
-* **utils:** 重写了构造URL的方法，增加对应的单元测试 ([9f79d14](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/9f79d1465ba6ed4b4c0d0c30e23ffa34bbeece65))
-* 迁移到了 Core 命名空间下 ([a8a582f](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a8a582f3aa0948c982e31bf8938b6f3331d8dc6d))
-
-
-### ♻️ Code Refactoring | 代码重构
-
-* 向后兼容到7.4 ([0fa3c23](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/0fa3c23a3e249cd2473a468ee64d7efc8b6eafe3))
+* **composer:** 修复ConfigProvider命名空间 ([3989f59](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/3989f5913ea56cba8751afc225c19b8f6730d2c3))
--- a/README.md
+++ b/README.md
@@ -2,15 +2,6 @@

 The Common HDK for Any project by Hyperf.

-> DEPRECATED!!!
-> 
-> This Branch is outdated, 
-> only used for support old versions.
-> Such as Hyperf 2.2 or less.
-> 
-> Please UPGRADE your version to Hyperf 3.0
-> and HDK-Core 0.2.*
-
 ## PHP Versions

 This version will work on Hyperf version 2.2 and above.
--- a/VERSION_TRACKER.txt
+++ b/VERSION_TRACKER.txt
@@ -0,0 +1 @@
+0.2.7
--- a/composer.json
+++ b/composer.json
@@ -15,54 +15,50 @@
    }
  ],
  "require": {
-    "php": "^7.4|^8.0",
+    "php": "~8.0",
    "ext-redis": "^5.3",
    "ext-swoole": "*",
    "composer/composer": ">=2.0",
    "ergebnis/http-method": "^2.2",
-    "hyperf/config": "^2.2",
-    "hyperf/constants": "^2.2",
-    "hyperf/context": "^2.2",
-    "hyperf/database": "^2.2",
-    "hyperf/di": "^2.2",
-    "hyperf/framework": "^2.2",
-    "hyperf/http-server": "^2.2",
-    "hyperf/logger": "^2.2",
-    "hyperf/redis": "^2.2",
-    "hyperf/translation": "^2.2",
+    "hyperf/config": "3.0.*",
+    "hyperf/constants": "3.0.*",
+    "hyperf/context": "3.0.*",
+    "hyperf/database": "3.0.*",
+    "hyperf/di": "3.0.*",
+    "hyperf/framework": "3.0.*",
+    "hyperf/http-server": "3.0.*",
+    "hyperf/logger": "3.0.*",
+    "hyperf/redis": "3.0.*",
+    "hyperf/resource": "3.0.*",
+    "hyperf/translation": "3.0.*",
    "jetbrains/phpstorm-attributes": "^1.0",
    "lmc/http-constants": "^1.2",
-    "myclabs/php-enum": "^1.8.4",
-    "roave/dont": "^1.1",
-    "symfony/polyfill-php81": "^1.27",
+    "myclabs/php-enum": "^1.8",
+    "roave/dont": "^1.5",
+    "symfony/polyfill-php81": "^1.26",
    "teapot/status-code": "^1.1"
  },
  "require-dev": {
    "alibabacloud/dysmsapi-20170525": "^2.0",
-    "firebase/php-jwt": "^6.3",
+    "firebase/php-jwt": "^6.1",
    "friendsofphp/php-cs-fixer": "^3.13",
    "guzzlehttp/guzzle": "^7.5",
-    "hyperf/crontab": "<=3.0.9 || >3.0.13 <3.1",
-    "hyperf/session": "^2.2",
-    "hyperf/validation": "^2.2",
+    "hyperf/session": "3.0.*",
+    "hyperf/validation": "3.0.*",
    "pestphp/pest": "^1.22",
    "phpstan/phpstan": "^1.9",
    "phpunit/phpunit": "^9.5",
    "roave/security-advisories": "dev-latest",
+    "spatie/pest-plugin-test-time": "^1.1",
    "swoole/ide-helper": "*",
-    "symfony/mailer": "^5.4"
+    "symfony/mailer": "^6.0"
  },
  "suggest": {
-    "hyperf/resource": "If you need",
    "firebase/php-jwt": "JWT 鉴权必需",
    "hyperf/session": "Session 鉴权必需",
    "symfony/mailer": "用于发送电子邮件",
    "guzzlehttp/guzzle": "需要发起 http 请求时必需",
-    "alibabacloud/dysmsapi-20170525": "阿里云短信服务必需",
-    "laminas/laminas-text": "用于cli展示表格和大字",
-    "gevman/interactive-cli": "用于提供漂亮的交互式命令行",
-    "clue/stdio-react": "一个基于 reactphp 的交互式命令行",
-    "brainmaestro/composer-git-hooks": "用于 php 项目的 git-hooks"
+    "alibabacloud/dysmsapi-20170525": "阿里云短信服务必需"
  },
  "config": {
    "optimize-autoloader": true,
@@ -114,5 +110,5 @@
      "url": "https://repo.huaweicloud.com/repository/php/"
    }
  },
-  "version": "0.1.9"
+  "version": "0.2.7"
 }
--- a/composer.lock
+++ b/composer.lock
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -6,6 +6,4 @@ parameters:
        - tests
    ignoreErrors:
        - '#Constant BASE_PATH not found#'
-        - '#Property [a-zA-Z0-9\\_]+::\$[a-zA-Z0-9]+ is never written, only read.#'
-        - '#Method [a-zA-Z0-9\\_]+::[a-zA-Z0-9_]+\(\) has parameter \$[a-zA-Z0-9_]+ with no value type specified in iterable type array.#'
-        - '#Method [a-zA-Z0-9\\_]+::[a-zA-Z0-9_]+\(\) has parameter \$[a-zA-Z0-9_]+ with no type specified.#'
+        - '#Property [a-zA-Z0-9\\_]+::\$[a-zA-Z0-9]+ is never written, only read.#'
--- a/publish/common.php
+++ b/publish/common.php
@@ -68,7 +68,7 @@ return [
            'aliyun' => [
                'access_key_id' => env('ACCESS_KEY_ID', ''),
                'access_key_secret' => env('ACCESS_KEY_SECRET', ''),
-                'sign' => '',  // 短信签名名称
+                'sign_name' => '',  // 短信签名名称
                'template_code' => '', // 短信模板CODE
            ],
        ],
@@ -76,6 +76,8 @@ return [
            'oss' => [
                'access_key_id' => env('ACCESS_KEY_ID', ''),
                'access_key_secret' => env('ACCESS_KEY_SECRET', ''),
+                'oss_host' => env('OSS_HOST', ''),
+                'oss_callback' => env('OSS_CALLBACK'), // 可选
            ],
        ],
    ],
--- a/scripts/build-image.sh
+++ b/scripts/build-image.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+docker login harbor.luxcreo.cn -u php -p fTr6oVvqqdzVlYgnZhRPPAP54u7SmqGA
+
+image_name=harbor.luxcreo.cn/php/composer-template
+docker build --tag $image_name .
+
+#docker push $image_name
+#docker push ${image_name}-dev
--- a/scripts/docker-env.sh
+++ b/scripts/docker-env.sh
@@ -6,4 +6,4 @@ docker run \
    -w "/srv/www" \
    -v "$(pwd)":/srv/www \
    -v ~/.ssh:/root/.ssh \
-   harbor.luxcreo.cn/library/hyperf:7.4-swoole /bin/ash
+   harbor.luxcreo.cn/library/hyperf:8.0-swoole /bin/ash
--- a/src/Constants/CommonErrorCode.php
+++ b/src/Constants/CommonErrorCode.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * CommonErrorCode.php@hyperf-development-kit
 *
@@ -13,382 +14,307 @@ use Hyperf\Constants\AbstractConstants;
 use Hyperf\Constants\Annotation\Constants;

 /**
- * @Constants
 * Singularity\HyperfDevelopmentKit\Utils\Constants\CommonErrorCode@hyperf-development-kit
 *
 * @author 李东云<dongyun.li@luxcreo.cn>
 * Powered by PhpStorm
 * Created on 2022/4/25
+ *
+ * @see https://lux-software.yuque.com/htnx76/vcm2oc/pkzgpv
 */
+#[Constants]
 class CommonErrorCode extends AbstractConstants
 {
    // =============== 9 服务器异常 =================
-
    /**
     * @Message("common_error.server_common_error")
     */
    public const SERVER_ERROR = 9000000;
-
    /**
     * @Message("common_error.program.default")
     */
    public const PROGRAM_ERROR = 9000000;
-
    // 901 逻辑错误
-
    /**
     * @Message("common_error.program.syntax.default")
     */
    public const PROGRAM_SYNTAX_ERROR = 9010001;
-
    // 902 SQL 错误
-
    /**
     * @Message("common_error.program.sql.default")
     */
    public const PROGRAM_SQL_ERROR = 9020001;
-
    /**
     * @Message("common_error.program.sql.update")
     */
    public const PROGRAM_SQL_UPDATE_ERROR = 9020101;
-
    // 90201 字段不存在
-
    /**
     * @Message("common_error.program.sql.column_not_found")
     */
    public const PROGRAM_SQL_COLUMN_NOT_FOUND = 9020101;
-
    /**
     * @Message("common_error.program.sql.insert")
     */
    public const PROGRAM_SQL_INSERT_ERROR = 9020201;
-
    // =============== 1 请求错误 =================
    // 101 请求方式有误
-
    /**
     * @Message("common_error.params.method.default")
     */
    public const REQUEST_METHOD_ERROR = 1010001;
-
    // 102 参数非法
-
    /**
     * 参数非法.
     * @Message("common_error.params.format_error")
     */
    public const FORMATTER_ERROR = 1020001;
-
    /**
     * 缺少参数.
     * @Message("common_error.params.error.default")
     */
    public const REQUEST_PARAMS_MISS = 1020002;
-
    /**
     * 签名非法.
     * @Message("common_error.params.error.default")
     */
    public const REQUEST_SIGN_ERROR = 1020003;
-
-
    // 103 参数错误
-
    /**
     * @Message("common_error.params.error.default")
     */
    public const REQUEST_PARAMS_ERROR = 1030001;
-
    // 10301 用户信息错误
    /**
     * @Message("common_error.params.error.user.default")
     */
    public const REQUEST_PARAMS_ERROR_USER = 1030101;
-
    /**
     * @Message("common_error.params.error.user.sign_up.default")
     */
    public const REQUEST_PARAMS_ERROR_USER_REGISTERED = 1030102;
-
    /**
     * @Message("common_error.params.error.user.username.unique")
     */
    public const REQUEST_PARAMS_ERROR_USER_USERNAME_UNIQUE = 1030111;
-
    /**
     * @Message("common_error.params.error.user.sec_phone.unique")
     */
    public const REQUEST_PARAMS_ERROR_USER_SEC_PHONE_UNIQUE = 1030121;
-
    /**
     * @Message("common_error.params.error.user.sec_phone.required")
     */
    public const REQUEST_PARAMS_ERROR_USER_SEC_PHONE_REQUIRED = 1030122;
-
    /**
     * @Message("common_error.params.error.user.sec_phone.undefined")
     */
    public const REQUEST_PARAMS_ERROR_USER_SEC_PHONE_UNDEFINED = 1030123;
-
    /**
     * @Message("common_error.params.error.user.sec_email.unique")
     */
    public const REQUEST_PARAMS_ERROR_USER_SEC_EMAIL_UNIQUE = 1030131;
-
    /**
     * @Message("common_error.params.error.user.sec_email.required")
     */
    public const REQUEST_PARAMS_ERROR_USER_SEC_EMAIL_REQUIRED = 1030132;
-
    /**
     * @Message("common_error.params.error.user.sec_email.undefined")
     */
    public const REQUEST_PARAMS_ERROR_USER_SEC_EMAIL_UNDEFINED = 1030133;
-
    /**
     * @Message("common_error.params.error.user.action.error")
     */
    public const REQUEST_PARAMS_ERROR_USER_ACTION_ERROR = 1030141;
-
    // 10302 验证码错误
    /**
     * @Message("common_error.params.error.code.error")
     */
    public const REQUEST_PARAMS_ERROR_CODE_ERROR = 1030201;
-
    /**
     * @Message("common_error.params.error.code.timeout")
     */
    public const REQUEST_PARAMS_ERROR_CODE_TIMEOUT = 1030202;
-
    /**
     * @Message("common_error.params.error.code.limit.minute")
     */
    public const REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_MINUTE = 1030301;
-
    /**
     * @Message("common_error.params.error.code.limit.hour")
     */
    public const REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_HOUR = 1030302;
-
    /**
     * @Message("common_error.params.error.code.limit.day")
     */
    public const REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_DAY = 1030303;
-
    /**
     * @Message("common_error.params.error.target.format")
     */
    public const REQUEST_PARAMS_ERROR_TARGET_FORMAT = 1030401;
-
    /**
     * @Message("common_error.params.error.target.missing")
     */
    public const REQUEST_PARAMS_ERROR_TARGET_MISSING = 1030402;
-
    // =============== 2 鉴权问题 =================
    // 201 JWT 鉴权失败
-
    /**
     * @Message("common_error.auth.default")
     */
    public const UNAUTHORIZED = 200000;
-
    /**
     * @Message("common_error.auth.jwt.default")
     */
    public const AUTH_JWT_ERROR = 201000;
-
    // 20101 验证
-
    /**
     * @Message("common_error.auth.jwt.iat")
     */
    public const AUTH_JWT_IAT_ERROR = 2010101;
-
    /**
     * @Message("common_error.auth.jwt.nbf")
     */
    public const AUTH_JWT_NBF_ERROR = 2010102;
-
    /**
     * @Message("common_error.auth.jwt.exp")
     */
    public const AUTH_JWT_EXP_TIMEOUT = 2010103;
-
    /**
     * @Message("common_error.auth.jwt.iss")
     */
    public const AUTH_JWT_ISS_ERROR = 2010104;
-
    /**
     * @Message("common_error.auth.jwt.uid")
     */
    public const AUTH_JWT_UID_ERROR = 2010105;
-
    // 202 Session 鉴权
    /**
     * @Message("common_error.auth.session.default")
     */
    public const AUTH_SESSION_ERROR = 202000;
-
    // 20201 验证
    /**
     * @Message("common_error.auth.session.uid")
     */
    public const AUTH_SESSION_UID_ERROR = 2020101;
-
    /**
     * @Message("common_error.auth.session.created_at")
     */
    public const AUTH_SESSION_CREATED_AT_ERROR = 2020102;
-
-
    // 203 SAML 鉴权
    /**
     * @Message("common_error.auth.saml.default")
     */
    public const AUTH_SAML_ERROR = 203000;
-
    // 20301 验证
    /**
     * @Message("common_error.auth.saml.params.default")
     */
    public const AUTH_SAML_REQUEST_PARAMS_ERROR = 2030100;
-
    /**
     * @Message("common_error.auth.saml.params.saml_request")
     */
    public const AUTH_SAML_REQUEST_PARAMS_SAML_REQUEST = 2030101;
-
-
    // 204 无权访问
-
    /**
     * @Message("common_error.auth.forbidden.default")
     */
    public const FORBIDDEN = 204000;
-
    // 20401 无权访问
    /**
     * @Message("common_error.auth.forbidden.read.default")
     */
    public const FORBIDDEN_READ_ERROR = 2040101;
-
    // 20402 无权修改
    /**
     * @Message("common_error.auth.forbidden.update.default")
     */
    public const FORBIDDEN_UPDATE_ERROR = 2040201;
-
    /**
     * @Message("common_error.auth.forbidden.update.address.unique")
     */
    public const FORBIDDEN_UPDATE_ADDRESS_DEFAULT_UNIQUE_ERROR = 2040211;
-
    // 20403 无权创建
    /**
     * @Message("common_error.auth.forbidden.create.default")
     */
    public const FORBIDDEN_CREATE_ERROR = 2040301;
-
    /**
     * @Message("common_error.auth.forbidden.create.wechat.redundant")
     */
    public const FORBIDDEN_CREATE_WECHAT_REDUNDANT_ERROR = 2040311;
-
    // 20404 无权删除
    /**
     * @Message("common_error.auth.forbidden.delete.default")
     */
    public const FORBIDDEN_DELETE_ERROR = 2040401;
-
    /**
     * @Message("common_error.auth.forbidden.delete.wechat.only")
     */
    public const FORBIDDEN_DELETE_ONLY_USERNAME_WITH_WECHAT = 2040411;
-
    // 205 App 鉴权
    /**
     * @Message("common_error.auth.app.default")
     */
    public const AUTH_APP_ERROR = 205000;
-
    // ============== 3 依赖服务出错 ===============
    // 303 缓存异常
    // 30301 Redis 异常
-
    /**
     * @Message("common_error.server.cache.redis.default")
     */
    public const SERVER_CACHE_REDIS_ERROR = 3030101;
-
    /**
     * @Message("common_error.server.cache.redis.refused")
     */
    public const SERVER_CACHE_REDIS_REFUSED_ERROR = 3030110;
-
    // 30302 SMS 异常
    /**
     * @Message("common_error.server.dependency_sms_common_error")
     */
    public const SERVER_DEPENDENCY_SMS_ERROR = 3030201;
-
    // 30303 微信错误
    /**
     * @Message("common_error.server.dependency.wechat.default")
     */
    public const SERVER_DEPENDENCY_WECHAT_ERROR = 3030301;
-
    /**
     * @Message("common_error.server.dependency.wechat.code")
     */
    public const SERVER_DEPENDENCY_WECHAT_CODE_ERROR = 3030302;
-
    /**
     * @Message("common_error.server.dependency.wechat.timeout")
     */
    public const SERVER_DEPENDENCY_WECHAT_CODE_TIMEOUT_ERROR = 3030311;
-
    // 306 消息异常
    // 30601 自建邮箱发件服务异常
    /**
     * @Message("common_error.server.message.email.default")
     */
    public const SERVER_MESSAGE_EMAIL_ERROR = 3060101;
-
    /**
     * @Message("common_error.server.message.email.not_found")
     */
    public const SERVER_MESSAGE_EMAIL_NOT_FOUND = 3060102;
-
    // =============== 4 资源不存在 ================
    // 401 路由不存在
    /**
     * @Message("common_error.not_found.route.default")
     */
    public const ROUTE_NOT_FOUND = 4010001;
-
    // 402 模型不存在
    /**
     * @Message("common_error.model.not_found")
     */
    public const MODEL_NOT_FOUND = 4020001;
-
    // 40201 用户不存在
    /**
     * @Message("common_error.model.user.default")
     * @note ！！！这个码一定不要改，前端根据这个做判断了！！！！
     */
    public const USER_NOT_FOUND = 4020101;
-
    /**
     * @Message("common_error.model.user.not_valid")
     */
    public const USER_NOT_VALID = 4020102;
-
    /**
     * @Message("common_error.model.document.default")
     */
--- a/src/Controller/AbstractController.php
+++ b/src/Controller/AbstractController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * AbstractController.php@hyperf-development-kit
 *
@@ -16,6 +17,7 @@ use Dont\DontDeserialise;
 use Dont\DontGet;
 use Dont\DontSerialise;
 use Dont\DontSet;
+use Dont\DontToString;
 use Hyperf\Contract\ContainerInterface;
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Di\Annotation\Inject;
@@ -39,28 +41,17 @@ abstract class AbstractController
    use DontClone;
    use DontSerialise;
    use DontDeserialise;
+    use DontToString;

-    /**
-     * @Inject
-     * @var ContainerInterface
-     */
+    #[Inject]
    protected ContainerInterface $container;

-    /**
-     * @Inject
-     * @var RequestInterface
-     */
+    #[Inject]
    protected RequestInterface $request;

-    /**
-     * @Inject
-     * @var ResponseInterface
-     */
+    #[Inject]
    protected ResponseInterface $response;

-    /**
-     * @Inject
-     * @var \Hyperf\Contract\StdoutLoggerInterface
-     */
+    #[Inject]
    protected StdoutLoggerInterface $stdoutLogger;
 }
--- a/src/Events/EmailWillSent.php
+++ b/src/Events/EmailWillSent.php
@@ -9,8 +9,6 @@

 namespace Singularity\HDK\Core\Events;

-use Singularity\HDK\Core\Service\EmailService;
-
 /**
 * Singularity\HDK\Core\Events\EmailWillSent@HDK-Core
 *
@@ -22,64 +20,31 @@ use Singularity\HDK\Core\Service\EmailService;
 */
 class EmailWillSent
 {
-    /**
-     * @var string|string[] $target
-     */
-    public $target;
-
-    /**
-     * @var non-empty-string $subject
-     */
-    public string $subject;
-
-
-    /**
-     * @var non-empty-string $content
-     */
-    public string $content;
-
-    /**
-     * @var string[] $cc
-     */
-    public array $cc = [];
-
-    /**
-     * @var string[] $bcc
-     */
-    public array $bcc = [];
-
-    /**
-     * @var string 'text'|'html' $type
-     */
-    public string $type = 'text';
-
-    /**
-     * @var EmailService|null
-     */
-    public ?EmailService $sender;
-
-
    public function __construct(
        /**
-         * @phpstan-param string|string[] $target
+         * @var string|string[] $target
         */
-        $target,
-        string $subject,
-        string $content,
+        public string|array $target,
+
        /**
-         * @var non-empty-string[] $cc
+         * @var non-empty-string $subject
         */
-        array $cc = [],
-        string $type = 'text',
-        array $bcc = [],
-        ?EmailService $sender = null
+        public string $subject,
+
+        /**
+         * @var non-empty-string $content
+         */
+        public string $content,
+
+        /**
+         * @var string[] $cc
+         */
+        public array $cc = [],
+
+        /**
+         * @var 'text'|'html' $type
+         */
+        public string $type = 'text'
    ) {
-        $this->type = $type;
-        $this->cc = $cc;
-        $this->content = $content;
-        $this->subject = $subject;
-        $this->target = $target;
-        $this->bcc = $bcc;
-        $this->sender = $sender;
    }
 }
--- a/src/Events/SmsWillSent.php
+++ b/src/Events/SmsWillSent.php
@@ -20,29 +20,6 @@ namespace Singularity\HDK\Core\Events;
 */
 class SmsWillSent
 {
-    /**
-     * @var non-empty-string $phone 目标手机号
-     * @example +8613700000001
-     * @example 8613700000001
-     * @example 13700000001
-     */
-    public string $phone;
-
-    /**
-     * @var array<literal-string, literal-string|int>|null $templateParam 模板变量
-     */
-    public ?array $templateParam = null;
-
-    /**
-     * @var literal-string|null $templateCode 模板代码
-     */
-    public ?string $templateCode = null;
-
-    /**
-     * @var literal-string|null $signName 模板签名
-     */
-    public ?string $signName = null;
-
    public function __construct(
        /**
         * @var non-empty-string $phone 目标手机号
@@ -50,26 +27,22 @@ class SmsWillSent
         * @example 8613700000001
         * @example 13700000001
         */
-        string $phone,
+        public string $phone,

        /**
         * @var array<literal-string, literal-string|int>|null $templateParam 模板变量
         */
-        ?array $templateParam = null,
+        public ?array $templateParam = null,

        /**
         * @var literal-string|null $templateCode 模板代码
         */
-        ?string $templateCode = null,
+        public ?string $templateCode = null,

        /**
         * @var literal-string|null $signName 模板签名
         */
-        ?string $signName = null
+        public ?string $signName = null,
    ) {
-        $this->signName = $signName;
-        $this->templateCode = $templateCode;
-        $this->templateParam = $templateParam;
-        $this->phone = $phone;
    }
 }
--- a/src/Exceptions/DbException.php
+++ b/src/Exceptions/DbException.php
@@ -12,17 +12,14 @@ use Throwable;
 */
 class DbException extends HttpException
 {
-    public string $sql;
-
    public function __construct(
        int $code = CommonErrorCode::PROGRAM_SQL_ERROR,
        ?string $message = null,
-        string $sql = '',
+        public string $sql = '',
        Throwable $previous = null
    ) {
-        $this->sql = $sql;
        if ($code == CommonErrorCode::FORBIDDEN) {
-            $previous_code = empty($previous) ? null : $previous->getCode();
+            $previous_code = $previous?->getCode();
            $code = empty($previous_code) ? $code : $previous_code;
        }
        parent::__construct(
--- a/src/Exceptions/Forbidden.php
+++ b/src/Exceptions/Forbidden.php
@@ -18,7 +18,7 @@ class Forbidden extends HttpException
        Throwable $previous = null
    ) {
        if ($code == CommonErrorCode::FORBIDDEN) {
-            $previous_code = empty($previous) ? null : $previous->getCode();
+            $previous_code = $previous?->getCode();
            $code = empty($previous_code) ? $code : $previous_code;
        }
        parent::__construct(
--- a/src/Exceptions/Handler/CommonHandler.php
+++ b/src/Exceptions/Handler/CommonHandler.php
@@ -45,154 +45,86 @@ use Throwable;
 class CommonHandler extends ExceptionHandler
 {
    /**
-     * @Inject(required=false)
     *
     * @var RequestInterface|null
     */
+    #[Inject(required: false)]
    private ?RequestInterface $request;
-
    /**
-     * @Inject
     * @var StdoutLogger
     */
+    #[Inject]
    private StdoutLogger $logger;
-
    /**
     * {@inheritDoc}
     */
-    public function handle(
-        Throwable $throwable,
-        ResponseInterface $response
-    ): ResponseInterface {
+    public function handle(Throwable $throwable, ResponseInterface $response): ResponseInterface
+    {
        // 阻止异常冒泡
        $this->stopPropagation();
-
        $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;
-
-        $error_type = get_class($throwable);
+        $this->request?->url();
+        $is_debug = $this->request?->hasHeader('Postman-Token') || str_starts_with($this->request?->header('User-Agent'), 'apifox');
+        $error_type = $throwable::class;
        $request_time = date('Y-m-d H:i:s');
-
-        if (!empty($this->request)) {
-            $this->request->url();
-
-            $is_debug = $this->request->hasHeader('Postman-Token')
-                || str_starts_with($this->request->header('User-Agent', ''), 'apifox');
-
-            $request_data = Json::encode($this->request->getParsedBody());
-            $request_headers = Json::encode($this->request->getHeaders());
-        } else {
-            $is_debug = false;
-            $request_data = null;
-            $request_headers = null;
-        }
-
-
-
-
+        $request_data = Json::encode($this->request?->getParsedBody());
+        $request_headers = Json::encode($this->request?->getHeaders());
        // 901 程序语法错误
-
        // 902 SQL 语法错误
        if ($throwable instanceof QueryException) {
-            if ($throwable->getCode() === '42S22') {
-                $code = CommonErrorCode::PROGRAM_SQL_COLUMN_NOT_FOUND;
-            } else {
-                $code = CommonErrorCode::PROGRAM_SQL_ERROR;
-            }
-
-            $data = [
-                $code_name => $code,
-                $message_name => CommonErrorCode::getMessage(
-                    $is_testing
-                        ? $code
-                        : CommonErrorCode::PROGRAM_SQL_ERROR
-                ),
-            ];
+            $code = match ($throwable->getCode()) {
+                '42S22' => CommonErrorCode::PROGRAM_SQL_COLUMN_NOT_FOUND,
+                default => CommonErrorCode::PROGRAM_SQL_ERROR,
+            };
+            $data = [$code_name => $code, $message_name => CommonErrorCode::getMessage($is_testing ? $code : CommonErrorCode::PROGRAM_SQL_ERROR)];
            if ($is_testing) {
-                $data['details'] = [
-                    'sql' => $throwable->getSql(),
-                    'error' => $throwable->getMessage(),
-                ];
+                $data['details'] = ['sql' => $throwable->getSql(), 'error' => $throwable->getMessage()];
            }
        }
-
        // 101 请求方式错误
        if ($throwable instanceof MethodNotAllowedHttpException) {
            $message = explode(': ', $throwable->getMessage());
            $allow_method = explode(', ', $message[1]);
            $code = CommonErrorCode::REQUEST_METHOD_ERROR;
-            $data = [
-                $code_name => $code,
-                $message_name => CommonErrorCode::getMessage($code, [
-                    'methods' => join(', ', $allow_method),
-                ]),
-                'currentMethod' => empty($this->request) ? null : $this->request->getMethod(),
-                'allowedMethod' => $allow_method,
-            ];
+            $data = [$code_name => $code, $message_name => CommonErrorCode::getMessage($code, ['methods' => join(', ', $allow_method)]), 'currentMethod' => $this->request?->getMethod(), 'allowedMethod' => $allow_method];
        }
-
        // 验证失败
        if ($throwable instanceof BadRequestHttpException) {
-            $data = [
-                $code_name => CommonErrorCode::REQUEST_PARAMS_ERROR,
-                $message_name => $is_testing
-                    ? $throwable->getMessage()
-                    : CommonErrorCode::getMessage(CommonErrorCode::SERVER_ERROR),
-            ];
+            $data = [$code_name => CommonErrorCode::REQUEST_PARAMS_ERROR, $message_name => $is_testing ? $throwable->getMessage() : CommonErrorCode::getMessage(CommonErrorCode::SERVER_ERROR)];
        }
-
        if ($throwable instanceof ValidationException) {
            $data = $throwable->validator->errors()->first();
-
            if (is_numeric($data)) {
-                $code = (int)$data;
+                $code = (int) $data;
                $data = CommonErrorCode::getMessage($code);
            }
-            $data = [
-                $code_name => $code ?? CommonErrorCode::REQUEST_PARAMS_ERROR,
-                $message_name => $data,
-            ];
+            $data = [$code_name => $code ?? CommonErrorCode::REQUEST_PARAMS_ERROR, $message_name => $data];
        }
        if ($throwable instanceof ValidateException) {
            $code = $throwable->getCode();
            $message = $throwable->getMessage();
-            $data = [
-                $code_name => $code,
-                $message_name => empty($message) ? CommonErrorCode::getMessage($code, [
-                    'param' => $throwable->getFieldName(),
-                ]) : $message,
-            ];
+            $data = [$code_name => $code, $message_name => empty($message) ? CommonErrorCode::getMessage($code, ['param' => $throwable->getFieldName()]) : $message];
            if ($is_debug) {
                $data['currentValue'] = $throwable->getCurrentValue();
                $data['availableValue'] = $throwable->getAvailableValue();
            }
        }
-
        // 路由不存在
        if ($throwable instanceof NotFoundHttpException) {
            $code = CommonErrorCode::ROUTE_NOT_FOUND;
-            $data = [
-                $code_name => $code,
-                $message_name => CommonErrorCode::getMessage($code),
-            ];
+            $data = [$code_name => $code, $message_name => CommonErrorCode::getMessage($code)];
            $status_code = 404;
        }
        // 模型不存在
        if ($throwable instanceof ModelNotFoundException) {
            $code = empty($throwable->getCode()) ? CommonErrorCode::MODEL_NOT_FOUND : $throwable->getCode();
-            $message = empty($throwable->getCode()) ? CommonErrorCode::getMessage($code, [
-                'resource' => '资源',
-            ]) : $throwable->getMessage();
-            $data = [
-                $code_name => $code,
-                $message_name => $message,
-            ];
+            $message = empty($throwable->getCode()) ? CommonErrorCode::getMessage($code, ['resource' => '资源']) : $throwable->getMessage();
+            $data = [$code_name => $code, $message_name => $message];
            $status_code = 404;
        }
-
        // 300 服务出错
        // 303 缓存异常
        if ($throwable instanceof RedisException) {
@@ -200,16 +132,8 @@ class CommonHandler extends ExceptionHandler
            if ($throwable->getMessage() === 'Connection refused') {
                $code = CommonErrorCode::SERVER_CACHE_REDIS_REFUSED_ERROR;
            }
-            $data = [
-                $code_name => $code,
-                $message_name => CommonErrorCode::getMessage(
-                    $is_testing
-                        ? $code
-                        : CommonErrorCode::SERVER_CACHE_REDIS_ERROR
-                ),
-            ];
+            $data = [$code_name => $code, $message_name => CommonErrorCode::getMessage($is_testing ? $code : CommonErrorCode::SERVER_CACHE_REDIS_ERROR)];
        }
-
        // 306 消息异常
        // 30601 邮箱发件异常
        if ($throwable instanceof TransportException) {
@@ -217,75 +141,46 @@ class CommonHandler extends ExceptionHandler
            if (strpos($throwable->getMessage(), '500 Error: bad syntax')) {
                $code = CommonErrorCode::SERVER_MESSAGE_EMAIL_NOT_FOUND;
            }
-            $data = [
-                $code_name => $code,
-                $message_name => CommonErrorCode::getMessage(
-                    $is_testing
-                        ? $code
-                        : CommonErrorCode::SERVER_MESSAGE_EMAIL_ERROR
-                ),
-            ];
+            $data = [$code_name => $code, $message_name => CommonErrorCode::getMessage($is_testing ? $code : CommonErrorCode::SERVER_MESSAGE_EMAIL_ERROR)];
        }
-
        if (empty($data)) {
            // 其他情况
-            $data = [
-                $code_name => $is_testing
-                    ? ($throwable->getCode() == 0
-                        ? CommonErrorCode::SERVER_ERROR
-                        : $throwable->getCode())
-                    : CommonErrorCode::SERVER_ERROR,
-                $message_name => $is_testing ? $throwable->getMessage() : __(
-                    CommonErrorCode::getMessage(CommonErrorCode::SERVER_ERROR)
-                ),
-            ];
-
+            $data = [$code_name => $is_testing ? $throwable->getCode() == 0 ? CommonErrorCode::SERVER_ERROR : $throwable->getCode() : CommonErrorCode::SERVER_ERROR, $message_name => $is_testing ? $throwable->getMessage() : __(CommonErrorCode::getMessage(CommonErrorCode::SERVER_ERROR))];
            // 其他错误
            if ($throwable instanceof HttpException) {
-                $data = [
-                    $code_name => $throwable->getCode() ?: $throwable->getStatusCode(),
-                    $message_name => $throwable->getMessage(),
-                ];
+                $data = [$code_name => $throwable->getCode() ?: $throwable->getStatusCode(), $message_name => $throwable->getMessage()];
            }
        }
-
-        $response = $response->withHeader(
-            Header::CONTENT_TYPE,
-            'application/json; charset=utf-8'
-        );
-
+        $response = $response->withHeader(Header::CONTENT_TYPE, 'application/json; charset=utf-8');
        if ($is_debug && $is_testing) {
-            $data['trace'] = [
-                'errorType' => $error_type,
-                'errorTrack' => $throwable->getTrace(),
-            ];
+            $data += ['errorType' => $error_type, 'errorTrack' => $throwable->getTrace()];
        }
-        $cookies = Json::encode($this->request->getCookieParams());
+        $cookies = json_encode($this->request->getCookieParams(), JSON_UNESCAPED_UNICODE);
        $this->logger->error(
            <<<ERROR_LOG
-TYPE: $error_type
-[$data[$code_name]] $data[$message_name]
+TYPE: {$error_type}
+[{$data[$code_name]}] {$data[$message_name]}
 {$throwable->getMessage()}
 -------------------------------
-REQUEST_TIME: $request_time
+REQUEST_TIME: {$request_time}
 -------------------------------
 REQUEST_HEADERS:
-$request_headers
+{$request_headers}
 -------------------------------
 REQUEST_COOKIES:
-$cookies
+{$cookies}
 -------------------------------
 REQUEST_METHOD:
-{$this->request->getMethod()}
+{$this->request?->getMethod()}
 -------------------------------
 REQUEST_URL:
-{$this->request->getUri()}
+{$this->request?->getUri()}
 -------------------------------
 REQUEST_QUERY:
-{$this->request->getQueryString()}
+{$this->request?->getQueryString()}
 -------------------------------
 REQUEST_DATA:
-$request_data
+{$request_data}
 -------------------------------
 TRACE:
 {$throwable->getTraceAsString()}
@@ -294,21 +189,11 @@ TRACE:
 ERROR_LOG
        );
        $data = Json::encode($data);
-
        if ($restful) {
-            $response = $response->withStatus(
-                $status_code ??
-                $throwable->status ??
-                $throwable->statusCode ??
-                RFC7231::INTERNAL_SERVER_ERROR
-            );
+            $response = $response->withStatus($status_code ?? $throwable->status ?? $throwable->statusCode ?? RFC7231::INTERNAL_SERVER_ERROR);
        }
-        return $response
-            ->withBody(
-                new SwooleStream($data)
-            );
+        return $response->withBody(new SwooleStream($data));
    }
-
    /**
     * 判断该异常处理器是否要对该异常进行处理.
     */
--- a/src/Exceptions/Unauthorized.php
+++ b/src/Exceptions/Unauthorized.php
@@ -13,17 +13,13 @@ use Throwable;
 */
 class Unauthorized extends HttpException
 {
-    /** @var string $authenticationType */
-    private string $authenticationType;
-
    public function __construct(
        int $code = CommonErrorCode::UNAUTHORIZED,
        Throwable $previous = null,
-        string $authenticationType = RFC7616::DIGEST
+        private string $authenticationType = RFC7616::DIGEST
    ) {
-        $this->authenticationType = $authenticationType;
        if ($code == CommonErrorCode::UNAUTHORIZED) {
-            $previous_code = empty($previous) ? null : $previous->getCode();
+            $previous_code = $previous?->getCode();
            $code = empty($previous_code) ? $code : $previous_code;
        }

--- a/src/Exceptions/ValidateException.php
+++ b/src/Exceptions/ValidateException.php
@@ -12,15 +12,6 @@ use Throwable;
 */
 class ValidateException extends HttpException
 {
-    /** @var string $field */
-    private $field;
-
-    /** @var mixed $currentValue */
-    private $currentValue;
-
-    /** @var array<int, mixed> $availableValue */
-    private $availableValue;
-
    /**
     * @param int $code
     * @param string|null $message
@@ -32,16 +23,13 @@ class ValidateException extends HttpException
    public function __construct(
        int $code = CommonErrorCode::FORMATTER_ERROR,
        ?string $message = null,
-        string $field = '',
-        $currentValue = null,
-        array $availableValue = [],
+        private string $field = '',
+        private mixed $currentValue = null,
+        private array $availableValue = [],
        Throwable $previous = null
    ) {
-        $this->availableValue = $availableValue;
-        $this->currentValue = $currentValue;
-        $this->field = $field;
        if ($code == CommonErrorCode::FORMATTER_ERROR) {
-            $previous_code = empty($previous) ? null : $previous->getCode();
+            $previous_code = $previous?->getCode();
            $code = empty($previous_code) ? $code : $previous_code;
        }
        parent::__construct(
@@ -66,7 +54,7 @@ class ValidateException extends HttpException
    /**
     * @return mixed
     */
-    public function getCurrentValue()
+    public function getCurrentValue(): mixed
    {
        return $this->currentValue;
    }
--- a/src/Listener/AbstractListener.php
+++ b/src/Listener/AbstractListener.php
@@ -13,18 +13,22 @@ use Hyperf\Contract\ContainerInterface;
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\Event\Contract\ListenerInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;

 abstract class AbstractListener implements ListenerInterface
 {
-    /**
-     * @var ContainerInterface
-     * @Inject()
-     */
+    #[Inject]
    protected ContainerInterface $container;

-    /**
-     * @var StdoutLoggerInterface
-     * @Inject()
-     */
    protected StdoutLoggerInterface $stdoutLogger;
+
+    /**
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    public function __construct()
+    {
+        $this->stdoutLogger = $this->container->get(StdoutLoggerInterface::class);
+    }
 }
--- a/src/Listener/EmailWillSentListener.php
+++ b/src/Listener/EmailWillSentListener.php
@@ -9,7 +9,11 @@

 namespace Singularity\HDK\Core\Listener;

+use Hyperf\Contract\ContainerInterface;
 use Hyperf\Contract\StdoutLoggerInterface;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\Event\Contract\ListenerInterface;
+use JetBrains\PhpStorm\NoReturn;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Singularity\HDK\Core\Constants\CommonErrorCode;
@@ -26,8 +30,11 @@ use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 *
 * @link ../../docs/Email.md
 */
-class EmailWillSentListener extends AbstractListener
+class EmailWillSentListener implements ListenerInterface
 {
+    #[Inject]
+    private ContainerInterface $container;
+
    /**
     * @inheritDoc
     */
@@ -39,33 +46,29 @@ class EmailWillSentListener extends AbstractListener
    }

    /**
-     * @param object $event
-     *
+     * @param EmailWillSent $event
     * @return void
     * @throws ContainerExceptionInterface
     * @throws NotFoundExceptionInterface
     */
+    #[NoReturn]
    public function process(object $event): void
    {
        $stdoutLogger = $this->container->get(StdoutLoggerInterface::class);
-
-        /** @var $event EmailWillSent */
-        $emailService = $event->sender ?? EmailService::make();
+        $emailService = $this->container->get(EmailService::class);
        try {
            $event->type === 'html'
                ? $emailService->sendHtml(
-                    $event->target,
-                    $event->subject,
-                    $event->content,
-                $event->cc,
-                $event->bcc,
+                    target: $event->target,
+                    subject: $event->subject,
+                    html: $event->content,
+                    cc: $event->cc
                )
                : $emailService->sendText(
-                    $event->target,
-                    $event->subject,
-                    $event->content,
-                $event->cc,
-                $event->bcc,
+                    target: $event->target,
+                    subject: $event->subject,
+                    text: $event->content,
+                    cc: $event->cc
                );

            $stdoutLogger->info('邮件发送成功！');
--- a/src/Listener/SmsWillSentListener.php
+++ b/src/Listener/SmsWillSentListener.php
@@ -45,10 +45,10 @@ class SmsWillSentListener extends AbstractListener
        $smsService = $this->container->get(SmsService::class);
        try {
            $smsService->sendSmsCountryside(
-                $event->phone,
-                $event->templateCode,
-                $event->templateParam,
-                $event->signName
+                phone: $event->phone,
+                templateCode: $event->templateCode,
+                templateParam: $event->templateParam,
+                signName: $event->signName
            );
        } catch (Throwable $throwable) {
            $code = $throwable->getCode();
--- a/src/Middleware/ClassicCoreMiddleware.php
+++ b/src/Middleware/ClassicCoreMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
 * ClassicCoreMiddleware.php@hyperf-development-kit
 *
@@ -9,13 +10,13 @@

 namespace Singularity\HDK\Core\Middleware;

+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 Hyperf\Utils\Contracts\Arrayable;
-use Hyperf\Utils\Contracts\Jsonable;
 use Lmc\HttpConstants\Header;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -30,31 +31,30 @@ use Singularity\HDK\Core\Service\UtilsService;
 */
 class ClassicCoreMiddleware extends CoreMiddleware
 {
-    /**
-     * @Inject()
-     * @var \Singularity\HDK\Core\Service\UtilsService
-     */
+    #[Inject]
    private UtilsService $utilsService;

    /**
     * Transfer the non-standard response content to a standard response object.
-     *
-     * @param null|array<string, mixed>|Arrayable<string, mixed>|Jsonable|string $response
+     * @template TKey of array-key
+     * @template TValue
+     * @param null|array<TKey, TValue>|Arrayable<TKey, TValue>|Jsonable|string $response
     */
    protected function transferToResponse($response, ServerRequestInterface $request): ResponseInterface
    {
        $code_name = config('common.response.code_name');
        $message_name = config('common.response.message_name');
        $data_name = config('common.response.data_name');
-
        // 分页数据
        if ($response instanceof LengthAwarePaginatorInterface) {
            $paginator = $response;
-            $fact_response = $this->response()->withHeader('Per-Page', (string)$paginator->perPage())
-                ->withHeader('Total', (string)$paginator->total())
-                ->withHeader('Current-Page', (string)$paginator->currentPage())
-                ->withHeader('Total-Pages', (string)$paginator->hasPages());
-
+            $fact_response = $this->response()->withHeader('Per-Page', (string)$paginator->perPage())->withHeader(
+                'Total',
+                (string)$paginator->total()
+            )->withHeader('Current-Page', (string)$paginator->currentPage())->withHeader(
+                'Total-Pages',
+                (string)$paginator->hasPages()
+            );
            $fact_response = $this->utilsService->extendLinkToHeader($fact_response, $paginator->nextPageUrl(), 'next');
            $fact_response = $this->utilsService->extendLinkToHeader(
                $fact_response,
@@ -67,11 +67,10 @@ class ClassicCoreMiddleware extends CoreMiddleware
                $paginator->previousPageUrl(),
                'prev'
            );
-            return $fact_response
-                ->withAddedHeader(Header::CONTENT_TYPE, 'application/json')
-                ->withBody(
-                    new SwooleStream(
-                        Json::encode([
+            return $fact_response->withAddedHeader(Header::CONTENT_TYPE, 'application/json')->withBody(
+                new SwooleStream(
+                    Json::encode(
+                        [
                            $code_name => 200,
                            $message_name => 'ok',
                            $data_name => $response->items(),
@@ -81,39 +80,28 @@ class ClassicCoreMiddleware extends CoreMiddleware
                                'perPage' => $paginator->perPage(),
                                'total' => $paginator->total(),
                            ],
-                        ])
+                        ]
                    )
-                );
+                )
+            );
        }
-        // 可 Json 化的数据结构
-        if ($response instanceof Jsonable && $response instanceof Arrayable) {
-            $response = [
-                $code_name => 200,
-                $message_name => 'ok',
-                $data_name => $response->toArray(),
-            ];
-            return $this->response()
-                ->withAddedHeader(Header::CONTENT_TYPE, 'application/json')
-                ->withBody(new SwooleStream(Json::encode($response)));
-        }
-
        // 普通数组
        if (is_array($response) || $response instanceof Arrayable) {
-            $response = [
-                $code_name => 200,
-                $message_name => 'ok',
-                $data_name => $response,
-            ];
-            return $this->response()
-                ->withAddedHeader(Header::CONTENT_TYPE, 'application/json')
-                ->withBody(new SwooleStream(Json::encode($response)));
-        }
-
-        // 其他默认按字符串处理
-        return $this->response()
-            ->withAddedHeader(Header::CONTENT_TYPE, 'text/plain')
-            ->withBody(
-                new SwooleStream((string)$response)
+            $response = [$code_name => 200, $message_name => 'ok', $data_name => $response];
+            return $this->response()->withAddedHeader(Header::CONTENT_TYPE, 'application/json')->withBody(
+                new SwooleStream(Json::encode($response))
            );
+        }
+        // 可 Json 化的数据结构
+        if ($response instanceof Jsonable) {
+            $response = [$code_name => 200, $message_name => 'ok', $data_name => Json::decode((string)$response)];
+            return $this->response()->withAddedHeader(Header::CONTENT_TYPE, 'application/json')->withBody(
+                new SwooleStream(Json::encode($response))
+            );
+        }
+        // 其他默认按字符串处理
+        return $this->response()->withAddedHeader(Header::CONTENT_TYPE, 'text/plain')->withBody(
+            new SwooleStream((string)$response)
+        );
    }
 }
--- a/src/Middleware/ExtendsMiddleware.php
+++ b/src/Middleware/ExtendsMiddleware.php
@@ -15,20 +15,16 @@ use Singularity\HDK\Core\Service\ExtendService;
 class ExtendsMiddleware implements MiddlewareInterface
 {
    /**
-     * @Inject
     * @var \Singularity\HDK\Core\Service\ExtendService
     */
+    #[Inject]
    private ExtendService $service;
-
    /**
     * @inheritDoc
     */
-    public function process(
-        ServerRequestInterface $request,
-        RequestHandlerInterface $handler
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
        $this->service->parse($request);
-
        return $handler->handle($request);
    }
 }
--- a/src/Middleware/InternationalizationMiddleware.php
+++ b/src/Middleware/InternationalizationMiddleware.php
@@ -22,11 +22,10 @@ use Psr\Http\Server\RequestHandlerInterface;
 class InternationalizationMiddleware implements MiddlewareInterface
 {
    /**
-     * @Inject
     * @var TranslatorInterface
     */
+    #[Inject]
    private TranslatorInterface $translator;
-
    /**
     * @inheritDoc
     */
@@ -35,23 +34,15 @@ class InternationalizationMiddleware implements MiddlewareInterface
        $response = Context::get(ResponseInterface::class);
        $language = $request->getHeaderLine('Accept-Language');
        if (!empty($language)) {
-            switch (true) {
-                case in_array(strtolower($language), ['en', 'en_us', 'en-us', 'en-uk', 'en_uk']):
-                    $language = 'en';
-                    break;
-                case in_array(strtolower($language), ['zh', 'zh_cn', 'zh-cn']):
-                    $language = 'zh_CN';
-                    break;
-                default:
-                    $language = config('translation.locale') ;
-                    break;
-            }
+            $language = match (strtolower($language)) {
+                'en', 'en_us', 'en-us', 'en-uk', 'en_uk' => 'en',
+                'zh', 'zh_cn', 'zh-cn' => 'zh_CN',
+                default => config('translation.locale'),
+            };
            $this->translator->setLocale($language);
-
            $response = $response->withAddedHeader('Content-Language', strtr($this->translator->getLocale(), '_', '-'));
            Context::set(ResponseInterface::class, $response);
        }
-
        return $handler->handle($request);
    }
 }
--- a/src/Middleware/RestfulCoreMiddleware.php
+++ b/src/Middleware/RestfulCoreMiddleware.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * RestfulCoreMiddleware.php@HDK-Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/1/14
+ */
+
+namespace Singularity\HDK\Core\Middleware;
+
+use Hyperf\Contract\Arrayable;
+use Hyperf\Contract\Jsonable;
+use Hyperf\Contract\LengthAwarePaginatorInterface;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\CoreMiddleware;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Singularity\HDK\Core\Service\UtilsService;
+
+/**
+ * Singularity\HDK\Core\Middleware\RestfulCoreMiddleware@HDK-Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/1/14
+ */
+class RestfulCoreMiddleware extends CoreMiddleware
+{
+    #[Inject]
+    private UtilsService $utilsService;
+
+    /**
+     * @template TKey of array-key
+     * @template TValue
+     * @param null|array<TKey, TValue>|Arrayable<TKey, TValue>|Jsonable|string $response
+     * @param ServerRequestInterface $request
+     * @return ResponseInterface
+     */
+    protected function transferToResponse($response, ServerRequestInterface $request): ResponseInterface
+    {
+        // 分页数据
+        if ($response instanceof LengthAwarePaginatorInterface) {
+            $fact_response = $this->response()
+                ->withHeader('Per-Page', (string)$response->perPage())
+                ->withHeader('Total', (string)$response->total())
+                ->withHeader('Current-Page', (string)$response->currentPage())
+                ->withHeader('Total-Pages', (string)$response->hasPages());
+            $fact_response = $this->utilsService->extendLinkToHeader($fact_response, $response->nextPageUrl(), 'next');
+            $fact_response = $this->utilsService->extendLinkToHeader(
+                $fact_response,
+                $response->url($response->lastPage()),
+                'last'
+            );
+            $fact_response = $this->utilsService->extendLinkToHeader($fact_response, $response->url(1), 'first');
+            return $this->utilsService->extendLinkToHeader(
+                $fact_response,
+                $response->previousPageUrl(),
+                'prev'
+            );
+        }
+
+        return parent::transferToResponse($response, $request);
+    }
+}
--- a/src/Middleware/SessionMiddleware.php
+++ b/src/Middleware/SessionMiddleware.php
@@ -1,165 +0,0 @@
-<?php
-/**
- * SessionMiddleware.php@HDK-Core
- *
- * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
- * Powered by PhpStorm
- * Created on 2023/3/8
- */
-
-namespace Singularity\HDK\Core\Middleware;
-
-use Carbon\Carbon;
-use Hyperf\Contract\ConfigInterface;
-use Hyperf\Contract\SessionInterface;
-use Hyperf\HttpMessage\Cookie\Cookie;
-use Hyperf\HttpMessage\Server\Response;
-use Hyperf\Session\SessionManager;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-/**
- * Singularity\HDK\Auth\Middleware\SessionMiddleware@HDK-Core
- *
- * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
- * Powered by PhpStorm
- * Created on 2023/3/8
- */
-class SessionMiddleware implements MiddlewareInterface
-{
-    private SessionManager $sessionManager;
-    private ConfigInterface $config;
-
-    public function __construct(SessionManager $sessionManager, ConfigInterface $config)
-    {
-        $this->config = $config;
-        $this->sessionManager = $sessionManager;
-    }
-
-    /**
-     * Process an incoming server request.
-     * Processes an incoming server request in order to produce a response.
-     * If unable to produce the response itself, it may delegate to the provided
-     * request handler to do so.
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        if (!$this->isSessionAvailable()) {
-            return $handler->handle($request);
-        }
-
-        $session = $this->sessionManager->start($request);
-
-        try {
-            $response = $handler->handle($request);
-        } finally {
-            $this->storeCurrentUrl($request, $session);
-            $session = $this->sessionManager->getSession();
-
-            /*
-             * 现在的机制，但凡写入 Redis 的数据，
-             * 过期时间就是固定的 gc_maxlifetime
-             *
-             * 而 RedisHandler 只会被依赖注入时加载一次，
-             * 后续无法临时修改 gc_maxlifetime
-             *
-             * 又因为现在没有其他情况用到 session
-             * 只有登录之后才会记下用户信息
-             *
-             * 所以一个妥协的方案，就是只有登录了再写入 Redis
-             *
-             * （除非重写整套 RedisHandler/RedisHandlerFactory/...）
-             */
-            if (!$this->auth($session)) {
-                $this->sessionManager->end($session);
-            }
-        }
-
-        return $this->addCookieToResponse($request, $response, $session);
-    }
-
-    private function isSessionAvailable(): bool
-    {
-        return $this->config->has('session.handler');
-    }
-
-    /**
-     * Store the current URL for the request if necessary.
-     */
-    private function storeCurrentUrl(RequestInterface $request, SessionInterface $session)
-    {
-        if ($request->getMethod() === 'GET') {
-            $session->setPreviousUrl($this->fullUrl($request));
-        }
-    }
-
-    private function auth(SessionInterface $session): bool
-    {
-        return $session->has('userInfo');
-    }
-
-    /**
-     * Add the session cookie to the response·.
-     */
-    private function addCookieToResponse(
-        ServerRequestInterface $request,
-        ResponseInterface $response,
-        SessionInterface $session
-    ): ResponseInterface {
-        $cookie = new Cookie(
-             $session->getName(),
-             $session->getId(),
-             $this->getCookieExpirationDate($session),
-             $this->config->get('session.options.path', '/'),
-             $this->config->get('session.options.domain', $request->getUri()->getHost()),
-             $this->config->get(
-                'session.options.secure',
-                strtolower($request->getUri()->getScheme()) === 'https'
-            ),
-             true,
-             $this->config->get('session.options.samesite', Cookie::SAMESITE_LAX)
-        );
-        if (!method_exists($response, 'withCookie')) {
-            return $response->withHeader('Set-Cookie', (string)$cookie);
-        }
-        /* @var Response $response */
-        return $response->withCookie($cookie);
-    }
-
-    /**
-     * Get the full URL for the request.
-     */
-    private function fullUrl(RequestInterface $request): string
-    {
-        $uri = $request->getUri();
-        $query = $uri->getQuery();
-        $question = $uri->getHost() . $uri->getPath() == '/' ? '/?' : '?';
-        return $query ? $this->url($request) . $question . $query : $this->url($request);
-    }
-
-    /**
-     * Get the session lifetime in seconds.
-     */
-    private function getCookieExpirationDate(SessionInterface $session): int
-    {
-        // if ($this->config->get('session.options.expire_on_close')) {
-        if (!$this->auth($session)) {
-            $expirationDate = 0;
-        } else {
-            $expireSeconds = $this->config->get('session.options.cookie_lifetime', 5 * 60 * 60);
-            $expirationDate = Carbon::now()->addSeconds($expireSeconds)->getTimestamp();
-        }
-        return $expirationDate;
-    }
-
-    /**
-     * Get the URL (no query string) for the request.
-     */
-    private function url(RequestInterface $request): string
-    {
-        return rtrim(preg_replace('/\?.*/', '', (string)$request->getUri()));
-    }
-}
--- a/src/Service/EmailService.php
+++ b/src/Service/EmailService.php
@@ -11,6 +11,7 @@ declare(strict_types=1);

 namespace Singularity\HDK\Core\Service;

+use JetBrains\PhpStorm\Deprecated;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\Mailer;
 use Symfony\Component\Mailer\Transport;
@@ -42,18 +43,6 @@ class EmailService
        );
    }

-    public static function make(
-        ?string $dsn = null,
-        ?string $mailSenderName = null,
-        ?string $mailSender = null
-    ): EmailService {
-        return new static(
-            $dsn,
-            $mailSenderName,
-            $mailSender,
-        );
-    }
-
    /**
     * 发送邮件
     *
@@ -65,9 +54,8 @@ class EmailService
     * @throws TransportExceptionInterface
     * @see EmailService::sendText
     * @see EmailService::sendHtml
-     * @deprecated
-     * @noinspection PhpUnused
     */
+    #[Deprecated]
    public function sendCode(
        string $target,
        string $subject,
@@ -78,26 +66,23 @@ class EmailService

    /**
     * @param string|array<string> $target
-     * @param string        $subject
-     * @param string        $text
+     * @param string $subject
+     * @param string $text
     * @param array<string> $cc
-     * @param array         $bcc
     *
     * @return bool
     * @throws TransportExceptionInterface
     */
    public function sendText(
-        $target,
+        string|array $target,
        string $subject,
        string $text,
-        array $cc = [],
-        array $bcc = []
+        array $cc = []
    ): bool {
        $email = (new Email())
            ->from(Address::create($this->from))
            ->to(...(is_array($target) ? $target : [$target]))
            ->cc(...$cc)
-            ->bcc(...$bcc)
            ->subject($subject)
            ->text($text);

@@ -110,26 +95,23 @@ class EmailService
     * 以 HTML 格式发送邮件
     *
     * @param string|array<string> $target
-     * @param string        $subject
-     * @param string        $html
+     * @param string $subject
+     * @param string $html
     * @param array<string> $cc
-     * @param array         $bcc
     *
     * @return bool
     * @throws TransportExceptionInterface
     */
    public function sendHtml(
-        $target,
+        string|array $target,
        string $subject,
        string $html,
-        array $cc = [],
-        array $bcc = []
+        array $cc = []
    ): bool {
        $email = (new Email())
            ->from(Address::create($this->from))
            ->to(...(is_array($target) ? $target : [$target]))
            ->cc(...$cc)
-            ->bcc(...$bcc)
            ->subject($subject)
            ->html($html);

--- a/src/Service/ExtendService.php
+++ b/src/Service/ExtendService.php
@@ -10,31 +10,23 @@ use Psr\Http\Message\ServerRequestInterface;
 */
 class ExtendService
 {
-    /** @var UtilsService $utils */
-    private UtilsService $utils;
-
-    public function __construct(UtilsService $utils)
-    {
-        $this->utils = $utils;
-    }
-
    /**
     * @param ServerRequestInterface|null $request
-     * @param array<string, string>|string|null $params
+     * @param array<string, string>|null $params
     * @return string[]
     */
    public function parse(
        ?ServerRequestInterface $request,
-        $params = null
+        array|string|null $params = null
    ): array {
-        $params = $params ?? (isset($request) ? $request->getQueryParams() : null);
-        $extends = empty($params['extends']) ? [] : $params['extends'];
+        $params ??= $request?->getQueryParams();
+        $extends = $params['extends'] ?? null;
        if (!empty($extends)) {
            $extends = explode(',', $extends);
-            $extends = array_map('trim', $extends);
+            return Context::set(self::class, array_map('trim', $extends));
        }
-        Context::set(self::class, $extends);
-        return $extends;
+
+        return [];
    }

    /**
@@ -45,12 +37,6 @@ class ExtendService
        return Context::get(self::class) ?? [];
    }

-    public function hasExtends(): bool
-    {
-        $extends = Context::get(self::class);
-        return is_array($extends) && count($extends) > 0;
-    }
-
    /**
     * 判断是否传入了此扩展
     *
@@ -58,8 +44,8 @@ class ExtendService
     *
     * @return bool
     */
-    public function hasExtend(string $field): bool
+    public function hasExtends(string $field): bool
    {
-        return $this->utils->inArray($field, Context::get(self::class));
+        return Context::has(self::class) && isset(array_flip(Context::get(self::class))[$field]);
    }
 }
--- a/src/Service/OssService.php
+++ b/src/Service/OssService.php
@@ -13,12 +13,6 @@ use Hyperf\Utils\Codec\Json;

 class OssService
 {
-    public ?string $accessKeyId = null;
-    public ?string $accessKeySecret = null;
-    public ?string $host = null;
-    public ?string $callbackUrl = null;
-    public ?int $expiration = 30;
-
    /**
     * @param string|null $accessKeyId 不传则取配置文件
     * @param string|null $accessKeySecret 不传则取配置文件
@@ -26,17 +20,16 @@ class OssService
     * @param int|null $expiration 过期时间，默认30s
     */
    public function __construct(
-        ?string $accessKeyId = null,
-        ?string $accessKeySecret = null,
-        ?string $host = null,
-        ?string $callbackUrl = null,
-        ?int $expiration = 30
+        public ?string $accessKeyId = null,
+        public ?string $accessKeySecret = null,
+        public ?string $host = null,
+        public ?string $callbackUrl = null,
+        public ?int $expiration = 30
    ) {
-        $this->expiration = $expiration;
-        $this->callbackUrl = $callbackUrl?? config('oss_callback');
-        $this->host = $host?? config('common.third_party.storage.oss.oss_host');
-        $this->accessKeySecret = $accessKeySecret ?? config('common.third_party.storage.oss.access_key_secret');
-        $this->accessKeyId = $accessKeyId ?? config('common.third_party.storage.oss.access_key_id');
+        $this->accessKeyId ??= config('common.third_party.storage.oss.access_key_id');
+        $this->accessKeySecret ??= config('common.third_party.storage.oss.access_key_secret');
+        $this->host ??= config('common.third_party.storage.oss.oss_host');
+        $this->callbackUrl ??= config('common.third_party.storage.oss.oss_callback') ?? null;
    }

    /**
@@ -91,7 +84,7 @@ class OssService
        $string_to_sign = $base64_policy;
        $signature = base64_encode(hash_hmac('sha1', $string_to_sign, $this->accessKeySecret, true));

-        $callback = Json::encode([
+        $callback = isset($this->callbackUrl) ? Json::encode([
            'callbackUrl' => $this->callbackUrl,
            'callbackBody' => $isImage ? <<<'callbackBody'
 {
@@ -122,17 +115,20 @@ callbackBody : <<<'callbackBody'
 }
 callbackBody,
            'callbackBodyType' => 'application/json',
-        ]);
+        ]) : null;

-        return [
+        $result = [
            'accessid' => $this->accessKeyId,
            'host' => $this->host,
            'policy' => $base64_policy,
            'signature' => $signature,
            'expire' => $expire_time,
            'dir' => $dir,
-            'callback' => base64_encode($callback),
        ];
+        if (isset($callback)) {
+            $result += ['callback' => base64_encode($callback),];
+        }
+        return $result;
    }

    /**
--- a/src/Service/SmsService.php
+++ b/src/Service/SmsService.php
@@ -6,7 +6,7 @@ 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\HttpMessage\Exception\HttpException;
+use Hyperf\HttpMessage\Exception\ServerErrorHttpException;
 use Hyperf\Utils\Codec\Json;
 use Singularity\HDK\Core\Constants\CommonErrorCode;
 use Singularity\HDK\Core\Exceptions\ValidateException;
@@ -20,7 +20,7 @@ class SmsService
    /**
     * @var Dysmsapi
     */
-    private $client;
+    private Dysmsapi $client;

    public function __construct()
    {
@@ -51,14 +51,17 @@ class SmsService
     * @param string|null $signName 短信签名名称
     *
     * @return bool
+     * @throws UnexpectedValueException 参数校验
+     * @throws ValidateException 频率太高
+     * @throws ServerErrorHttpException 阿里云短信服务报错
     * @link https://help.aliyun.com/document_detail/419273.htm
-     * @noinspection PhpUnused
+     *
     */
    public function sendSmsCountryside(
        string $phone,
        ?string $templateCode = null,
        ?array $templateParam = null,
-        ?string $signName = null
+        ?string $signName = null,
    ): bool {
        if (is_array($templateParam) && count($templateParam) <= 0) {
            throw new UnexpectedValueException('不支持空数组，请用 null 代替或不传', CommonErrorCode::FORMATTER_ERROR);
@@ -91,31 +94,22 @@ class SmsService

            // 频率太高
            if ($code === 'isv.BUSINESS_LIMIT_CONTROL') {
-                switch (mb_substr($message, 2, 2)) {
-                    case '天级':
-                        $error_code = CommonErrorCode::REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_DAY;
-                        break;
-                    case '小时':
-                        $error_code = CommonErrorCode::REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_HOUR;
-                        break;
-                    case '分钟':
-                        $error_code = CommonErrorCode::REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_MINUTE;
-                        break;
-                    default:
-                        $error_code = null;
-                        break;
-                }
+                $error_code = match (mb_substr($message, 2, 2)) {
+                    '天级' => CommonErrorCode::REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_DAY,
+                    '小时' => CommonErrorCode::REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_HOUR,
+                    '分钟' => CommonErrorCode::REQUEST_PARAMS_ERROR_CODE_MAX_TIMES_MINUTE,
+                    default => null
+                };

                if (isset($error_code)) {
                    throw new ValidateException($error_code);
                }
            }

-            throw new HttpException(
-                500,
-                $message,
-                CommonErrorCode::SERVER_DEPENDENCY_SMS_ERROR,
-                $error
+            throw new ServerErrorHttpException(
+                message: $message,
+                code: CommonErrorCode::SERVER_DEPENDENCY_SMS_ERROR,
+                previous: $error
            );
        }

--- a/src/Service/UtilsService.php
+++ b/src/Service/UtilsService.php
@@ -8,6 +8,8 @@ use Closure;
 use Exception;
 use Generator;
 use Hyperf\HttpServer\Contract\RequestInterface;
+use JetBrains\PhpStorm\NoReturn;
+use JetBrains\PhpStorm\Pure;
 use Psr\Http\Message\ResponseInterface;

 /**
@@ -99,6 +101,7 @@ class UtilsService
     * @param bool $anchorQuery 开启后，query 参数将被尽量组合到锚点中，以支持 spa 路由
     * @return string
     */
+    #[Pure]
    public function buildUrl(string $url, array $moreQueries = [], bool $anchorQuery = false): string
    {
        if (count($moreQueries) === 0) {
@@ -233,6 +236,7 @@ class UtilsService
     *
     * @return void
     */
+    #[NoReturn]
    public function unlimitedSubCategoriesQuicklyWithLevel(
        array &$list,
        int $level = 1,
@@ -271,8 +275,9 @@ class UtilsService
     *
     * @return array{'size': float, 'unit': string}
     */
+    #[Pure]
    public function convertStorageSize(
-        $size,
+        float|int|string $size,
        bool $unitToUpper = false,
        int $precision = 2
    ): array {
@@ -300,8 +305,9 @@ class UtilsService
     *
     * @return array{'duration': float, 'unit': string}
     */
+    #[Pure]
    public function convertDuration(
-        $duration,
+        int|float $duration,
        bool $unitToUpper = false,
        bool $format = true,
        int $precision = 3
@@ -322,16 +328,4 @@ class UtilsService
            'unit' => $unitToUpper ? strtoupper($unit[$i]) : $unit[$i],
        ];
    }
-
-    /**
-     * 更快的判断数组元素方法
-     * @param string|int|float $needle
-     * @param array<int, mixed> $haystack
-     * @return bool
-     */
-    public function inArray($needle, array $haystack): bool
-    {
-        $list = array_flip($haystack);
-        return isset($list[$needle]);
-    }
 }
--- a/tests/Unit/EmailServiceTest.php
+++ b/tests/Unit/EmailServiceTest.php
@@ -12,27 +12,25 @@ namespace Singularity\HDK\Test\Core\Service;
 use Singularity\HDK\Core\Service\EmailService;
 use Symfony\Component\Mailer\Exception\TransportException;

-$dsn = 'smtp://account@luxcreo.com:Qfsd8866@smtp-mail.outlook.com:587';
+$dsn = 'smtp://account@luxcreo.ai:Qfsd8866@smtp.qiye.aliyun.com:465';
 $mail_sender_name = 'LuxCreo';
-$mail_sender = 'account@luxcreo.com';
+$mail_sender = 'account@luxcreo.ai';
 $email = new EmailService($dsn, $mail_sender_name, $mail_sender);

-$target = 'dongyun.li@luxcreo.ai';
-
-it('assertions that send HTML is available', function () use ($email, $target) {
-        $result = $email->sendHtml(
-            $target,
-            'HDK Unit Test HTML',
-            <<<HTML
+it('assertions that send HTML is available', function () use ($email) {
+    $result = $email->sendHtml(
+        'dongyun.li@luxcreo.ai',
+        'HDK Unit Test HTML',
+        <<<HTML
 <h1>Hello, World!</h1>
 HTML
-        );
-        expect($result)->toBeTrue();
+    );
+    expect($result)->toBeTrue();
 });

-it('assertions that send Text is available', function () use ($email, $target) {
+it('assertions that send Text is available', function () use ($email) {
    $result = $email->sendText(
-        $target,
+        'dongyun.li@luxcreo.ai',
        'HDK Unit Test Text',
        <<<Text
 <h1>Hello, World!</h1>
@@ -43,26 +41,24 @@ Text

 it('assertions Error Receiver can be catch', function () use ($email) {
    try {
-        $result = $email->sendHtml(
+        $email->sendHtml(
            'unknown@luxcreo.ai',
            'HDK Unit Test',
            <<<HTML
 <h1>Hello, World!</h1>
 HTML
        );
-        expect($result)->toBeTrue();
    } catch (TransportException $t) {
        expect($t->getCode())->toBe(554);
    }
    try {
-        $result = $email->sendText(
+        $email->sendText(
            'unknown@luxcreo.ai',
            'HDK Unit Test',
            <<<Text
 <h1>Hello, World!</h1>
 Text
        );
-        expect($result)->toBeTrue();
    } catch (TransportException $t) {
        expect($t->getCode())->toBe(554);
    }
--- a/tests/Unit/ExtendServiceTest.php
+++ b/tests/Unit/ExtendServiceTest.php
@@ -9,15 +9,15 @@

 namespace Singularity\HDK\Test\Core\Unit;

+use Darabonba\GatewaySpi\Models\InterceptorContext\request;
 use Singularity\HDK\Core\Service\ExtendService;
-use Singularity\HDK\Core\Service\UtilsService;

-/** @var ExtendService $service */
-$service = make(ExtendService::class, ['utils' => new UtilsService()]);
+$service = new ExtendService();
+
 it('asserts no parameters can be parsed.', function (ExtendService $service, $params) {
    $service->parse(
-        null,
-        $params
+        request: null,
+        params: $params
    );
    $result = $service->getExtends();
    expect($result)->toBeArray()->toHaveCount(0)->toBe([]);
@@ -32,22 +32,17 @@ it('asserts no parameters can be parsed.', function (ExtendService $service, $pa
 it('asserts query parameters can be parsed.', function () use ($service) {
    $result = $service->parse(
        null,
-        [
+        params: [
            'id' => 5,
            'extends' => 'a,b',
        ]
    );
    expect($result)->toBeArray()->toHaveCount(2)->toBe(['a', 'b']);
 });
-
 it('asserts has extends', function () use ($service) {
-    expect($service->hasExtends())->toBeTrue();
-});
-
-it('asserts has specify extend', function () use ($service) {
-    expect($service->hasExtend('a'))->toBeTrue()
-        ->and($service->hasExtend('b'))->toBeTrue()
-        ->and($service->hasExtend('c'))->toBeFalse();
+    expect($service->hasExtends('a'))->toBeTrue()
+        ->and($service->hasExtends('b'))->toBeTrue()
+        ->and($service->hasExtends('c'))->toBeFalse();
 })->depends('it asserts query parameters can be parsed.');

 it('asserts parsed extends', function () use ($service) {
--- a/tests/Unit/OssServiceTest.php
+++ b/tests/Unit/OssServiceTest.php
@@ -10,11 +10,10 @@
 use Hyperf\Utils\Codec\Json;
 use Singularity\HDK\Core\Service\OssService;

-// use function Spatie\PestPluginTestTime\testTime;
+use function Spatie\PestPluginTestTime\testTime;

 it('asserts oss policy can be generated', function ($setDir, $isImage, $maxSize) {
-    $time = time();
-    // testTime()->freeze();
+    testTime()->freeze();
    $oss = new OssService(
        '{MOCK_ACCESS_KEY_ID}',
        '{MOCK_ACCESS_KEY_SECRET}',
@@ -41,8 +40,8 @@ it('asserts oss policy can be generated', function ($setDir, $isImage, $maxSize)
        ->and($host)->toBe('{MOCK_HOST}')
        ->and($dir)->toBe($setDir)
        ->and($setDir)->toBe($policy['conditions'][1][2])
-        ->and($expire)->toBe($time + 30)
-        // ->and($policy['expiration'])->toBe(testTime()->setMilli(0)->toIso8601ZuluString('m'))
+        ->and($expire)->toBe(testTime()->addSeconds(30)->unix())
+        ->and($policy['expiration'])->toBe(testTime()->setMilli(0)->toIso8601ZuluString('m'))
        ->and($maxSize)->toBe($policy['conditions'][0][2])
        ->and($callback['callbackUrl'])->toBe('{MOCK_CALLBACK_URL}')
        ->and($signature)->toBe($sign);
--- a/tests/Unit/UtilsServiceTest.php
+++ b/tests/Unit/UtilsServiceTest.php
@@ -29,7 +29,7 @@ test('断言验证码可以正常生成指定长度', function (int $length) use
 })->with($length_data)->group('pure', 'utils');

 test('断言可以根据参数构建 URL', function (string $url, array $params, bool $anchorQuery, string $expect) use ($utils) {
-    $url = $utils->buildUrl($url, $params, $anchorQuery);
+    $url = $utils->buildUrl(url: $url, moreQueries: $params, anchorQuery: $anchorQuery);
    expect($url)->toBe($expect);
 })->with([
    ['baidu.com/list', ['a' => 'b'], false, 'baidu.com/list?a=b'],
@@ -58,24 +58,5 @@ test('断言可以根据参数构建 URL', function (string $url, array $params,
        ['c' => 'd'],
        true,
        'http://username:password@127.0.0.1/git/resp?id=1#/page?a=b&c=d',
-    ],
-])->group('pure', 'utils');
-
-test('断言可以判断是否是数组中的元素', function (
-    $needle,
-    array $haystack,
-    bool $expect,
-    bool $exceptions = false
-) use ($utils) {
-    try {
-        expect($utils->inArray($needle, $haystack))->toBe($expect);
-    } catch (Throwable $e) {
-        if ($exceptions) {
-            expect(true)->toBeTrue();
-        }
-    }
-})->with([
-    [1, ['1', 2, 3], true, false],
-    ['1', ['1', 2, 3], true, false],
-    [[1, 2, 3], ['1', 2, 3], false, true],
+    ]
 ])->group('pure', 'utils');
Author	SHA1	Message	Date
ch4o5	bf0dc896e4	chore(release): 0.2.7	2023-02-02 07:45:00 +00:00
李东云	a729270fac	style(cs-fixer): prettier	2023-02-02 15:44:48 +08:00
李东云	099ab60103	fix(extend): 修复了解析不到为空不为数组的问题	2023-02-02 15:44:26 +08:00
李东云	e41847a234	test(extend): 补充测试用例	2023-02-01 21:11:13 +08:00
李东云	9026a3e0f0	Merge branch '0.2.x' into develop	2023-01-16 22:34:23 +08:00
李东云	5151787982	feat(Sms): 实现了短信发送的事件机制	2023-01-16 22:05:31 +08:00
李东云	b65818bfb6	docs(Sms): 补充所抛出异常的注释	2023-01-16 21:58:58 +08:00
李东云	1dbad8e5a6	feat(Listener): 添加了一个抽象监听器类，预先注入了一些属性	2023-01-16 21:56:28 +08:00
李东云	5a1a2a89bd	perf(Sms): 修改抛出的异常类型，追加方法注释	2023-01-16 21:55:20 +08:00
李东云	8757908f3f	feat(Email): 实现了邮件发送的事件机制	2023-01-16 21:23:44 +08:00
ch4o5	73401d7cb1	chore(release): 0.2.6	2023-01-16 07:15:52 +00:00
李东云	d1bae3e623	fix(configure): 修复配置文件和实际应用的字段名不统一	2023-01-16 10:52:00 +08:00
李东云	3d092074b3	style: 移除冗余的注释	2023-01-14 05:24:10 +08:00
ch4o5	427ba4b322	chore(release): 0.2.5	2023-01-13 20:56:46 +00:00
李东云	aeddb55988	feat(CoreMiddleware): 增加restful场景下的分页响应处理优化弃用代码	2023-01-14 04:56:34 +08:00
ch4o5	0705d1bef3	chore(release): 0.2.4	2023-01-13 20:20:00 +00:00
李东云	922c780c49	fix(oss): 修复了oss的配置缺失和错误	2023-01-14 04:19:46 +08:00
李东云	cdb193778f	revert(constant): 移除冗余的http头authentication的枚举类型	2023-01-14 04:18:48 +08:00
ch4o5	9633fa6b8d	chore(release): 0.2.3	2023-01-13 18:54:16 +00:00
李东云	08c1f6609c	feat(constant): 增加http头authentication的枚举类型	2023-01-14 02:52:52 +08:00
李东云	3a1f2695fe	docs(link): 增加错误码对应的语雀文档	2023-01-14 02:52:10 +08:00
ch4o5	50885c57e2	chore(release): 0.2.2	2023-01-13 18:17:21 +00:00
李东云	9f9ff31a83	perf(exceptions.handler): 优化trace显示格式	2023-01-14 02:16:37 +08:00
ch4o5	990c247cf6	chore(release): 0.2.1	2023-01-13 17:32:24 +00:00
李东云	3989f5913e	fix(composer): 修复ConfigProvider命名空间	2023-01-14 01:30:23 +08:00
ch4o5	ab44630db8	chore(release): 0.2.1-0	2023-01-13 17:15:17 +00:00
李东云	3bc4e275a7	build(version): 添加changelog配置及脚本	2023-01-14 01:14:53 +08:00
李东云	82e257f7b4	Merge branch 'develop' into 0.2.x	2023-01-14 00:47:41 +08:00
李东云	480f406ccc	refactor(migrate): 迁移注解以支持hyperf3	2023-01-13 23:01:06 +08:00
李东云	91db3c731f	refactor(migrate): 迁移注解以支持hyperf3	2023-01-13 22:39:08 +08:00
李东云	9fedbb40f4	build: 迁移到hyperf3	2023-01-13 20:33:21 +08:00