Sync cdn APIs.

1. fixed code about delete char*
2. free curl_slist
3. added lock for EndpointProvider::LoadLocalEndpoints()

CHANGELOG

@@ -1,3 +1,19 @@
+2020-04-29 Version: 1.36.387
+- Sync cdn APIs.
+
+2020-04-29 Version: 1.36.386
+- Add Scdn APIS.
+- Sync cdn APIS.
+
+2020-04-28 Version: 1.36.385
+- Generated 2019-03-15 for `fnf`.
+
+2020-04-28 Version: 1.36.384
+- Add CompareFaceVerify API.
+
+2020-04-27 Version: 1.36.383
+- Support watermark.
+
 2020-04-27 Version: 1.36.382
 - Describe describeAvailableResource.
 

VERSION

@@ -1 +1 @@
-1.36.382
+1.36.387

cloudauth/CMakeLists.txt

@@ -21,6 +21,8 @@ set(cloudauth_public_header
 	include/alibabacloud/cloudauth/CloudauthExport.h )
 
 set(cloudauth_public_header_model 
+	include/alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h
+	include/alibabacloud/cloudauth/model/CompareFaceVerifyResult.h
 	include/alibabacloud/cloudauth/model/CompareFacesRequest.h
 	include/alibabacloud/cloudauth/model/CompareFacesResult.h
 	include/alibabacloud/cloudauth/model/ContrastFaceVerifyRequest.h
@@ -84,6 +86,8 @@ set(cloudauth_public_header_model
 
 set(cloudauth_src 
 	src/CloudauthClient.cc
+	src/model/CompareFaceVerifyRequest.cc
+	src/model/CompareFaceVerifyResult.cc
 	src/model/CompareFacesRequest.cc
 	src/model/CompareFacesResult.cc
 	src/model/ContrastFaceVerifyRequest.cc

cloudauth/include/alibabacloud/cloudauth/CloudauthClient.h

@@ -22,6 +22,8 @@
 #include <alibabacloud/core/EndpointProvider.h>
 #include <alibabacloud/core/RpcServiceClient.h>
 #include "CloudauthExport.h"
+#include "model/CompareFaceVerifyRequest.h"
+#include "model/CompareFaceVerifyResult.h"
 #include "model/CompareFacesRequest.h"
 #include "model/CompareFacesResult.h"
 #include "model/ContrastFaceVerifyRequest.h"
@@ -91,6 +93,9 @@ namespace AlibabaCloud
 		class ALIBABACLOUD_CLOUDAUTH_EXPORT CloudauthClient : public RpcServiceClient
 		{
 		public:
+			typedef Outcome<Error, Model::CompareFaceVerifyResult> CompareFaceVerifyOutcome;
+			typedef std::future<CompareFaceVerifyOutcome> CompareFaceVerifyOutcomeCallable;
+			typedef std::function<void(const CloudauthClient*, const Model::CompareFaceVerifyRequest&, const CompareFaceVerifyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFaceVerifyAsyncHandler;
 			typedef Outcome<Error, Model::CompareFacesResult> CompareFacesOutcome;
 			typedef std::future<CompareFacesOutcome> CompareFacesOutcomeCallable;
 			typedef std::function<void(const CloudauthClient*, const Model::CompareFacesRequest&, const CompareFacesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFacesAsyncHandler;
@@ -186,6 +191,9 @@ namespace AlibabaCloud
 			CloudauthClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
 			CloudauthClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
 			~CloudauthClient();
+			CompareFaceVerifyOutcome compareFaceVerify(const Model::CompareFaceVerifyRequest &request)const;
+			void compareFaceVerifyAsync(const Model::CompareFaceVerifyRequest& request, const CompareFaceVerifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CompareFaceVerifyOutcomeCallable compareFaceVerifyCallable(const Model::CompareFaceVerifyRequest& request) const;
 			CompareFacesOutcome compareFaces(const Model::CompareFacesRequest &request)const;
 			void compareFacesAsync(const Model::CompareFacesRequest& request, const CompareFacesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CompareFacesOutcomeCallable compareFacesCallable(const Model::CompareFacesRequest& request) const;

cloudauth/include/alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT CompareFaceVerifyRequest : public RpcServiceRequest
+			{
+
+			public:
+				CompareFaceVerifyRequest();
+				~CompareFaceVerifyRequest();
+
+				std::string getTargetFaceContrastPictureUrl()const;
+				void setTargetFaceContrastPictureUrl(const std::string& targetFaceContrastPictureUrl);
+				std::string getProductCode()const;
+				void setProductCode(const std::string& productCode);
+				std::string getTargetCertifyId()const;
+				void setTargetCertifyId(const std::string& targetCertifyId);
+				std::string getSourceOssObjectName()const;
+				void setSourceOssObjectName(const std::string& sourceOssObjectName);
+				std::string getTargetFaceContrastPicture()const;
+				void setTargetFaceContrastPicture(const std::string& targetFaceContrastPicture);
+				std::string getTargetOssBucketName()const;
+				void setTargetOssBucketName(const std::string& targetOssBucketName);
+				std::string getSourceOssBucketName()const;
+				void setSourceOssBucketName(const std::string& sourceOssBucketName);
+				std::string getOuterOrderNo()const;
+				void setOuterOrderNo(const std::string& outerOrderNo);
+				std::string getTargetOssObjectName()const;
+				void setTargetOssObjectName(const std::string& targetOssObjectName);
+				std::string getSourceFaceContrastPicture()const;
+				void setSourceFaceContrastPicture(const std::string& sourceFaceContrastPicture);
+				long getSceneId()const;
+				void setSceneId(long sceneId);
+				std::string getSourceFaceContrastPictureUrl()const;
+				void setSourceFaceContrastPictureUrl(const std::string& sourceFaceContrastPictureUrl);
+				std::string getSourceCertifyId()const;
+				void setSourceCertifyId(const std::string& sourceCertifyId);
+
+            private:
+				std::string targetFaceContrastPictureUrl_;
+				std::string productCode_;
+				std::string targetCertifyId_;
+				std::string sourceOssObjectName_;
+				std::string targetFaceContrastPicture_;
+				std::string targetOssBucketName_;
+				std::string sourceOssBucketName_;
+				std::string outerOrderNo_;
+				std::string targetOssObjectName_;
+				std::string sourceFaceContrastPicture_;
+				long sceneId_;
+				std::string sourceFaceContrastPictureUrl_;
+				std::string sourceCertifyId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_

cloudauth/include/alibabacloud/cloudauth/model/CompareFaceVerifyResult.h

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT CompareFaceVerifyResult : public ServiceResult
+			{
+			public:
+				struct ResultObject
+				{
+					std::string passed;
+					float verifyScore;
+				};
+
+
+				CompareFaceVerifyResult();
+				explicit CompareFaceVerifyResult(const std::string &payload);
+				~CompareFaceVerifyResult();
+				ResultObject getResultObject()const;
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				ResultObject resultObject_;
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_

cloudauth/include/alibabacloud/cloudauth/model/VerifyDeviceRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				VerifyDeviceRequest();
 				~VerifyDeviceRequest();
 
+				std::string getExtInfo()const;
+				void setExtInfo(const std::string& extInfo);
 				std::string getCertifyData()const;
 				void setCertifyData(const std::string& certifyData);
 				std::string getAppVersion()const;
@@ -43,6 +45,7 @@ namespace AlibabaCloud
 				void setCertifyId(const std::string& certifyId);
 
             private:
+				std::string extInfo_;
 				std::string certifyData_;
 				std::string appVersion_;
 				std::string certifyId_;

cloudauth/src/CloudauthClient.cc

@@ -51,6 +51,42 @@ CloudauthClient::CloudauthClient(const std::string & accessKeyId, const std::str
 CloudauthClient::~CloudauthClient()
 {}
 
+CloudauthClient::CompareFaceVerifyOutcome CloudauthClient::compareFaceVerify(const CompareFaceVerifyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CompareFaceVerifyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CompareFaceVerifyOutcome(CompareFaceVerifyResult(outcome.result()));
+	else
+		return CompareFaceVerifyOutcome(outcome.error());
+}
+
+void CloudauthClient::compareFaceVerifyAsync(const CompareFaceVerifyRequest& request, const CompareFaceVerifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, compareFaceVerify(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CloudauthClient::CompareFaceVerifyOutcomeCallable CloudauthClient::compareFaceVerifyCallable(const CompareFaceVerifyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CompareFaceVerifyOutcome()>>(
+			[this, request]()
+			{
+			return this->compareFaceVerify(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CloudauthClient::CompareFacesOutcome CloudauthClient::compareFaces(const CompareFacesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cloudauth/src/model/CompareFaceVerifyRequest.cc

@@ -0,0 +1,172 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h>
+
+using AlibabaCloud::Cloudauth::Model::CompareFaceVerifyRequest;
+
+CompareFaceVerifyRequest::CompareFaceVerifyRequest() :
+	RpcServiceRequest("cloudauth", "2019-03-07", "CompareFaceVerify")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CompareFaceVerifyRequest::~CompareFaceVerifyRequest()
+{}
+
+std::string CompareFaceVerifyRequest::getTargetFaceContrastPictureUrl()const
+{
+	return targetFaceContrastPictureUrl_;
+}
+
+void CompareFaceVerifyRequest::setTargetFaceContrastPictureUrl(const std::string& targetFaceContrastPictureUrl)
+{
+	targetFaceContrastPictureUrl_ = targetFaceContrastPictureUrl;
+	setBodyParameter("TargetFaceContrastPictureUrl", targetFaceContrastPictureUrl);
+}
+
+std::string CompareFaceVerifyRequest::getProductCode()const
+{
+	return productCode_;
+}
+
+void CompareFaceVerifyRequest::setProductCode(const std::string& productCode)
+{
+	productCode_ = productCode;
+	setBodyParameter("ProductCode", productCode);
+}
+
+std::string CompareFaceVerifyRequest::getTargetCertifyId()const
+{
+	return targetCertifyId_;
+}
+
+void CompareFaceVerifyRequest::setTargetCertifyId(const std::string& targetCertifyId)
+{
+	targetCertifyId_ = targetCertifyId;
+	setBodyParameter("TargetCertifyId", targetCertifyId);
+}
+
+std::string CompareFaceVerifyRequest::getSourceOssObjectName()const
+{
+	return sourceOssObjectName_;
+}
+
+void CompareFaceVerifyRequest::setSourceOssObjectName(const std::string& sourceOssObjectName)
+{
+	sourceOssObjectName_ = sourceOssObjectName;
+	setBodyParameter("SourceOssObjectName", sourceOssObjectName);
+}
+
+std::string CompareFaceVerifyRequest::getTargetFaceContrastPicture()const
+{
+	return targetFaceContrastPicture_;
+}
+
+void CompareFaceVerifyRequest::setTargetFaceContrastPicture(const std::string& targetFaceContrastPicture)
+{
+	targetFaceContrastPicture_ = targetFaceContrastPicture;
+	setBodyParameter("TargetFaceContrastPicture", targetFaceContrastPicture);
+}
+
+std::string CompareFaceVerifyRequest::getTargetOssBucketName()const
+{
+	return targetOssBucketName_;
+}
+
+void CompareFaceVerifyRequest::setTargetOssBucketName(const std::string& targetOssBucketName)
+{
+	targetOssBucketName_ = targetOssBucketName;
+	setBodyParameter("TargetOssBucketName", targetOssBucketName);
+}
+
+std::string CompareFaceVerifyRequest::getSourceOssBucketName()const
+{
+	return sourceOssBucketName_;
+}
+
+void CompareFaceVerifyRequest::setSourceOssBucketName(const std::string& sourceOssBucketName)
+{
+	sourceOssBucketName_ = sourceOssBucketName;
+	setBodyParameter("SourceOssBucketName", sourceOssBucketName);
+}
+
+std::string CompareFaceVerifyRequest::getOuterOrderNo()const
+{
+	return outerOrderNo_;
+}
+
+void CompareFaceVerifyRequest::setOuterOrderNo(const std::string& outerOrderNo)
+{
+	outerOrderNo_ = outerOrderNo;
+	setBodyParameter("OuterOrderNo", outerOrderNo);
+}
+
+std::string CompareFaceVerifyRequest::getTargetOssObjectName()const
+{
+	return targetOssObjectName_;
+}
+
+void CompareFaceVerifyRequest::setTargetOssObjectName(const std::string& targetOssObjectName)
+{
+	targetOssObjectName_ = targetOssObjectName;
+	setBodyParameter("TargetOssObjectName", targetOssObjectName);
+}
+
+std::string CompareFaceVerifyRequest::getSourceFaceContrastPicture()const
+{
+	return sourceFaceContrastPicture_;
+}
+
+void CompareFaceVerifyRequest::setSourceFaceContrastPicture(const std::string& sourceFaceContrastPicture)
+{
+	sourceFaceContrastPicture_ = sourceFaceContrastPicture;
+	setBodyParameter("SourceFaceContrastPicture", sourceFaceContrastPicture);
+}
+
+long CompareFaceVerifyRequest::getSceneId()const
+{
+	return sceneId_;
+}
+
+void CompareFaceVerifyRequest::setSceneId(long sceneId)
+{
+	sceneId_ = sceneId;
+	setBodyParameter("SceneId", std::to_string(sceneId));
+}
+
+std::string CompareFaceVerifyRequest::getSourceFaceContrastPictureUrl()const
+{
+	return sourceFaceContrastPictureUrl_;
+}
+
+void CompareFaceVerifyRequest::setSourceFaceContrastPictureUrl(const std::string& sourceFaceContrastPictureUrl)
+{
+	sourceFaceContrastPictureUrl_ = sourceFaceContrastPictureUrl;
+	setBodyParameter("SourceFaceContrastPictureUrl", sourceFaceContrastPictureUrl);
+}
+
+std::string CompareFaceVerifyRequest::getSourceCertifyId()const
+{
+	return sourceCertifyId_;
+}
+
+void CompareFaceVerifyRequest::setSourceCertifyId(const std::string& sourceCertifyId)
+{
+	sourceCertifyId_ = sourceCertifyId;
+	setBodyParameter("SourceCertifyId", sourceCertifyId);
+}
+

cloudauth/src/model/CompareFaceVerifyResult.cc

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/cloudauth/model/CompareFaceVerifyResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cloudauth;
+using namespace AlibabaCloud::Cloudauth::Model;
+
+CompareFaceVerifyResult::CompareFaceVerifyResult() :
+	ServiceResult()
+{}
+
+CompareFaceVerifyResult::CompareFaceVerifyResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CompareFaceVerifyResult::~CompareFaceVerifyResult()
+{}
+
+void CompareFaceVerifyResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto resultObjectNode = value["ResultObject"];
+	if(!resultObjectNode["Passed"].isNull())
+		resultObject_.passed = resultObjectNode["Passed"].asString();
+	if(!resultObjectNode["VerifyScore"].isNull())
+		resultObject_.verifyScore = std::stof(resultObjectNode["VerifyScore"].asString());
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+
+}
+
+CompareFaceVerifyResult::ResultObject CompareFaceVerifyResult::getResultObject()const
+{
+	return resultObject_;
+}
+
+std::string CompareFaceVerifyResult::getMessage()const
+{
+	return message_;
+}
+
+std::string CompareFaceVerifyResult::getCode()const
+{
+	return code_;
+}
+

cloudauth/src/model/VerifyDeviceRequest.cc

@@ -27,6 +27,17 @@ VerifyDeviceRequest::VerifyDeviceRequest() :
 VerifyDeviceRequest::~VerifyDeviceRequest()
 {}
 
+std::string VerifyDeviceRequest::getExtInfo()const
+{
+	return extInfo_;
+}
+
+void VerifyDeviceRequest::setExtInfo(const std::string& extInfo)
+{
+	extInfo_ = extInfo;
+	setBodyParameter("ExtInfo", extInfo);
+}
+
 std::string VerifyDeviceRequest::getCertifyData()const
 {
 	return certifyData_;

core/src/CurlHttpClient.cc

@@ -221,6 +221,7 @@ CurlHttpClient::makeRequest(const HttpRequest &request) {
           HttpMethodToString(request.method()) + " " + request.url().toString()));
     }
   }
+  curl_slist_free_all(list);
 }
 
 }  // namespace AlibabaCloud

core/src/EndpointProvider.cc

@@ -19,6 +19,9 @@
 #include <iomanip>
 #include <json/json.h>
 #include <sstream>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
 
 #ifndef WIN32
 #include "LocalEndpoints.h"
@@ -39,7 +42,10 @@ namespace
 #include <strings.h>
 #endif
 
+std::mutex mutex;
+std::condition_variable cv;
 bool local_endpoints_loaded = false;
+bool local_endpoints_loading = false;
 typedef std::string productType;
 typedef std::string regionType;
 typedef std::string endpointType;
@@ -60,6 +66,8 @@ static void LoadLocalEndpoints()
 {
   Json::Reader reader;
   Json::Value value;
+  std::unique_lock<std::mutex> lock(mutex);
+
   if (local_endpoints_loaded)
   {
     return;
@@ -76,6 +84,10 @@ static void LoadLocalEndpoints()
     return;
   }
 
+  cv.wait(lock, [] { return !local_endpoints_loading; });// continue if loading completed
+
+  local_endpoints_loading = true;
+
   auto regions = value["regions"];
   for (const auto &region : regions)
   {
@@ -107,6 +119,10 @@ static void LoadLocalEndpoints()
     allLocalEndpoints[product] = p;
   }
   local_endpoints_loaded = true;
+  local_endpoints_loading = false;
+
+  lock.unlock();
+  cv.notify_one();
 }
 
 } // namespace

core/src/HttpMessage.cc

@@ -139,7 +139,7 @@ HttpMessage::HeaderValueType HttpMessage::header(KnownHeader header)const {
 
 void HttpMessage::setBody(const char *data, size_t size) {
   if (body_)
-    delete body_;
+    delete[] body_;
   body_ = nullptr;
   bodySize_ = 0;
   if (size) {

fnf/include/alibabacloud/fnf/model/CreateFlowRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setName(const std::string& name);
 				std::string getDefinition()const;
 				void setDefinition(const std::string& definition);
+				std::string getExternalStorageLocation()const;
+				void setExternalStorageLocation(const std::string& externalStorageLocation);
 
             private:
 				std::string description_;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
 				std::string roleArn_;
 				std::string name_;
 				std::string definition_;
+				std::string externalStorageLocation_;
 
 			};
 		}

fnf/include/alibabacloud/fnf/model/CreateFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/DescribeExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/DescribeFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/ListExecutionsResult.h

@@ -39,7 +39,9 @@ namespace AlibabaCloud
 					std::string stoppedTime;
 					std::string flowName;
 					std::string output;
+					std::string externalOutputUri;
 					std::string startedTime;
+					std::string externalInputUri;
 					std::string flowDefinition;
 					std::string name;
 				};

fnf/include/alibabacloud/fnf/model/ListFlowsResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 					std::string definition;
 					std::string lastModifiedTime;
 					std::string id;
+					std::string externalStorageLocation;
 					std::string roleArn;
 					std::string name;
 				};

fnf/include/alibabacloud/fnf/model/StartExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/StopExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/UpdateFlowRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setName(const std::string& name);
 				std::string getDefinition()const;
 				void setDefinition(const std::string& definition);
+				std::string getExternalStorageLocation()const;
+				void setExternalStorageLocation(const std::string& externalStorageLocation);
 
             private:
 				std::string description_;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
 				std::string roleArn_;
 				std::string name_;
 				std::string definition_;
+				std::string externalStorageLocation_;
 
 			};
 		}

fnf/include/alibabacloud/fnf/model/UpdateFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/src/model/CreateFlowRequest.cc

@@ -93,3 +93,14 @@ void CreateFlowRequest::setDefinition(const std::string& definition)
 	setBodyParameter("Definition", definition);
 }
 
+std::string CreateFlowRequest::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
+void CreateFlowRequest::setExternalStorageLocation(const std::string& externalStorageLocation)
+{
+	externalStorageLocation_ = externalStorageLocation;
+	setBodyParameter("ExternalStorageLocation", externalStorageLocation);
+}
+

fnf/src/model/CreateFlowResult.cc

@@ -55,6 +55,8 @@ void CreateFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string CreateFlowResult::getId()const
 	return id_;
 }
 
+std::string CreateFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string CreateFlowResult::getRoleArn()const
 {
 	return roleArn_;

fnf/src/model/DescribeExecutionResult.cc

@@ -55,6 +55,10 @@ void DescribeExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string DescribeExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string DescribeExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string DescribeExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string DescribeExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string DescribeExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/DescribeFlowResult.cc

@@ -55,6 +55,8 @@ void DescribeFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string DescribeFlowResult::getId()const
 	return id_;
 }
 
+std::string DescribeFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string DescribeFlowResult::getRoleArn()const
 {
 	return roleArn_;

fnf/src/model/ListExecutionsResult.cc

@@ -59,6 +59,10 @@ void ListExecutionsResult::parse(const std::string &payload)
 			executionsObject.startedTime = valueExecutionsExecutionsItem["StartedTime"].asString();
 		if(!valueExecutionsExecutionsItem["StoppedTime"].isNull())
 			executionsObject.stoppedTime = valueExecutionsExecutionsItem["StoppedTime"].asString();
+		if(!valueExecutionsExecutionsItem["ExternalInputUri"].isNull())
+			executionsObject.externalInputUri = valueExecutionsExecutionsItem["ExternalInputUri"].asString();
+		if(!valueExecutionsExecutionsItem["ExternalOutputUri"].isNull())
+			executionsObject.externalOutputUri = valueExecutionsExecutionsItem["ExternalOutputUri"].asString();
 		executions_.push_back(executionsObject);
 	}
 	if(!value["NextToken"].isNull())

fnf/src/model/ListFlowsResult.cc

@@ -59,6 +59,8 @@ void ListFlowsResult::parse(const std::string &payload)
 			flowsObject.createdTime = valueFlowsFlowsItem["CreatedTime"].asString();
 		if(!valueFlowsFlowsItem["LastModifiedTime"].isNull())
 			flowsObject.lastModifiedTime = valueFlowsFlowsItem["LastModifiedTime"].asString();
+		if(!valueFlowsFlowsItem["ExternalStorageLocation"].isNull())
+			flowsObject.externalStorageLocation = valueFlowsFlowsItem["ExternalStorageLocation"].asString();
 		flows_.push_back(flowsObject);
 	}
 	if(!value["NextToken"].isNull())

fnf/src/model/StartExecutionResult.cc

@@ -55,6 +55,10 @@ void StartExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string StartExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string StartExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string StartExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string StartExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string StartExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/StopExecutionResult.cc

@@ -55,6 +55,10 @@ void StopExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string StopExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string StopExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string StopExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string StopExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string StopExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/UpdateFlowRequest.cc

@@ -93,3 +93,14 @@ void UpdateFlowRequest::setDefinition(const std::string& definition)
 	setBodyParameter("Definition", definition);
 }
 
+std::string UpdateFlowRequest::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
+void UpdateFlowRequest::setExternalStorageLocation(const std::string& externalStorageLocation)
+{
+	externalStorageLocation_ = externalStorageLocation;
+	setBodyParameter("ExternalStorageLocation", externalStorageLocation);
+}
+

fnf/src/model/UpdateFlowResult.cc

@@ -55,6 +55,8 @@ void UpdateFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string UpdateFlowResult::getId()const
 	return id_;
 }
 
+std::string UpdateFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string UpdateFlowResult::getRoleArn()const
 {
 	return roleArn_;

imm/include/alibabacloud/imm/model/GetOfficePreviewURLRequest.h

@@ -39,19 +39,37 @@ namespace AlibabaCloud
 				void setSrcType(const std::string& srcType);
 				std::string getProject()const;
 				void setProject(const std::string& project);
+				int getWatermarkVertical()const;
+				void setWatermarkVertical(int watermarkVertical);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				bool getUseOldURL()const;
-				void setUseOldURL(bool useOldURL);
+				int getWatermarkType()const;
+				void setWatermarkType(int watermarkType);
+				float getWatermarkRotate()const;
+				void setWatermarkRotate(float watermarkRotate);
+				std::string getWatermarkValue()const;
+				void setWatermarkValue(const std::string& watermarkValue);
+				std::string getWatermarkFont()const;
+				void setWatermarkFont(const std::string& watermarkFont);
+				int getWatermarkHorizontal()const;
+				void setWatermarkHorizontal(int watermarkHorizontal);
 				std::string getSrcUri()const;
 				void setSrcUri(const std::string& srcUri);
+				std::string getWatermarkFillStyle()const;
+				void setWatermarkFillStyle(const std::string& watermarkFillStyle);
 
             private:
 				std::string srcType_;
 				std::string project_;
+				int watermarkVertical_;
 				std::string accessKeyId_;
-				bool useOldURL_;
+				int watermarkType_;
+				float watermarkRotate_;
+				std::string watermarkValue_;
+				std::string watermarkFont_;
+				int watermarkHorizontal_;
 				std::string srcUri_;
+				std::string watermarkFillStyle_;
 
 			};
 		}

imm/src/model/GetOfficePreviewURLRequest.cc

@@ -49,6 +49,17 @@ void GetOfficePreviewURLRequest::setProject(const std::string& project)
 	setParameter("Project", project);
 }
 
+int GetOfficePreviewURLRequest::getWatermarkVertical()const
+{
+	return watermarkVertical_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkVertical(int watermarkVertical)
+{
+	watermarkVertical_ = watermarkVertical;
+	setParameter("WatermarkVertical", std::to_string(watermarkVertical));
+}
+
 std::string GetOfficePreviewURLRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -60,15 +71,59 @@ void GetOfficePreviewURLRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
-bool GetOfficePreviewURLRequest::getUseOldURL()const
+int GetOfficePreviewURLRequest::getWatermarkType()const
 {
-	return useOldURL_;
+	return watermarkType_;
 }
 
-void GetOfficePreviewURLRequest::setUseOldURL(bool useOldURL)
+void GetOfficePreviewURLRequest::setWatermarkType(int watermarkType)
 {
-	useOldURL_ = useOldURL;
-	setParameter("UseOldURL", useOldURL ? "true" : "false");
+	watermarkType_ = watermarkType;
+	setParameter("WatermarkType", std::to_string(watermarkType));
+}
+
+float GetOfficePreviewURLRequest::getWatermarkRotate()const
+{
+	return watermarkRotate_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkRotate(float watermarkRotate)
+{
+	watermarkRotate_ = watermarkRotate;
+	setParameter("WatermarkRotate", std::to_string(watermarkRotate));
+}
+
+std::string GetOfficePreviewURLRequest::getWatermarkValue()const
+{
+	return watermarkValue_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkValue(const std::string& watermarkValue)
+{
+	watermarkValue_ = watermarkValue;
+	setParameter("WatermarkValue", watermarkValue);
+}
+
+std::string GetOfficePreviewURLRequest::getWatermarkFont()const
+{
+	return watermarkFont_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkFont(const std::string& watermarkFont)
+{
+	watermarkFont_ = watermarkFont;
+	setParameter("WatermarkFont", watermarkFont);
+}
+
+int GetOfficePreviewURLRequest::getWatermarkHorizontal()const
+{
+	return watermarkHorizontal_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkHorizontal(int watermarkHorizontal)
+{
+	watermarkHorizontal_ = watermarkHorizontal;
+	setParameter("WatermarkHorizontal", std::to_string(watermarkHorizontal));
 }
 
 std::string GetOfficePreviewURLRequest::getSrcUri()const
@@ -82,3 +137,14 @@ void GetOfficePreviewURLRequest::setSrcUri(const std::string& srcUri)
 	setParameter("SrcUri", srcUri);
 }
 
+std::string GetOfficePreviewURLRequest::getWatermarkFillStyle()const
+{
+	return watermarkFillStyle_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkFillStyle(const std::string& watermarkFillStyle)
+{
+	watermarkFillStyle_ = watermarkFillStyle;
+	setParameter("WatermarkFillStyle", watermarkFillStyle);
+}
+