chore(release): 0.2.20

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

.idea/HDK-Core.iml

@@ -151,6 +151,13 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/pipeline" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/tappable" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/serializer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/code-parser" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/codec" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/conditionable" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/coroutine" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/serializer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/stringable" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/support" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/inspectionProfiles/Project_Default.xml

@@ -1,9 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <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>
 </component>

.idea/php.xml

@@ -137,7 +137,6 @@
       <path value="$PROJECT_DIR$/vendor/jetbrains/phpstorm-attributes" />
       <path value="$PROJECT_DIR$/vendor/lizhichao/one-sm" />
       <path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
-      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
       <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
       <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
       <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
@@ -167,6 +166,15 @@
       <path value="$PROJECT_DIR$/vendor/hyperf/tappable" />
       <path value="$PROJECT_DIR$/vendor/hyperf/db" />
       <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
+      <path value="$PROJECT_DIR$/vendor/facade/ignition-contracts" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/serializer" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/code-parser" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/coroutine" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/conditionable" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/codec" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/stringable" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/support" />
+      <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />

CHANGELOG.md

@@ -1,4 +1,42 @@
 # 版本更新日志
+### [0.2.20](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.19...v0.2.20) (2023-06-19)
+
+
+### ✨ Features | 新功能
+
+* **handler:** 增加了 restful 的支持 ([8974ee5](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/8974ee595b3411bac086c3046eb24ba44087ecc7))
+
+### [0.2.19](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.18...v0.2.19) (2023-06-02)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([648fe6c](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/648fe6c8f32e2511f0c1a79dbafff8e889c1da7b))
+
+### [0.2.18](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.17...v0.2.18) (2023-06-02)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* 修复 http 请求失效的问题 ([43ebd05](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/43ebd0546abb25446e83522fd0c069dd0e6880c7))
+
+
+### 📦‍ Build System | 打包构建
+
+* 更新被弃用的写法 ([c748cbd](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/c748cbd3e322b5a926996fc2ee958b2e2a911d7c))
+
+### [0.2.17](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.16...v0.2.17) (2023-05-06)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([d22bd3e](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/d22bd3ee587f7799b33a28015c148e50afe79107))
+
+
+### ✨ Features | 新功能
+
+* **xml:** 实现了解析xml的方法 ([be818b7](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/be818b708011bb05a65752380248c8307938d110))
+
 ### [0.2.16](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.15...v0.2.16) (2023-04-25)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-0.2.16
+0.2.20

composer.json

@@ -20,36 +20,36 @@
     "ext-swoole": "*",
     "composer/composer": ">=2.0",
     "ergebnis/http-method": "^2.2",
-    "hyperf/config": "^3.0.0",
-    "hyperf/constants": "^3.0.0",
-    "hyperf/context": "^3.0.0",
-    "hyperf/di": "^3.0.0",
-    "hyperf/framework": "^3.0.0",
-    "hyperf/logger": "^3.0.0",
-    "hyperf/redis": "^3.0.0",
-    "hyperf/resource": "^3.0.0",
-    "hyperf/translation": "^3.0.0",
+    "hyperf/config": "^3.0.18",
+    "hyperf/constants": "^3.0.18",
+    "hyperf/context": "^3.0.18",
+    "hyperf/di": "^3.0.18",
+    "hyperf/framework": "^3.0.18",
+    "hyperf/logger": "^3.0.18",
+    "hyperf/redis": "^3.0.18",
+    "hyperf/resource": "^3.0.18",
+    "hyperf/translation": "^3.0.18",
     "jetbrains/phpstorm-attributes": "^1.0",
     "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"
+    "teapot/status-code": "^1.1",
+    "ext-libxml": "*",
+    "ext-dom": "*"
   },
   "require-dev": {
-    "ext-dom": "*",
-    "ext-libxml": "*",
     "alibabacloud/dysmsapi-20170525": "^2.0",
     "firebase/php-jwt": "^6.1",
     "friendsofphp/php-cs-fixer": "^3.13",
     "guzzlehttp/guzzle": "^7.5",
-    "hyperf/crontab": "^3.0.0",
-    "hyperf/database": "^3.0.0",
-    "hyperf/db": "^3.0.0",
-    "hyperf/guzzle": "^3.0.0",
-    "hyperf/session": "^3.0.0",
-    "hyperf/validation": "^3.0.0",
+    "hyperf/crontab": "^3.0.18",
+    "hyperf/database": "^3.0.18",
+    "hyperf/db": "^3.0.18",
+    "hyperf/guzzle": "^3.0.18",
+    "hyperf/session": "^3.0.18",
+    "hyperf/validation": "^3.0.18",
     "pestphp/pest": "^1.22",
     "phpstan/phpstan": "^1.9",
     "phpunit/phpunit": "^9.5",
@@ -61,12 +61,12 @@
   },
   "suggest": {
     "firebase/php-jwt": "JWT 鉴权必需",
-    "hyperf/session": "^3.0.0",
+    "hyperf/session": "^3.0.18",
     "symfony/mailer": "用于发送电子邮件",
     "symfony/serializer": "处理 XML 必需",
     "ext-dom": "处理 XML 必需",
     "ext-libxml": "处理 XML 必需",
-    "hyperf/guzzle": "^3.0.0",
+    "hyperf/guzzle": "^3.0.18",
     "alibabacloud/dysmsapi-20170525": "阿里云短信服务必需"
   },
   "config": {
@@ -108,8 +108,8 @@
     },
     "packagist": {
       "type": "composer",
-      "url": "https://mirrors.cloud.tencent.com/composer/"
+      "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "0.2.16"
+  "version": "0.2.20"
 }

src/Exceptions/Handler/CommonHandler.php

@@ -31,6 +31,7 @@ use Psr\Http\Message\ResponseInterface;
 use RedisException;
 use Singularity\HDK\Core\Constants\CommonErrorCode;
 use Singularity\HDK\Core\Exceptions\ValidateException;
+use Singularity\HDK\Core\Service\ApiStyleService;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Teapot\StatusCode\RFC\RFC4918;
 use Teapot\StatusCode\RFC\RFC7231;
@@ -46,18 +47,15 @@ use Throwable;
  */
 class CommonHandler extends ExceptionHandler
 {
-    /**
-     *
-     * @var RequestInterface|null
-     */
     #[Inject(required: false)]
     private ?RequestInterface $request;
-    /**
-     * @var StdoutLogger
-     */
+
     #[Inject]
     private StdoutLogger $logger;
 
+    #[Inject]
+    private ApiStyleService $apiStyleService;
+
     /**
      * {@inheritDoc}
      */
@@ -65,7 +63,8 @@ class CommonHandler extends ExceptionHandler
     {
         // 阻止异常冒泡
         $this->stopPropagation();
-        $restful = config('common.response.restful');
+        $restful = $this->apiStyleService->get();
+        // $restful = config('common.response.restful');
         $code_name = config('common.response.code_name');
         $message_name = config('common.response.message_name');
         $is_testing = config('app_status') === true;
@@ -243,7 +242,7 @@ TRACE:
 ERROR_LOG
         );
         $data = Json::encode($data);
-        if ($restful) {
+        if ($restful === ApiStyleService::RESTFUL) {
             $response = $response->withStatus(
                 $status_code ?? $throwable->status ?? $throwable->statusCode ?? RFC7231::INTERNAL_SERVER_ERROR
             );

src/Service/HttpRequestService.php

@@ -11,10 +11,9 @@ use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Utils;
+use Hyperf\Codec\Json;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\Guzzle\ClientFactory;
-use Hyperf\Utils\Codec\Json;
-use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -25,10 +24,7 @@ class HttpRequestService
 {
     public const TIMEOUT = 20;
 
-    /**
-     * @Inject()
-     * @var ClientFactory
-     */
+    #[Inject]
     private ClientFactory $client;
 
     /**

src/Service/XmlService.php

@@ -27,13 +27,8 @@ class XmlService
      * @param string $xmlVersion
      * @param string $xmlEncoding
      * @param bool $xmlStandalone 是否添加声明规范的标签到xml
-     * @param bool $xmlTypeCastAttributes
-     * @param bool $asCollection
-     * @param int[] $decoderIgnoredNodeTypes
      * @param int[] $encoderIgnoredNodeTypes
-     * @param int $loadOptions
      * @param bool $removeEmptyTags
-     *
      * @return false|string
      * @see https://symfony.com/doc/current/components/serializer.html#the-xmlencoder
      */
@@ -44,29 +39,48 @@ class XmlService
         string $xmlVersion = '1.0',
         string $xmlEncoding = 'utf-8',
         bool $xmlStandalone = false,
-        bool $xmlTypeCastAttributes = true,
-        bool $asCollection = true,
-        array $decoderIgnoredNodeTypes = [XML_PI_NODE, XML_COMMENT_NODE],
         array $encoderIgnoredNodeTypes = [],
-        int $loadOptions = LIBXML_NONET | LIBXML_NOBLANKS,
-        bool $removeEmptyTags = false
+        bool $removeEmptyTags = false,
     ): false|string {
         return $this->service->encode(
             $data,
             XmlEncoder::FORMAT,
             [
+                XmlEncoder::ENCODER_IGNORED_NODE_TYPES => $encoderIgnoredNodeTypes,
+                XmlEncoder::ROOT_NODE_NAME => $xmlRootNodeName,
                 XmlEncoder::FORMAT_OUTPUT => $xmlFormatOutput,
                 XmlEncoder::VERSION => $xmlVersion,
                 XmlEncoder::ENCODING => $xmlEncoding,
                 XmlEncoder::STANDALONE => $xmlStandalone,
-                XmlEncoder::TYPE_CAST_ATTRIBUTES => $xmlTypeCastAttributes,
-                XmlEncoder::ROOT_NODE_NAME => $xmlRootNodeName,
-                XmlEncoder::AS_COLLECTION => $asCollection,
-                XmlEncoder::DECODER_IGNORED_NODE_TYPES => $decoderIgnoredNodeTypes,
-                XmlEncoder::ENCODER_IGNORED_NODE_TYPES => $encoderIgnoredNodeTypes,
-                XmlEncoder::LOAD_OPTIONS => $loadOptions,
                 XmlEncoder::REMOVE_EMPTY_TAGS => $removeEmptyTags,
             ]
         );
     }
+
+    /**
+     * @param string $xml
+     * @param bool $xmlTypeCastAttributes 是否自动转换类型
+     * @param bool $asCollection 是否全部使用数组
+     * @param int[] $decoderIgnoredNodeTypes
+     * @param int $loadOptions
+     * @return array<string, mixed>
+     */
+    public function decode(
+        string $xml,
+        bool $xmlTypeCastAttributes = true,
+        bool $asCollection = false,
+        array $decoderIgnoredNodeTypes = [XML_PI_NODE, XML_COMMENT_NODE],
+        int $loadOptions = LIBXML_NONET | LIBXML_NOBLANKS,
+    ): array {
+        return $this->service->decode(
+            $xml,
+            XmlEncoder::FORMAT,
+            [
+                XmlEncoder::LOAD_OPTIONS => $loadOptions,
+                XmlEncoder::DECODER_IGNORED_NODE_TYPES => $decoderIgnoredNodeTypes,
+                XmlEncoder::TYPE_CAST_ATTRIBUTES => $xmlTypeCastAttributes,
+                XmlEncoder::AS_COLLECTION => $asCollection,
+            ]
+        );
+    }
 }

tests/Unit/XmlServiceTest.php

@@ -12,7 +12,13 @@ namespace HyperfTest\Unit\Common;
 use Singularity\HDK\Core\Service\XmlService;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 
-$service = new XmlService(new XmlEncoder());
+use function Hyperf\Support\make;
+
+/** @var XmlService $service */
+$service = make(
+    XmlService::class,
+    ['encoder' => make(XmlEncoder::class)]
+);
 
 test(
     'assert Xml can be encoded',
@@ -40,8 +46,7 @@ test(
   <validTime>2099/03/27</validTime>
 </ClientInfo>
 
-XML
-        ,
+XML,
         'xmlRootNodeName' => 'ClientInfo',
     ],
     'normal attribute' => [
@@ -99,3 +104,27 @@ XML
         'ClientInfo',
     ],
 ]);
+
+test('assert Xml can be parsed', function (string $xml, array $expected) use ($service) {
+    $data = $service->decode($xml);
+    expect($data)->toBe($expected);
+})->with([
+    'normal' => [
+        'xml' => <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<ClientInfo version="1.0" descripe="LuxAlignAuthentication">
+    <UserName>zhm</UserName>
+    <Email>haimei.zheng@luxcreo.ai</Email>
+    <BiosId>420036H32020120279</BiosId>
+</ClientInfo>
+
+XML,
+        'expected' => [
+            '@version' => 1.0,
+            '@descripe' => 'LuxAlignAuthentication',
+            'UserName' => 'zhm',
+            'Email' => 'haimei.zheng@luxcreo.ai',
+            'BiosId' => '420036H32020120279',
+        ],
+    ],
+]);