chore(release): 0.2.11

限定了 hyperf/crontab 的版本，避开有问题的版本

.idea/HDK-Core.iml

@@ -64,7 +64,6 @@
       <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/engine" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/pool" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/event" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/validation" />
@@ -83,7 +82,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-invoker" />
@@ -138,12 +136,16 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/friendsofphp/php-cs-fixer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/filp/whoops" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/deprecations" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/paginator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/engine" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/spatie/pest-plugin-test-time" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/coordinator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/resource" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/spatie/test-time" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/coordinator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/engine-contract" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/resource" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/paginator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/guzzle" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/php.xml

@@ -159,6 +159,9 @@
       <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
       <path value="$PROJECT_DIR$/vendor/hyperf/coordinator" />
       <path value="$PROJECT_DIR$/vendor/hyperf/guzzle" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/engine-contract" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/crontab" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />

CHANGELOG.md

@@ -1,4 +1,26 @@
 # 版本更新日志
+### [0.2.11](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.10...v0.2.11) (2023-04-03)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([78b56a6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/78b56a6aa9038743be7df9a17787b94771e226c3))
+* **composer:** 更新依赖 ([c991c31](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/c991c312609e7501c7adad28ec8229efad717db0))
+
+
+### ✨ Features | 新功能
+
+* **i18n:** 引入了 symfony 的 Accept-Language 机制 ([859a1a1](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/859a1a1f2aa683f9f026652952d1a03ba5d7be02))
+
+### [0.2.10](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.9...v0.2.10) (2023-03-21)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 只留下了腾讯源，更新依赖 ([afec642](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/afec6424545daa3b3f2a4b91e97e359b4a840a19))
+* **composer:** 只留下了腾讯源，更新依赖 ([b2debf9](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/b2debf9c135554a15639c299f183c43f3682545b))
+* **composer:** 更新依赖 ([70ad307](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/70ad3078b1ddeeeb0179dd44770e959ecf072fed))
+
 ### [0.2.9](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.8...v0.2.9) (2023-03-15)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-0.2.9
+0.2.11

composer.json

@@ -35,6 +35,7 @@
     "lmc/http-constants": "^1.2",
     "myclabs/php-enum": "^1.8",
     "roave/dont": "^1.5",
+    "symfony/http-foundation": "^6.0",
     "symfony/polyfill-php81": "^1.26",
     "teapot/status-code": "^1.1"
   },
@@ -43,6 +44,7 @@
     "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/guzzle": "^3.0",
     "hyperf/session": "3.0.*",
     "hyperf/validation": "3.0.*",
@@ -99,17 +101,9 @@
       "url": "https://satis.luxcreo.cn/"
     },
     "packagist": {
-      "type": "composer",
-      "url": "https://mirrors.aliyun.com/composer/"
-    },
-    "packagist-tx": {
       "type": "composer",
       "url": "https://mirrors.cloud.tencent.com/composer/"
-    },
-    "packagist-hw": {
-      "type": "composer",
-      "url": "https://repo.huaweicloud.com/repository/php/"
     }
   },
-  "version": "0.2.9"
+  "version": "0.2.11"
 }

src/Middleware/InternationalizationMiddleware.php

@@ -7,10 +7,12 @@ namespace Singularity\HDK\Core\Middleware;
 use Hyperf\Context\Context;
 use Hyperf\Contract\TranslatorInterface;
 use Hyperf\Di\Annotation\Inject;
+use Lmc\HttpConstants\Header;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Singularity\HDK\Utils\Middleware\InternationalizationMiddleware@HDK
@@ -26,13 +28,16 @@ class InternationalizationMiddleware implements MiddlewareInterface
      */
     #[Inject]
     private TranslatorInterface $translator;
+
     /**
      * @inheritDoc
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $response = Context::get(ResponseInterface::class);
-        $language = $request->getHeaderLine('Accept-Language');
+        $req = (new Request());
+        $req->headers->set(Header::ACCEPT_LANGUAGE, $request->getHeaderLine(Header::ACCEPT_LANGUAGE));
+
+        $language = $req->getPreferredLanguage([config('translation.locale')]);
         if (!empty($language)) {
             $language = match (strtolower($language)) {
                 'en', 'en_us', 'en-us', 'en-uk', 'en_uk' => 'en',
@@ -40,9 +45,14 @@ class InternationalizationMiddleware implements MiddlewareInterface
                 default => config('translation.locale'),
             };
             $this->translator->setLocale($language);
-            $response = $response->withAddedHeader('Content-Language', strtr($this->translator->getLocale(), '_', '-'));
-            Context::set(ResponseInterface::class, $response);
         }
+        $response = Context::get(ResponseInterface::class);
+        $response = $response->withAddedHeader(
+            Header::CONTENT_LANGUAGE,
+            strtr($this->translator->getLocale(), '_', '-')
+        );
+        Context::set(ResponseInterface::class, $response);
+
         return $handler->handle($request);
     }
 }