代码同步

Server/vendor/alibabacloud/tea/composer.json

@@ -31,7 +31,7 @@
         "ext-simplexml": "*",
         "ext-xmlwriter": "*",
         "guzzlehttp/guzzle": "^6.3|^7.0",
-        "adbario/php-dot-notation": "^2.3"
+        "adbario/php-dot-notation": "^2.4"
     },
     "require-dev": {
         "symfony/dotenv": "^3.4",

Server/vendor/alibabacloud/tea/src/Exception/TeaError.php

@@ -13,6 +13,9 @@ class TeaError extends RuntimeException
     public $code    = 0;
     public $data;
     public $name    = '';
+    public $statusCode;
+    public $description;
+    public $accessDeniedDetail;
     private $errorInfo;
 
     /**
@@ -28,10 +31,13 @@ class TeaError extends RuntimeException
         parent::__construct((string) $message, (int) $code, $previous);
         $this->errorInfo = $errorInfo;
         if (!empty($errorInfo)) {
-            $properties = ['name', 'message', 'code', 'data'];
+            $properties = ['name', 'message', 'code', 'data', 'description', 'accessDeniedDetail'];
             foreach ($properties as $property) {
                 if (isset($errorInfo[$property])) {
                     $this->{$property} = $errorInfo[$property];
+                    if ($property === 'data' && isset($errorInfo['data']['statusCode'])) {
+                        $this->statusCode = $errorInfo['data']['statusCode'];
+                    }
                 }
             }
         }

Server/vendor/alibabacloud/tea/src/Helper.php

@@ -37,6 +37,50 @@ class Helper
         return \JSON_ERROR_NONE == json_last_error();
     }
 
+    /**
+     * @param mixed $value
+     *
+     * @return bool
+     */
+    public static function isBytes($value)
+    {
+        if (!\is_array($value)) {
+            return false;
+        }
+        $i = 0;
+        foreach ($value as $k => $ord) {
+            if ($k !== $i) {
+                return false;
+            }
+            if (!\is_int($ord)) {
+                return false;
+            }
+            if ($ord < 0 || $ord > 255) {
+                return false;
+            }
+            ++$i;
+        }
+
+        return true;
+    }
+
+    /**
+     * Convert a bytes to string(utf8).
+     *
+     * @param array $bytes
+     *
+     * @return string the return string
+     */
+    public static function toString($bytes)
+    {
+        $str = '';
+        foreach ($bytes as $ch) {
+            $str .= \chr($ch);
+        }
+
+        return $str;
+    }
+
     /**
      * @return array
      */

Server/vendor/alibabacloud/tea/src/Request.php

@@ -89,11 +89,15 @@ class Request extends PsrRequest
             if ($this->body instanceof StreamInterface) {
                 $request = $request->withBody($this->body);
             } else {
+                $body = $this->body;
+                if (Helper::isBytes($this->body)) {
+                    $body = Helper::toString($this->body);
+                }
                 if (\function_exists('\GuzzleHttp\Psr7\stream_for')) {
                     // @deprecated stream_for will be removed in guzzlehttp/psr7:2.0
-                    $request = $request->withBody(\GuzzleHttp\Psr7\stream_for($this->body));
+                    $request = $request->withBody(\GuzzleHttp\Psr7\stream_for($body));
                 } else {
-                    $request = $request->withBody(\GuzzleHttp\Psr7\Utils::streamFor($this->body));
+                    $request = $request->withBody(\GuzzleHttp\Psr7\Utils::streamFor($body));
                 }
             }
         }

Server/vendor/alibabacloud/tea/src/Tea.php

@@ -273,6 +273,9 @@ class Tea
         if (isset($config['noProxy']) && !empty($config['noProxy'])) {
             $options->set('proxy.no', $config['noProxy']);
         }
+        if (isset($config['ignoreSSL']) && !empty($config['ignoreSSL'])) {
+            $options->set('verify',!((bool)$config['ignoreSSL']));
+        }
         // readTimeout&connectTimeout unit is millisecond
         $read_timeout = isset($config['readTimeout']) && !empty($config['readTimeout']) ? (int) $config['readTimeout'] : 0;
         $con_timeout  = isset($config['connectTimeout']) && !empty($config['connectTimeout']) ? (int) $config['connectTimeout'] : 0;