diff --git a/CHANGELOG b/CHANGELOG index c46cbc7ff..61122a3cf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-04-27 Version: 1.36.383 +- Support watermark. + 2020-04-27 Version: 1.36.382 - Describe describeAvailableResource. diff --git a/VERSION b/VERSION index 72e721299..8983facdb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.382 \ No newline at end of file +1.36.383 \ No newline at end of file diff --git a/imm/include/alibabacloud/imm/model/GetOfficePreviewURLRequest.h b/imm/include/alibabacloud/imm/model/GetOfficePreviewURLRequest.h index d16947c8c..d87250c18 100644 --- a/imm/include/alibabacloud/imm/model/GetOfficePreviewURLRequest.h +++ b/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_; }; } diff --git a/imm/src/model/GetOfficePreviewURLRequest.cc b/imm/src/model/GetOfficePreviewURLRequest.cc index d34a787c9..238d5a271 100644 --- a/imm/src/model/GetOfficePreviewURLRequest.cc +++ b/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); +} +