Merge tag '1.2.2' into develop

composer.json

@@ -2,7 +2,7 @@
   "name": "maiyoule/mqttclient_author",
   "type": "library",
   "description": "MQTT管理模块操作库",
-  "version": "1.1.0",
+  "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/AppUpdateCallbackRequest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace cn\com\maiyoule\mqttclient\biz;
+
+use cn\com\maiyoule\mqttclient\IRequest;
+
+class AppUpdateCallbackRequest extends IRequest
+{
+
+    public function path(): string
+    {
+        return 'app/callback/update';
+    }
+
+    public function body(): array
+    {
+        return [
+            'url' => $this->getUrl()
+        ];
+    }
+
+
+    private string $url;
+
+    /**
+     * @return string
+     */
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    public function setUrl(string $url): void
+    {
+        $this->url = $url;
+    }
+}

src/biz/AppUserCreateRequest.php

@@ -18,25 +18,60 @@ class AppUserCreateRequest extends IRequest
             'password' => $this->getPassword(),
             'fettle' => $this->getFettle(),
             'role' => $this->getRole(),
-            'biz' => join(',', $this->getBiz())
+            'publish' => join(',', $this->getPublish()),
+            'subscribe' => join(',', $this->getSubscribe()),
+            'expire' => $this->expireAt
         ];
     }
 
-    private array $biz = [];
+    private array $subscribe = [];
 
-    public function getBiz(): array
+    public function getSubscribe(): array
     {
-        return $this->biz;
+        return $this->subscribe;
     }
 
-    public function setBiz(array|string $biz): void
+    public function setSubscribe(array|string $subscribe): void
     {
-        if (is_string($biz)) {
-            $biz = [$biz];
+        if (is_string($subscribe)) {
+            $subscribe = [$subscribe];
         }
-        $this->biz = $biz;
+        $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 = [];
+
+    public function getPublish(): array
+    {
+        return $this->publish;
+    }
+
+    public function setPublish(array|string $publish): void
+    {
+        if (is_string($publish)) {
+            $publish = [$publish];
+        }
+
+        $this->publish = $publish;
+    }
+
+
     private string $password = '';
     private string $fettle = '';
     private string $role = 'user';

src/biz/AppUserUpdateRequest.php

@@ -29,23 +29,37 @@ class AppUserUpdateRequest extends IRequest
         if (!is_null($this->fettle)) {
             $data['fettle'] = $this->fettle;
         }
-        if (!is_null($this->biz)) {
-            $data['biz'] = join(',', $this->biz);
+        if (!empty($this->publish)) {
+            $data['publish'] = join(',', $this->getPublish());
+        }
+        if (!empty($this->subscribe)) {
+            $data['subscribe'] = join(',', $this->getSubscribe());
         }
 
         return $data;
     }
 
-    private ?array $biz = null;
+    private array $subscribe = [];
 
-    public function getBiz(): array
+    public function getSubscribe(): array
     {
-        return $this->biz;
+        return $this->subscribe;
     }
 
-    public function setBiz(array $biz): void
+    public function setSubscribe(array|string $subscribe): void
     {
-        $this->biz = $biz;
+        if (is_string($subscribe)) {
+            $subscribe = [$subscribe];
+        }
+        $this->subscribe = $subscribe;
+    }
+
+
+    private array $publish = [];
+
+    public function getPublish(): array
+    {
+        return $this->publish;
     }
 
     private string $username;

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

tests/AppManagerTest.php

@@ -2,11 +2,13 @@
 
 namespace cn\com\maiyoule\mqttclient\test;
 
+use cn\com\maiyoule\mqttclient\biz\AppUpdateCallbackRequest;
 use cn\com\maiyoule\mqttclient\biz\AppUserCreateRequest;
 use cn\com\maiyoule\mqttclient\biz\AppUserDeleteRequest;
 use cn\com\maiyoule\mqttclient\biz\AppUserUpdateRequest;
 use cn\com\maiyoule\mqttclient\exception\ApiException;
 use cn\com\maiyoule\mqttclient\AuthorServerClient;
+use GuzzleHttp\Exception\GuzzleException;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 
@@ -80,4 +82,16 @@ class AppManagerTest extends TestCase
         }
     }
 
+    public function testUpdateAppUrl()
+    {
+        $request = new AppUpdateCallbackRequest();
+        $request->setUrl('http://202.200.18.46:8000/api.php');
+        try {
+            $biz = $this->manager->exec($request);
+            $this->assertTrue($biz->isSuccess(), $biz->getMessage());
+        } catch (GuzzleException|ApiException $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
 }