From 1456b21f3491feb1c406d6c87692e6196236f079 Mon Sep 17 00:00:00 2001 From: "X14XA\\shengli" Date: Thu, 15 May 2025 20:01:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AuthorServerClient.php | 2 +- src/response/BizResponse.php | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/AuthorServerClient.php b/src/AuthorServerClient.php index 53990d6..87f23fc 100644 --- a/src/AuthorServerClient.php +++ b/src/AuthorServerClient.php @@ -162,7 +162,7 @@ class AuthorServerClient return new BizResponse(); } $data = json_decode($content, true); - return new BizResponse($data['code'] ?? 0, $data['message'] ?? '', $data['data'] ?? []); + return new BizResponse($data['code'] ?? 0, $data['message'] ?? '', $data['data'] ?? [], $data['err'] ?? ''); } catch (ClientException $e) { $body = $e->getResponse()->getBody()->getContents(); diff --git a/src/response/BizResponse.php b/src/response/BizResponse.php index fa6449e..3bbcc90 100644 --- a/src/response/BizResponse.php +++ b/src/response/BizResponse.php @@ -6,19 +6,22 @@ class BizResponse { private int $code; private string $message; - private $data; + private mixed $data; + private string $errCode; /** * @param int $code * @param string $message - * @param $data + * @param array $data + * @param string $errCode */ - public function __construct(int $code = -1, string $message = '', $data = []) + public function __construct(int $code = -1, string $message = '', mixed $data = [], string $errCode = '') { $this->code = $code; $this->message = $message; $this->data = $data; + $this->errCode = $errCode; } public function isSuccess(): bool @@ -49,7 +52,7 @@ class BizResponse /** * @return mixed */ - public function getData() + public function getData(): mixed { return $this->data; } @@ -62,5 +65,15 @@ class BizResponse $this->data = $data; } + public function getErrCode(): string + { + return $this->errCode; + } + + public function setErrCode(string $errCode): void + { + $this->errCode = $errCode; + } + } \ No newline at end of file From 6d3709da518731d4253b28c0a20dba8ec6a7541a Mon Sep 17 00:00:00 2001 From: "X14XA\\shengli" Date: Thu, 15 May 2025 20:01:31 +0800 Subject: [PATCH 2/2] 1.2.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0c44490..41676e2 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "maiyoule/mqttclient_author", "type": "library", "description": "MQTT管理模块操作库", - "version": "1.2.1", + "version": "1.2.2", "license": "MIT", "authors": [ {