chore(release): 0.2.22

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

CHANGELOG.md

@@ -1,4 +1,11 @@
 # 版本更新日志
+### [0.2.22](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.21...v0.2.22) (2023-07-06)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **service:** 修复 http 请求类中无效的 query ([a6ec695](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a6ec6951a9a68a4c5144aee97638486826d6af84))
+
 ### [0.2.21](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.20...v0.2.21) (2023-07-05)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-0.2.21
+0.2.22

composer.json

@@ -111,5 +111,5 @@
       "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "0.2.21"
+  "version": "0.2.22"
 }

src/Service/HttpRequestService.php

@@ -6,15 +6,12 @@ namespace Singularity\HDK\Core\Service;
 
 use Ergebnis\Http\Method;
 use GuzzleHttp\Client;
-use GuzzleHttp\Exception\BadResponseException;
 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 Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -22,7 +19,7 @@ use Psr\Http\Message\ResponseInterface;
  */
 class HttpRequestService
 {
-    public const TIMEOUT = 20;
+    // public const TIMEOUT = 20;
 
     #[Inject]
     private ClientFactory $client;
@@ -35,14 +32,16 @@ class HttpRequestService
     /**
      * @param string $url
      * @param array<string, string|int> $params
+     * @param array $data
      * @return ResponseInterface
      * @throws GuzzleException
      */
-    public function requestGet(string $url, array $params = []): ResponseInterface
+    public function requestGet(string $url, array $params = [], array $data = []): ResponseInterface
     {
         $request = new Request(Method\Rfc\Rfc7231::GET, $url);
         return $this->getClient()->send($request, [
-            'params' => $params,
+            'query' => $params,
+            'json' => $data,
         ]);
     }
 
@@ -58,12 +57,17 @@ class HttpRequestService
      * @return ResponseInterface
      * @throws GuzzleException
      */
-    public function requestPost(string $url, array $data = [], array $params = []): ResponseInterface
+    public function requestPost(string $url, array $params = [], array $data = []): ResponseInterface
     {
         $data = Json::encode($data);
-        $request = new Request('post', $url, ['Content-Type' => 'application/json'], Utils::streamFor($data));
+        $request = new Request(
+            'post',
+            $url,
+            ['Content-Type' => 'application/json'],
+            Utils::streamFor($data),
+        );
         return $this->getClient()->send($request, [
-            'params' => $params,
+            'query' => $params,
         ]);
     }
 
@@ -75,18 +79,13 @@ class HttpRequestService
      * @return ResponseInterface
      * @throws GuzzleException
      */
-    public function requestPut(string $url, array $data = [], array $params = []): ResponseInterface
+    public function requestPut(string $url, array $params = [], array $data = []): ResponseInterface
     {
         $data = Json::encode($data);
         $request = new Request('put', $url, ['Content-Type' => 'application/json'], Utils::streamFor($data));
-        $result = $this->getClient()->send($request, [
-            'params' => $params,
+        return $this->getClient()->send($request, [
+            'query' => $params,
         ]);
-        $json = Json::decode($result->getBody()->getContents());
-        if ($json['code'] !== 200) {
-            throw new ServerException($json['message'], $request, $result);
-        }
-        return $result;
     }
 
     /**
@@ -99,20 +98,4 @@ class HttpRequestService
         $this->options = array_replace_recursive($this->options, $options);
         return $this;
     }
-
-    /**
-     * @param ResponseInterface $response
-     * @param RequestInterface $request
-     * @return ResponseInterface
-     */
-    private function parseResponse(
-        ResponseInterface $response,
-        RequestInterface $request
-    ): ResponseInterface {
-        if ($response->getStatusCode() >= 200 && $response->getStatusCode() < 300) {
-            return $response;
-        } else {
-            throw new BadResponseException($response->getReasonPhrase(), $request, $response);
-        }
-    }
 }