vendor

vendor/alibabacloud/darabonba-openapi/composer.json

@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": ">5.5",
-    "alibabacloud/tea-utils": "^0.2.20",
+    "alibabacloud/tea-utils": "^0.2.19",
     "alibabacloud/credentials": "^1.1",
     "alibabacloud/openapi-util": "^0.1.10|^0.2.1",
     "alibabacloud/gateway-spi": "^1",

vendor/alibabacloud/darabonba-openapi/src/Models/Config.php

@@ -17,7 +17,6 @@ class Config extends Model
         'accessKeyId' => '',
         'accessKeySecret' => '',
         'securityToken' => '',
-        'bearerToken' => '',
         'protocol' => 'http',
         'method' => '',
         'regionId' => '',
@@ -58,9 +57,6 @@ class Config extends Model
         if (null !== $this->securityToken) {
             $res['securityToken'] = $this->securityToken;
         }
-        if (null !== $this->bearerToken) {
-            $res['bearerToken'] = $this->bearerToken;
-        }
         if (null !== $this->protocol) {
             $res['protocol'] = $this->protocol;
         }
@@ -136,9 +132,6 @@ class Config extends Model
         if (null !== $this->ca) {
             $res['ca'] = $this->ca;
         }
-        if (null !== $this->disableHttp2) {
-            $res['disableHttp2'] = $this->disableHttp2;
-        }
         return $res;
     }
     /**
@@ -157,9 +150,6 @@ class Config extends Model
         if (isset($map['securityToken'])) {
             $model->securityToken = $map['securityToken'];
         }
-        if (isset($map['bearerToken'])) {
-            $model->bearerToken = $map['bearerToken'];
-        }
         if (isset($map['protocol'])) {
             $model->protocol = $map['protocol'];
         }
@@ -235,9 +225,6 @@ class Config extends Model
         if (isset($map['ca'])) {
             $model->ca = $map['ca'];
         }
-        if (isset($map['disableHttp2'])) {
-            $model->disableHttp2 = $map['disableHttp2'];
-        }
         return $model;
     }
     /**
@@ -259,13 +246,6 @@ class Config extends Model
      */
     public $securityToken;
 
-    /**
-     * @description bearer token
-     * @example the-bearer-token
-     * @var string
-     */
-    public $bearerToken;
-
     /**
      * @description http protocol
      * @example http
@@ -428,23 +408,17 @@ class Config extends Model
 
     /**
      * @description client certificate
-     * @example -----BEGIN CERTIFICATE-----xxx-----END CERTIFICATE-----
+     * @example -----BEGIN CERTIFICATE-----
+xxx-----END CERTIFICATE-----
      * @var string
      */
     public $cert;
 
     /**
      * @description server certificate
-     * @example -----BEGIN CERTIFICATE-----xxx-----END CERTIFICATE-----
+     * @example -----BEGIN CERTIFICATE-----
+xxx-----END CERTIFICATE-----
      * @var string
      */
     public $ca;
-
-    /**
-     * @description disable HTTP/2
-     * @example false
-     * @var bool
-     */
-    public $disableHttp2;
-
 }

vendor/alibabacloud/darabonba-openapi/src/Models/GlobalParameters.php

@@ -39,5 +39,4 @@ class GlobalParameters extends Model
     public $headers;
 
     public $queries;
-
 }

vendor/alibabacloud/darabonba-openapi/src/Models/OpenApiRequest.php

@@ -71,5 +71,4 @@ class OpenApiRequest extends Model
     public $hostMap;
 
     public $endpointOverride;
-
 }

vendor/alibabacloud/darabonba-openapi/src/Models/Params.php

@@ -127,5 +127,4 @@ class Params extends Model
     public $reqBodyType;
 
     public $style;
-
 }

vendor/alibabacloud/darabonba-openapi/src/OpenApiClient.php

@@ -86,8 +86,6 @@ class OpenApiClient
 
     protected $_ca;
 
-    protected $_disableHttp2;
-
     /**
      * Init client with Config
      * @param config config contains the necessary information to create a client
@@ -113,12 +111,6 @@ class OpenApiClient
             ]);
             $credentialConfig->securityToken = $config->securityToken;
             $this->_credential = new Credential($credentialConfig);
-        } else if (!Utils::empty_($config->bearerToken)) {
-            $cc = new Config([
-                "type" => "bearer",
-                "bearerToken" => $config->bearerToken
-            ]);
-            $this->_credential = new Credential($cc);
         } else if (!Utils::isUnset($config->credential)) {
             $this->_credential = $config->credential;
         }
@@ -144,7 +136,6 @@ class OpenApiClient
         $this->_key = $config->key;
         $this->_cert = $config->cert;
         $this->_ca = $config->ca;
-        $this->_disableHttp2 = $config->disableHttp2;
     }
 
     /**
@@ -217,13 +208,6 @@ class OpenApiClient
                         $globalHeaders = $globalParams->headers;
                     }
                 }
-                $extendsHeaders = [];
-                if (!Utils::isUnset($runtime->extendsParameters)) {
-                    $extendsParameters = $runtime->extendsParameters;
-                    if (!Utils::isUnset($extendsParameters->headers)) {
-                        $extendsHeaders = $extendsParameters->headers;
-                    }
-                }
                 $_request->query = Tea::merge([
                     "Action" => $action,
                     "Format" => "json",
@@ -239,14 +223,14 @@ class OpenApiClient
                         "x-acs-version" => $version,
                         "x-acs-action" => $action,
                         "user-agent" => $this->getUserAgent()
-                    ], $globalHeaders, $extendsHeaders);
+                    ], $globalHeaders);
                 } else {
                     $_request->headers = Tea::merge([
                         "host" => $this->_endpoint,
                         "x-acs-version" => $version,
                         "x-acs-action" => $action,
                         "user-agent" => $this->getUserAgent()
-                    ], $globalHeaders, $extendsHeaders, $headers);
+                    ], $globalHeaders, $headers);
                 }
                 if (!Utils::isUnset($request->body)) {
                     $m = Utils::assertAsMap($request->body);
@@ -255,28 +239,21 @@ class OpenApiClient
                     $_request->headers["content-type"] = "application/x-www-form-urlencoded";
                 }
                 if (!Utils::equalString($authType, "Anonymous")) {
-                    $credentialType = $this->getType();
-                    if (Utils::equalString($credentialType, "bearer")) {
-                        $bearerToken = $this->getBearerToken();
-                        $_request->query["BearerToken"] = $bearerToken;
-                        $_request->query["SignatureType"] = "BEARERTOKEN";
-                    } else {
-                        $accessKeyId = $this->getAccessKeyId();
-                        $accessKeySecret = $this->getAccessKeySecret();
-                        $securityToken = $this->getSecurityToken();
-                        if (!Utils::empty_($securityToken)) {
-                            $_request->query["SecurityToken"] = $securityToken;
-                        }
-                        $_request->query["SignatureMethod"] = "HMAC-SHA1";
-                        $_request->query["SignatureVersion"] = "1.0";
-                        $_request->query["AccessKeyId"] = $accessKeyId;
-                        $t = null;
-                        if (!Utils::isUnset($request->body)) {
-                            $t = Utils::assertAsMap($request->body);
-                        }
-                        $signedParam = Tea::merge($_request->query, OpenApiUtilClient::query($t));
-                        $_request->query["Signature"] = OpenApiUtilClient::getRPCSignature($signedParam, $_request->method, $accessKeySecret);
+                    $accessKeyId = $this->getAccessKeyId();
+                    $accessKeySecret = $this->getAccessKeySecret();
+                    $securityToken = $this->getSecurityToken();
+                    if (!Utils::empty_($securityToken)) {
+                        $_request->query["SecurityToken"] = $securityToken;
                     }
+                    $_request->query["SignatureMethod"] = "HMAC-SHA1";
+                    $_request->query["SignatureVersion"] = "1.0";
+                    $_request->query["AccessKeyId"] = $accessKeyId;
+                    $t = null;
+                    if (!Utils::isUnset($request->body)) {
+                        $t = Utils::assertAsMap($request->body);
+                    }
+                    $signedParam = Tea::merge($_request->query, OpenApiUtilClient::query($t));
+                    $_request->query["Signature"] = OpenApiUtilClient::getRPCSignature($signedParam, $_request->method, $accessKeySecret);
                 }
                 $_lastRequest = $_request;
                 $_response = Tea::send($_request, $_runtime);
@@ -420,13 +397,6 @@ class OpenApiClient
                         $globalHeaders = $globalParams->headers;
                     }
                 }
-                $extendsHeaders = [];
-                if (!Utils::isUnset($runtime->extendsParameters)) {
-                    $extendsParameters = $runtime->extendsParameters;
-                    if (!Utils::isUnset($extendsParameters->headers)) {
-                        $extendsHeaders = $extendsParameters->headers;
-                    }
-                }
                 $_request->headers = Tea::merge([
                     "date" => Utils::getDateUTCString(),
                     "host" => $this->_endpoint,
@@ -437,7 +407,7 @@ class OpenApiClient
                     "x-acs-version" => $version,
                     "x-acs-action" => $action,
                     "user-agent" => Utils::getUserAgent($this->_userAgent)
-                ], $globalHeaders, $extendsHeaders, $request->headers);
+                ], $globalHeaders, $request->headers);
                 if (!Utils::isUnset($request->body)) {
                     $_request->body = Utils::toJSONString($request->body);
                     $_request->headers["content-type"] = "application/json; charset=utf-8";
@@ -447,22 +417,15 @@ class OpenApiClient
                     $_request->query = Tea::merge($_request->query, $request->query);
                 }
                 if (!Utils::equalString($authType, "Anonymous")) {
-                    $credentialType = $this->getType();
-                    if (Utils::equalString($credentialType, "bearer")) {
-                        $bearerToken = $this->getBearerToken();
-                        $_request->headers["x-acs-bearer-token"] = $bearerToken;
-                        $_request->headers["x-acs-signature-type"] = "BEARERTOKEN";
-                    } else {
-                        $accessKeyId = $this->getAccessKeyId();
-                        $accessKeySecret = $this->getAccessKeySecret();
-                        $securityToken = $this->getSecurityToken();
-                        if (!Utils::empty_($securityToken)) {
-                            $_request->headers["x-acs-accesskey-id"] = $accessKeyId;
-                            $_request->headers["x-acs-security-token"] = $securityToken;
-                        }
-                        $stringToSign = OpenApiUtilClient::getStringToSign($_request);
-                        $_request->headers["authorization"] = "acs " . $accessKeyId . ":" . OpenApiUtilClient::getROASignature($stringToSign, $accessKeySecret) . "";
+                    $accessKeyId = $this->getAccessKeyId();
+                    $accessKeySecret = $this->getAccessKeySecret();
+                    $securityToken = $this->getSecurityToken();
+                    if (!Utils::empty_($securityToken)) {
+                        $_request->headers["x-acs-accesskey-id"] = $accessKeyId;
+                        $_request->headers["x-acs-security-token"] = $securityToken;
                     }
+                    $stringToSign = OpenApiUtilClient::getStringToSign($_request);
+                    $_request->headers["authorization"] = "acs " . $accessKeyId . ":" . OpenApiUtilClient::getROASignature($stringToSign, $accessKeySecret) . "";
                 }
                 $_lastRequest = $_request;
                 $_response = Tea::send($_request, $_runtime);
@@ -612,13 +575,6 @@ class OpenApiClient
                         $globalHeaders = $globalParams->headers;
                     }
                 }
-                $extendsHeaders = [];
-                if (!Utils::isUnset($runtime->extendsParameters)) {
-                    $extendsParameters = $runtime->extendsParameters;
-                    if (!Utils::isUnset($extendsParameters->headers)) {
-                        $extendsHeaders = $extendsParameters->headers;
-                    }
-                }
                 $_request->headers = Tea::merge([
                     "date" => Utils::getDateUTCString(),
                     "host" => $this->_endpoint,
@@ -629,7 +585,7 @@ class OpenApiClient
                     "x-acs-version" => $version,
                     "x-acs-action" => $action,
                     "user-agent" => Utils::getUserAgent($this->_userAgent)
-                ], $globalHeaders, $extendsHeaders, $request->headers);
+                ], $globalHeaders, $request->headers);
                 if (!Utils::isUnset($request->body)) {
                     $m = Utils::assertAsMap($request->body);
                     $_request->body = OpenApiUtilClient::toForm($m);
@@ -640,22 +596,15 @@ class OpenApiClient
                     $_request->query = Tea::merge($_request->query, $request->query);
                 }
                 if (!Utils::equalString($authType, "Anonymous")) {
-                    $credentialType = $this->getType();
-                    if (Utils::equalString($credentialType, "bearer")) {
-                        $bearerToken = $this->getBearerToken();
-                        $_request->headers["x-acs-bearer-token"] = $bearerToken;
-                        $_request->headers["x-acs-signature-type"] = "BEARERTOKEN";
-                    } else {
-                        $accessKeyId = $this->getAccessKeyId();
-                        $accessKeySecret = $this->getAccessKeySecret();
-                        $securityToken = $this->getSecurityToken();
-                        if (!Utils::empty_($securityToken)) {
-                            $_request->headers["x-acs-accesskey-id"] = $accessKeyId;
-                            $_request->headers["x-acs-security-token"] = $securityToken;
-                        }
-                        $stringToSign = OpenApiUtilClient::getStringToSign($_request);
-                        $_request->headers["authorization"] = "acs " . $accessKeyId . ":" . OpenApiUtilClient::getROASignature($stringToSign, $accessKeySecret) . "";
+                    $accessKeyId = $this->getAccessKeyId();
+                    $accessKeySecret = $this->getAccessKeySecret();
+                    $securityToken = $this->getSecurityToken();
+                    if (!Utils::empty_($securityToken)) {
+                        $_request->headers["x-acs-accesskey-id"] = $accessKeyId;
+                        $_request->headers["x-acs-security-token"] = $securityToken;
                     }
+                    $stringToSign = OpenApiUtilClient::getStringToSign($_request);
+                    $_request->headers["authorization"] = "acs " . $accessKeyId . ":" . OpenApiUtilClient::getROASignature($stringToSign, $accessKeySecret) . "";
                 }
                 $_lastRequest = $_request;
                 $_response = Tea::send($_request, $_runtime);
@@ -798,13 +747,6 @@ class OpenApiClient
                         $globalHeaders = $globalParams->headers;
                     }
                 }
-                $extendsHeaders = [];
-                if (!Utils::isUnset($runtime->extendsParameters)) {
-                    $extendsParameters = $runtime->extendsParameters;
-                    if (!Utils::isUnset($extendsParameters->headers)) {
-                        $extendsHeaders = $extendsParameters->headers;
-                    }
-                }
                 $_request->query = Tea::merge($globalQueries, $request->query);
                 // endpoint is setted in product client
                 $_request->headers = Tea::merge([
@@ -815,7 +757,7 @@ class OpenApiClient
                     "x-acs-date" => OpenApiUtilClient::getTimestamp(),
                     "x-acs-signature-nonce" => Utils::getNonce(),
                     "accept" => "application/json"
-                ], $globalHeaders, $extendsHeaders, $request->headers);
+                ], $globalHeaders, $request->headers);
                 if (Utils::equalString($params->style, "RPC")) {
                     $headers = $this->getRpcHeaders();
                     if (!Utils::isUnset($headers)) {
@@ -855,11 +797,6 @@ class OpenApiClient
                     if (Utils::equalString($authType, "bearer")) {
                         $bearerToken = $this->getBearerToken();
                         $_request->headers["x-acs-bearer-token"] = $bearerToken;
-                        if (Utils::equalString($params->style, "RPC")) {
-                            $_request->query["SignatureType"] = "BEARERTOKEN";
-                        } else {
-                            $_request->headers["x-acs-signature-type"] = "BEARERTOKEN";
-                        }
                     } else {
                         $accessKeyId = $this->getAccessKeyId();
                         $accessKeySecret = $this->getAccessKeySecret();
@@ -979,8 +916,7 @@ class OpenApiClient
                 "policy" => Utils::defaultString($runtime->backoffPolicy, "no"),
                 "period" => Utils::defaultNumber($runtime->backoffPeriod, 1)
             ],
-            "ignoreSSL" => $runtime->ignoreSSL,
-            "disableHttp2" => self::defaultAny($this->_disableHttp2, false)
+            "ignoreSSL" => $runtime->ignoreSSL
         ];
         $_lastRequest = null;
         $_lastException = null;
@@ -1009,15 +945,8 @@ class OpenApiClient
                         $globalHeaders = $globalParams->headers;
                     }
                 }
-                $extendsHeaders = [];
-                if (!Utils::isUnset($runtime->extendsParameters)) {
-                    $extendsParameters = $runtime->extendsParameters;
-                    if (!Utils::isUnset($extendsParameters->headers)) {
-                        $extendsHeaders = $extendsParameters->headers;
-                    }
-                }
                 $requestContext = new \Darabonba\GatewaySpi\Models\InterceptorContext\request([
-                    "headers" => Tea::merge($globalHeaders, $extendsHeaders, $request->headers, $headers),
+                    "headers" => Tea::merge($globalHeaders, $request->headers, $headers),
                     "query" => Tea::merge($globalQueries, $request->query),
                     "body" => $request->body,
                     "stream" => $request->stream,

vendor/alibabacloud/dm-20170622/ChangeLog.md

@@ -1,11 +1,3 @@
-2024-04-10 Version: 1.2.2
-- Update API BatchSendMail: add param UnSubscribeFilterLevel.
-- Update API BatchSendMail: add param UnSubscribeLinkType.
-- Update API SenderStatisticsDetailByParam: update response param.
-- Update API SingleSendMail: add param UnSubscribeFilterLevel.
-- Update API SingleSendMail: add param UnSubscribeLinkType.
-
-
 2024-02-20 Version: 1.2.1
 - Update API BatchSendMail: add param UnSubscribeFilterLevel.
 - Update API BatchSendMail: add param UnSubscribeLinkType.