Merge branch 'release/1.2.2'

composer.json

@@ -2,7 +2,7 @@
   "name": "maiyoule/mqttclient_author",
   "type": "library",
   "description": "MQTT管理模块操作库",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "license": "MIT",
   "authors": [
     {

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();

src/biz/AppUserCreateRequest.php

@@ -20,6 +20,7 @@ class AppUserCreateRequest extends IRequest
             'role' => $this->getRole(),
             'publish' => join(',', $this->getPublish()),
             'subscribe' => join(',', $this->getSubscribe()),
+            'expire' => $this->expireAt
         ];
     }
 
@@ -38,6 +39,21 @@ class AppUserCreateRequest extends IRequest
         $this->subscribe = $subscribe;
     }
 
+    /**
+     * @var string 过期时间
+     */
+    private string $expireAt = '';
+
+    public function getExpireAt(): string
+    {
+        return $this->expireAt;
+    }
+
+    public function setExpireAt(string $expireAt): void
+    {
+        $this->expireAt = $expireAt;
+    }
+
 
     private array $publish = [];
 

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;
+    }
+
 
 }