From 76ae1c452c83647107112cc7a3a4607956f7f1bd Mon Sep 17 00:00:00 2001 From: UCloud Date: Wed, 3 Aug 2022 16:01:49 +0800 Subject: [PATCH] sdk: rolling update for 1.0.6-release (#34) --- VERSION | 2 +- examples/generic/pom.xml | 4 +- examples/uhost/pom.xml | 4 +- pom.xml | 3 +- ucloud-sdk-java-common/pom.xml | 4 +- ucloud-sdk-java-cube/pom.xml | 6 +- ucloud-sdk-java-ipsecvpn/pom.xml | 6 +- ucloud-sdk-java-pathx/pom.xml | 6 +- ucloud-sdk-java-uaccount/pom.xml | 6 +- ucloud-sdk-java-ubill/pom.xml | 6 +- ucloud-sdk-java-ucdn/pom.xml | 6 +- ucloud-sdk-java-udb/pom.xml | 6 +- ucloud-sdk-java-uddb/pom.xml | 6 +- ucloud-sdk-java-udisk/pom.xml | 6 +- ucloud-sdk-java-udpn/pom.xml | 6 +- ucloud-sdk-java-uec/pom.xml | 6 +- ucloud-sdk-java-ufile/pom.xml | 6 +- ucloud-sdk-java-ufs/pom.xml | 6 +- ucloud-sdk-java-uhost/pom.xml | 6 +- ucloud-sdk-java-uk8s/pom.xml | 6 +- ucloud-sdk-java-ulb/pom.xml | 6 +- .../ucloud/ulb/models/CreateSSLRequest.java | 12 + .../ucloud/ulb/models/DescribeSSLRequest.java | 7 +- .../ulb/models/DescribeSSLResponse.java | 36 ++ .../ulb/models/DescribeULBResponse.java | 36 ++ .../ulb/models/DescribeVServerResponse.java | 36 ++ ucloud-sdk-java-umem/pom.xml | 6 +- ucloud-sdk-java-unet/pom.xml | 6 +- ucloud-sdk-java-uphone/pom.xml | 6 +- ucloud-sdk-java-uphost/pom.xml | 6 +- ucloud-sdk-java-uslk/pom.xml | 48 +++ .../cn/ucloud/uslk/client/USLKClient.java | 114 +++++ .../uslk/client/USLKClientInterface.java | 87 ++++ .../BatchCreateUSLKShortLinkRequest.java | 101 +++++ .../BatchCreateUSLKShortLinkResponse.java | 35 ++ .../models/CreateUSLKLongLinkRequest.java | 48 +++ .../models/CreateUSLKLongLinkResponse.java | 46 +++ .../models/CreateUSLKScenarioRequest.java | 48 +++ .../models/CreateUSLKScenarioResponse.java | 46 +++ .../models/CreateUSLKShortLinkRequest.java | 99 +++++ .../models/CreateUSLKShortLinkResponse.java | 34 ++ .../DescribeUSLKRedirectRecordsRequest.java | 121 ++++++ .../DescribeUSLKRedirectRecordsResponse.java | 182 ++++++++ .../DescribeUSLKShortLinkListRequest.java | 153 +++++++ .../DescribeUSLKShortLinkListResponse.java | 389 ++++++++++++++++++ ucloud-sdk-java-usms/pom.xml | 6 +- ucloud-sdk-java-uvms/pom.xml | 6 +- ucloud-sdk-java-vpc/pom.xml | 6 +- 48 files changed, 1754 insertions(+), 79 deletions(-) create mode 100644 ucloud-sdk-java-uslk/pom.xml create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/client/USLKClient.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/client/USLKClientInterface.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/BatchCreateUSLKShortLinkRequest.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/BatchCreateUSLKShortLinkResponse.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKLongLinkRequest.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKLongLinkResponse.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKScenarioRequest.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKScenarioResponse.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKShortLinkRequest.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKShortLinkResponse.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKRedirectRecordsRequest.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKRedirectRecordsResponse.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKShortLinkListRequest.java create mode 100644 ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKShortLinkListResponse.java diff --git a/VERSION b/VERSION index 35391357..2f009bf5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.5-release +1.0.6-release diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml index d4cf4e3e..6830423d 100644 --- a/examples/generic/pom.xml +++ b/examples/generic/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml index c939b943..df489c86 100644 --- a/examples/uhost/pom.xml +++ b/examples/uhost/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-uhost - 1.0.5-release + 1.0.6-release diff --git a/pom.xml b/pom.xml index e13f86f0..8f7e4de9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.ucloud ucloud-sdk-java pom - 1.0.5-release + 1.0.6-release ucloud-sdk-java-common ucloud-sdk-java-cube @@ -30,6 +30,7 @@ ucloud-sdk-java-unet ucloud-sdk-java-uphost ucloud-sdk-java-uphone + ucloud-sdk-java-uslk ucloud-sdk-java-usms ucloud-sdk-java-uvms ucloud-sdk-java-vpc diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml index 935694d3..2161278b 100644 --- a/ucloud-sdk-java-common/pom.xml +++ b/ucloud-sdk-java-common/pom.xml @@ -7,12 +7,12 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml index 0ad98708..c83d10f0 100644 --- a/ucloud-sdk-java-cube/pom.xml +++ b/ucloud-sdk-java-cube/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-cube - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml index 344803a4..656da47c 100644 --- a/ucloud-sdk-java-ipsecvpn/pom.xml +++ b/ucloud-sdk-java-ipsecvpn/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-ipsecvpn - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml index f566fe6d..49b8a6d7 100644 --- a/ucloud-sdk-java-pathx/pom.xml +++ b/ucloud-sdk-java-pathx/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-pathx - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml index 23d7db35..fe35efed 100644 --- a/ucloud-sdk-java-uaccount/pom.xml +++ b/ucloud-sdk-java-uaccount/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-uaccount - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml index a332c3b7..412dad6b 100644 --- a/ucloud-sdk-java-ubill/pom.xml +++ b/ucloud-sdk-java-ubill/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-ubill - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml index ab5e2b37..9ec73b3e 100644 --- a/ucloud-sdk-java-ucdn/pom.xml +++ b/ucloud-sdk-java-ucdn/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-ucdn - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml index 86731ae9..f345d02e 100644 --- a/ucloud-sdk-java-udb/pom.xml +++ b/ucloud-sdk-java-udb/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-udb - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uddb/pom.xml b/ucloud-sdk-java-uddb/pom.xml index 6f6ea254..bc95ca1c 100644 --- a/ucloud-sdk-java-uddb/pom.xml +++ b/ucloud-sdk-java-uddb/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-uddb - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-udisk/pom.xml b/ucloud-sdk-java-udisk/pom.xml index d3a9fbe3..d256e5bd 100644 --- a/ucloud-sdk-java-udisk/pom.xml +++ b/ucloud-sdk-java-udisk/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-udisk - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-udpn/pom.xml b/ucloud-sdk-java-udpn/pom.xml index 09fed8a0..56a9e853 100644 --- a/ucloud-sdk-java-udpn/pom.xml +++ b/ucloud-sdk-java-udpn/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-udpn - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uec/pom.xml b/ucloud-sdk-java-uec/pom.xml index 75849349..a0fa16a6 100644 --- a/ucloud-sdk-java-uec/pom.xml +++ b/ucloud-sdk-java-uec/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-uec - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-ufile/pom.xml b/ucloud-sdk-java-ufile/pom.xml index 38623d67..b590615e 100644 --- a/ucloud-sdk-java-ufile/pom.xml +++ b/ucloud-sdk-java-ufile/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-ufile - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-ufs/pom.xml b/ucloud-sdk-java-ufs/pom.xml index 9225c593..b5aaeb90 100644 --- a/ucloud-sdk-java-ufs/pom.xml +++ b/ucloud-sdk-java-ufs/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-ufs - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uhost/pom.xml b/ucloud-sdk-java-uhost/pom.xml index ccda3cb7..e2fe13d0 100644 --- a/ucloud-sdk-java-uhost/pom.xml +++ b/ucloud-sdk-java-uhost/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-uhost - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uk8s/pom.xml b/ucloud-sdk-java-uk8s/pom.xml index ad4cdd21..f98aa710 100644 --- a/ucloud-sdk-java-uk8s/pom.xml +++ b/ucloud-sdk-java-uk8s/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-uk8s - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-ulb/pom.xml b/ucloud-sdk-java-ulb/pom.xml index bd594db6..cb759f10 100644 --- a/ucloud-sdk-java-ulb/pom.xml +++ b/ucloud-sdk-java-ulb/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-ulb - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/CreateSSLRequest.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/CreateSSLRequest.java index 9c742c62..44feafae 100644 --- a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/CreateSSLRequest.java +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/CreateSSLRequest.java @@ -58,6 +58,10 @@ public class CreateSSLRequest extends Request { @UCloudParam("CaCert") private String caCert; + /** USSL证书的ID */ + @UCloudParam("USSLId") + private String usslId; + public String getRegion() { return region; } @@ -121,4 +125,12 @@ public String getCaCert() { public void setCaCert(String caCert) { this.caCert = caCert; } + + public String getUSSLId() { + return usslId; + } + + public void setUSSLId(String usslId) { + this.usslId = usslId; + } } diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeSSLRequest.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeSSLRequest.java index 484733de..83937300 100644 --- a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeSSLRequest.java +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeSSLRequest.java @@ -20,12 +20,15 @@ public class DescribeSSLRequest extends Request { - /** 地域。 参见 [地域和可用区列表](../summary/regionlist.html) */ + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @NotEmpty @UCloudParam("Region") private String region; - /** 项目ID。不填写为默认项目，子帐号必须填写。 请参考[GetProjectList接口](../summary/get_project_list.html) */ + /** + * 项目ID。不填写为默认项目，子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ @NotEmpty @UCloudParam("ProjectId") private String projectId; diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeSSLResponse.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeSSLResponse.java index 66575aee..60886b39 100644 --- a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeSSLResponse.java +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeSSLResponse.java @@ -126,6 +126,18 @@ public static class ULBSSLSet extends Response { @SerializedName("BindedTargetSet") private List bindedTargetSet; + /** SSL证书来源，SSL证书来源，0代表证书来自于ULB平台，1代表证书来自于USSL平台 */ + @SerializedName("SSLSource") + private Integer sslSource; + + /** USSL证书平台的编号,只有当SSLSource为1时才出现 */ + @SerializedName("USSLId") + private String usslId; + + /** USSL证书平台的域名,只有当SSLSource为1时才出现 */ + @SerializedName("Domains") + private String domains; + public String getSSLId() { return sslId; } @@ -181,5 +193,29 @@ public List getBindedTargetSet() { public void setBindedTargetSet(List bindedTargetSet) { this.bindedTargetSet = bindedTargetSet; } + + public Integer getSSLSource() { + return sslSource; + } + + public void setSSLSource(Integer sslSource) { + this.sslSource = sslSource; + } + + public String getUSSLId() { + return usslId; + } + + public void setUSSLId(String usslId) { + this.usslId = usslId; + } + + public String getDomains() { + return domains; + } + + public void setDomains(String domains) { + this.domains = domains; + } } } diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeULBResponse.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeULBResponse.java index 8956bdbb..0c88ce0e 100644 --- a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeULBResponse.java +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeULBResponse.java @@ -730,6 +730,18 @@ public static class ULBSSLSet extends Response { @SerializedName("BindedTargetSet") private List bindedTargetSet; + /** SSL证书来源，SSL证书来源，0代表证书来自于ULB平台，1代表证书来自于USSL平台 */ + @SerializedName("SSLSource") + private Integer sslSource; + + /** USSL证书平台的编号,只有当SSLSource为1时才出现 */ + @SerializedName("USSLId") + private String usslId; + + /** USSL证书平台的域名,只有当SSLSource为1时才出现 */ + @SerializedName("Domains") + private String domains; + public String getSSLId() { return sslId; } @@ -785,6 +797,30 @@ public List getBindedTargetSet() { public void setBindedTargetSet(List bindedTargetSet) { this.bindedTargetSet = bindedTargetSet; } + + public Integer getSSLSource() { + return sslSource; + } + + public void setSSLSource(Integer sslSource) { + this.sslSource = sslSource; + } + + public String getUSSLId() { + return usslId; + } + + public void setUSSLId(String usslId) { + this.usslId = usslId; + } + + public String getDomains() { + return domains; + } + + public void setDomains(String domains) { + this.domains = domains; + } } public static class ULBSet extends Response { diff --git a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeVServerResponse.java b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeVServerResponse.java index c2b1f855..cdb668c3 100644 --- a/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeVServerResponse.java +++ b/ucloud-sdk-java-ulb/src/main/java/cn/ucloud/ulb/models/DescribeVServerResponse.java @@ -601,6 +601,18 @@ public static class ULBSSLSet extends Response { @SerializedName("BindedTargetSet") private List bindedTargetSet; + /** SSL证书来源，SSL证书来源，0代表证书来自于ULB平台，1代表证书来自于USSL平台 */ + @SerializedName("SSLSource") + private Integer sslSource; + + /** USSL证书平台的编号,只有当SSLSource为1时才出现 */ + @SerializedName("USSLId") + private String usslId; + + /** USSL证书平台的域名,只有当SSLSource为1时才出现 */ + @SerializedName("Domains") + private String domains; + public String getSSLId() { return sslId; } @@ -656,6 +668,30 @@ public List getBindedTargetSet() { public void setBindedTargetSet(List bindedTargetSet) { this.bindedTargetSet = bindedTargetSet; } + + public Integer getSSLSource() { + return sslSource; + } + + public void setSSLSource(Integer sslSource) { + this.sslSource = sslSource; + } + + public String getUSSLId() { + return usslId; + } + + public void setUSSLId(String usslId) { + this.usslId = usslId; + } + + public String getDomains() { + return domains; + } + + public void setDomains(String domains) { + this.domains = domains; + } } public static class ULBVServerSet extends Response { diff --git a/ucloud-sdk-java-umem/pom.xml b/ucloud-sdk-java-umem/pom.xml index 915b0e25..2d9dae01 100644 --- a/ucloud-sdk-java-umem/pom.xml +++ b/ucloud-sdk-java-umem/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-umem - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-unet/pom.xml b/ucloud-sdk-java-unet/pom.xml index 9067e93c..1fa0a7a2 100644 --- a/ucloud-sdk-java-unet/pom.xml +++ b/ucloud-sdk-java-unet/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-unet - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uphone/pom.xml b/ucloud-sdk-java-uphone/pom.xml index 3cd9719d..0cd957ab 100644 --- a/ucloud-sdk-java-uphone/pom.xml +++ b/ucloud-sdk-java-uphone/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-uphone - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uphost/pom.xml b/ucloud-sdk-java-uphost/pom.xml index a0068dd6..8f866509 100644 --- a/ucloud-sdk-java-uphost/pom.xml +++ b/ucloud-sdk-java-uphost/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-uphost - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uslk/pom.xml b/ucloud-sdk-java-uslk/pom.xml new file mode 100644 index 00000000..a690e3b2 --- /dev/null +++ b/ucloud-sdk-java-uslk/pom.xml @@ -0,0 +1,48 @@ + + + + ucloud-sdk-java + cn.ucloud + 1.0.6-release + + + 4.0.0 + ucloud-sdk-java-uslk + 1.0.6-release + + + + cn.ucloud + ucloud-sdk-java-common + 1.0.6-release + + + + com.google.code.gson + gson + + + + commons-codec + commons-codec + + + org.apache.commons + commons-lang3 + + + + junit + junit + test + + + + org.slf4j + slf4j-simple + provided + + + \ No newline at end of file diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/client/USLKClient.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/client/USLKClient.java new file mode 100644 index 00000000..b62db7b1 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/client/USLKClient.java @@ -0,0 +1,114 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.client; + +import cn.ucloud.common.client.DefaultClient; +import cn.ucloud.common.config.Config; +import cn.ucloud.common.credential.Credential; +import cn.ucloud.common.exception.UCloudException; +import cn.ucloud.uslk.models.BatchCreateUSLKShortLinkRequest; +import cn.ucloud.uslk.models.BatchCreateUSLKShortLinkResponse; +import cn.ucloud.uslk.models.CreateUSLKLongLinkRequest; +import cn.ucloud.uslk.models.CreateUSLKLongLinkResponse; +import cn.ucloud.uslk.models.CreateUSLKScenarioRequest; +import cn.ucloud.uslk.models.CreateUSLKScenarioResponse; +import cn.ucloud.uslk.models.CreateUSLKShortLinkRequest; +import cn.ucloud.uslk.models.CreateUSLKShortLinkResponse; +import cn.ucloud.uslk.models.DescribeUSLKRedirectRecordsRequest; +import cn.ucloud.uslk.models.DescribeUSLKRedirectRecordsResponse; +import cn.ucloud.uslk.models.DescribeUSLKShortLinkListRequest; +import cn.ucloud.uslk.models.DescribeUSLKShortLinkListResponse; + +/** This client is used to call actions of **USLK** service */ +public class USLKClient extends DefaultClient implements USLKClientInterface { + public USLKClient(Config config, Credential credential) { + super(config, credential); + } + + /** + * BatchCreateUSLKShortLink - 批量创建短链接【免审】 + * + * @param request Request object + * @throws UCloudException Exception + */ + public BatchCreateUSLKShortLinkResponse batchCreateUSLKShortLink( + BatchCreateUSLKShortLinkRequest request) throws UCloudException { + request.setAction("BatchCreateUSLKShortLink"); + return (BatchCreateUSLKShortLinkResponse) + this.invoke(request, BatchCreateUSLKShortLinkResponse.class); + } + + /** + * CreateUSLKLongLink - 报备长链接 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateUSLKLongLinkResponse createUSLKLongLink(CreateUSLKLongLinkRequest request) + throws UCloudException { + request.setAction("CreateUSLKLongLink"); + return (CreateUSLKLongLinkResponse) this.invoke(request, CreateUSLKLongLinkResponse.class); + } + + /** + * CreateUSLKScenario - 创建场景 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateUSLKScenarioResponse createUSLKScenario(CreateUSLKScenarioRequest request) + throws UCloudException { + request.setAction("CreateUSLKScenario"); + return (CreateUSLKScenarioResponse) this.invoke(request, CreateUSLKScenarioResponse.class); + } + + /** + * CreateUSLKShortLink - 创建短链接 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateUSLKShortLinkResponse createUSLKShortLink(CreateUSLKShortLinkRequest request) + throws UCloudException { + request.setAction("CreateUSLKShortLink"); + return (CreateUSLKShortLinkResponse) + this.invoke(request, CreateUSLKShortLinkResponse.class); + } + + /** + * DescribeUSLKRedirectRecords - 查询短链接访问明细列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeUSLKRedirectRecordsResponse describeUSLKRedirectRecords( + DescribeUSLKRedirectRecordsRequest request) throws UCloudException { + request.setAction("DescribeUSLKRedirectRecords"); + return (DescribeUSLKRedirectRecordsResponse) + this.invoke(request, DescribeUSLKRedirectRecordsResponse.class); + } + + /** + * DescribeUSLKShortLinkList - 查询短链接列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeUSLKShortLinkListResponse describeUSLKShortLinkList( + DescribeUSLKShortLinkListRequest request) throws UCloudException { + request.setAction("DescribeUSLKShortLinkList"); + return (DescribeUSLKShortLinkListResponse) + this.invoke(request, DescribeUSLKShortLinkListResponse.class); + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/client/USLKClientInterface.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/client/USLKClientInterface.java new file mode 100644 index 00000000..ee7d7ed6 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/client/USLKClientInterface.java @@ -0,0 +1,87 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.client; + +import cn.ucloud.common.client.Client; +import cn.ucloud.common.exception.UCloudException; +import cn.ucloud.uslk.models.BatchCreateUSLKShortLinkRequest; +import cn.ucloud.uslk.models.BatchCreateUSLKShortLinkResponse; +import cn.ucloud.uslk.models.CreateUSLKLongLinkRequest; +import cn.ucloud.uslk.models.CreateUSLKLongLinkResponse; +import cn.ucloud.uslk.models.CreateUSLKScenarioRequest; +import cn.ucloud.uslk.models.CreateUSLKScenarioResponse; +import cn.ucloud.uslk.models.CreateUSLKShortLinkRequest; +import cn.ucloud.uslk.models.CreateUSLKShortLinkResponse; +import cn.ucloud.uslk.models.DescribeUSLKRedirectRecordsRequest; +import cn.ucloud.uslk.models.DescribeUSLKRedirectRecordsResponse; +import cn.ucloud.uslk.models.DescribeUSLKShortLinkListRequest; +import cn.ucloud.uslk.models.DescribeUSLKShortLinkListResponse; + +/** This client is used to call actions of **USLK** service */ +public interface USLKClientInterface extends Client { + + /** + * BatchCreateUSLKShortLink - 批量创建短链接【免审】 + * + * @param request Request object + * @throws UCloudException Exception + */ + public BatchCreateUSLKShortLinkResponse batchCreateUSLKShortLink( + BatchCreateUSLKShortLinkRequest request) throws UCloudException; + + /** + * CreateUSLKLongLink - 报备长链接 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateUSLKLongLinkResponse createUSLKLongLink(CreateUSLKLongLinkRequest request) + throws UCloudException; + + /** + * CreateUSLKScenario - 创建场景 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateUSLKScenarioResponse createUSLKScenario(CreateUSLKScenarioRequest request) + throws UCloudException; + + /** + * CreateUSLKShortLink - 创建短链接 + * + * @param request Request object + * @throws UCloudException Exception + */ + public CreateUSLKShortLinkResponse createUSLKShortLink(CreateUSLKShortLinkRequest request) + throws UCloudException; + + /** + * DescribeUSLKRedirectRecords - 查询短链接访问明细列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeUSLKRedirectRecordsResponse describeUSLKRedirectRecords( + DescribeUSLKRedirectRecordsRequest request) throws UCloudException; + + /** + * DescribeUSLKShortLinkList - 查询短链接列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeUSLKShortLinkListResponse describeUSLKShortLinkList( + DescribeUSLKShortLinkListRequest request) throws UCloudException; +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/BatchCreateUSLKShortLinkRequest.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/BatchCreateUSLKShortLinkRequest.java new file mode 100644 index 00000000..4782d9d0 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/BatchCreateUSLKShortLinkRequest.java @@ -0,0 +1,101 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +import java.util.List; + +public class BatchCreateUSLKShortLinkRequest extends Request { + + /** 场景ID */ + @NotEmpty + @UCloudParam("ScenarioID") + private Integer scenarioID; + + /** 长链接数组，示例: "LongLinks.0": "http://ucloud.cn/0", "LongLinks.1": "http://ucloud.cn/1" */ + @NotEmpty + @UCloudParam("LongLinks") + private List longLinks; + + /** 开始生效时间戳（秒级）, 传 3376656000 表示生成永久生效短链接 */ + @NotEmpty + @UCloudParam("StartTime") + private Integer startTime; + + /** 过期时间戳（秒级），传 3376656000 表示生成永久生效短链接 */ + @NotEmpty + @UCloudParam("EndTime") + private Integer endTime; + + /** 协议名称：http/https */ + @NotEmpty + @UCloudParam("Proto") + private String proto; + + /** 短链接域名 */ + @NotEmpty + @UCloudParam("ShortLinkDomain") + private String shortLinkDomain; + + public Integer getScenarioID() { + return scenarioID; + } + + public void setScenarioID(Integer scenarioID) { + this.scenarioID = scenarioID; + } + + public List getLongLinks() { + return longLinks; + } + + public void setLongLinks(List longLinks) { + this.longLinks = longLinks; + } + + public Integer getStartTime() { + return startTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } + + public String getProto() { + return proto; + } + + public void setProto(String proto) { + this.proto = proto; + } + + public String getShortLinkDomain() { + return shortLinkDomain; + } + + public void setShortLinkDomain(String shortLinkDomain) { + this.shortLinkDomain = shortLinkDomain; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/BatchCreateUSLKShortLinkResponse.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/BatchCreateUSLKShortLinkResponse.java new file mode 100644 index 00000000..3a7d30e0 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/BatchCreateUSLKShortLinkResponse.java @@ -0,0 +1,35 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class BatchCreateUSLKShortLinkResponse extends Response { + + /** 创建成功的短链接，根据传LongLinks顺序排列 */ + @SerializedName("ShortLinks") + private List shortLinks; + + public List getShortLinks() { + return shortLinks; + } + + public void setShortLinks(List shortLinks) { + this.shortLinks = shortLinks; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKLongLinkRequest.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKLongLinkRequest.java new file mode 100644 index 00000000..0e83d0f2 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKLongLinkRequest.java @@ -0,0 +1,48 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class CreateUSLKLongLinkRequest extends Request { + + /** 场景ID */ + @NotEmpty + @UCloudParam("ScenarioID") + private Integer scenarioID; + + /** 要报备的长链接 */ + @NotEmpty + @UCloudParam("LongLink") + private String longLink; + + public Integer getScenarioID() { + return scenarioID; + } + + public void setScenarioID(Integer scenarioID) { + this.scenarioID = scenarioID; + } + + public String getLongLink() { + return longLink; + } + + public void setLongLink(String longLink) { + this.longLink = longLink; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKLongLinkResponse.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKLongLinkResponse.java new file mode 100644 index 00000000..c3583d3d --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKLongLinkResponse.java @@ -0,0 +1,46 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +public class CreateUSLKLongLinkResponse extends Response { + + /** ReqUuid */ + @SerializedName("ReqUuid") + private String reqUuid; + + /** 长链接ID */ + @SerializedName("LongLinkID") + private Integer longLinkID; + + public String getReqUuid() { + return reqUuid; + } + + public void setReqUuid(String reqUuid) { + this.reqUuid = reqUuid; + } + + public Integer getLongLinkID() { + return longLinkID; + } + + public void setLongLinkID(Integer longLinkID) { + this.longLinkID = longLinkID; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKScenarioRequest.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKScenarioRequest.java new file mode 100644 index 00000000..5b31de71 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKScenarioRequest.java @@ -0,0 +1,48 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class CreateUSLKScenarioRequest extends Request { + + /** 场景名称 */ + @NotEmpty + @UCloudParam("Scenario") + private String scenario; + + /** 场景说明 */ + @NotEmpty + @UCloudParam("ScenarioDesc") + private String scenarioDesc; + + public String getScenario() { + return scenario; + } + + public void setScenario(String scenario) { + this.scenario = scenario; + } + + public String getScenarioDesc() { + return scenarioDesc; + } + + public void setScenarioDesc(String scenarioDesc) { + this.scenarioDesc = scenarioDesc; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKScenarioResponse.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKScenarioResponse.java new file mode 100644 index 00000000..205fc319 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKScenarioResponse.java @@ -0,0 +1,46 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +public class CreateUSLKScenarioResponse extends Response { + + /** ReqUuid */ + @SerializedName("ReqUuid") + private String reqUuid; + + /** 场景ID */ + @SerializedName("ScenarioID") + private Integer scenarioID; + + public String getReqUuid() { + return reqUuid; + } + + public void setReqUuid(String reqUuid) { + this.reqUuid = reqUuid; + } + + public Integer getScenarioID() { + return scenarioID; + } + + public void setScenarioID(Integer scenarioID) { + this.scenarioID = scenarioID; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKShortLinkRequest.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKShortLinkRequest.java new file mode 100644 index 00000000..cdaa2264 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKShortLinkRequest.java @@ -0,0 +1,99 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class CreateUSLKShortLinkRequest extends Request { + + /** 长链接ID，状态必须为审核通过 */ + @NotEmpty + @UCloudParam("LongLinkID") + private Integer longLinkID; + + /** 开始生效时间戳, 传 3376656000 表示生成永久生效短链接 */ + @NotEmpty + @UCloudParam("StartTime") + private Integer startTime; + + /** 过期时间戳，传 3376656000 表示生成永久生效短链接 */ + @NotEmpty + @UCloudParam("EndTime") + private Integer endTime; + + /** 链接类型-预留：普通跳转、随机跳转，当前默认普通跳转 1: 普通跳转 */ + @NotEmpty + @UCloudParam("Type") + private Integer type; + + /** 协议名称：http/https */ + @NotEmpty + @UCloudParam("Proto") + private String proto; + + /** 短链接域名，默认：uslk.net */ + @UCloudParam("ShortLinkDomain") + private String shortLinkDomain; + + public Integer getLongLinkID() { + return longLinkID; + } + + public void setLongLinkID(Integer longLinkID) { + this.longLinkID = longLinkID; + } + + public Integer getStartTime() { + return startTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getProto() { + return proto; + } + + public void setProto(String proto) { + this.proto = proto; + } + + public String getShortLinkDomain() { + return shortLinkDomain; + } + + public void setShortLinkDomain(String shortLinkDomain) { + this.shortLinkDomain = shortLinkDomain; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKShortLinkResponse.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKShortLinkResponse.java new file mode 100644 index 00000000..ee41eced --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/CreateUSLKShortLinkResponse.java @@ -0,0 +1,34 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +public class CreateUSLKShortLinkResponse extends Response { + + /** 生成的短链接内容 */ + @SerializedName("ShortLink") + private String shortLink; + + public String getShortLink() { + return shortLink; + } + + public void setShortLink(String shortLink) { + this.shortLink = shortLink; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKRedirectRecordsRequest.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKRedirectRecordsRequest.java new file mode 100644 index 00000000..bbfb82b3 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKRedirectRecordsRequest.java @@ -0,0 +1,121 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class DescribeUSLKRedirectRecordsRequest extends Request { + + /** 查询周期开始时间戳(ms级别) */ + @NotEmpty + @UCloudParam("StartTime") + private Integer startTime; + + /** 查询周期结束时间戳(ms级别) */ + @NotEmpty + @UCloudParam("EndTime") + private Integer endTime; + + /** 短链接 */ + @NotEmpty + @UCloudParam("ShortLink") + private String shortLink; + + /** 页码，从0开始，用于分页查找 */ + @UCloudParam("Page") + private Integer page; + + /** 每页个数，用于分页查找，默认20 */ + @UCloudParam("NumPerPage") + private Integer numPerPage; + + /** 根据指定字段排序：默认按短链接访问时间：CreateTime 排序 */ + @UCloudParam("OrderBy") + private String orderBy; + + /** 排序方式。asc-正序 desc-倒序 */ + @UCloudParam("OrderType") + private String orderType; + + /** 模糊查询字段值，支持根据生成短链接进行模糊查询。支持字段(ShortLink，场景名称) */ + @UCloudParam("FuzzySearch") + private String fuzzySearch; + + public Integer getStartTime() { + return startTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } + + public String getShortLink() { + return shortLink; + } + + public void setShortLink(String shortLink) { + this.shortLink = shortLink; + } + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getNumPerPage() { + return numPerPage; + } + + public void setNumPerPage(Integer numPerPage) { + this.numPerPage = numPerPage; + } + + public String getOrderBy() { + return orderBy; + } + + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + public String getFuzzySearch() { + return fuzzySearch; + } + + public void setFuzzySearch(String fuzzySearch) { + this.fuzzySearch = fuzzySearch; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKRedirectRecordsResponse.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKRedirectRecordsResponse.java new file mode 100644 index 00000000..d50fc7e0 --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKRedirectRecordsResponse.java @@ -0,0 +1,182 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class DescribeUSLKRedirectRecordsResponse extends Response { + + /** 长链接列表 */ + @SerializedName("Data") + private List data; + + /** 数据总量 */ + @SerializedName("Total") + private Integer total; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public static class RedirectRecords extends Response { + + /** 报备场景 */ + @SerializedName("Scenario") + private String scenario; + + /** 短链接 */ + @SerializedName("ShortLink") + private String shortLink; + + /** 短链接域名 */ + @SerializedName("ShortLinkDomain") + private String shortLinkDomain; + + /** 访问时间戳（ms） */ + @SerializedName("RequestTime") + private Integer requestTime; + + /** 重定向时间戳 (ms) */ + @SerializedName("RedirectTime") + private Integer redirectTime; + + /** 账户ID */ + @SerializedName("AccountID") + private Integer accountID; + + /** 场景ID */ + @SerializedName("ScenarioID") + private Integer scenarioID; + + /** 访问IP */ + @SerializedName("ClientIP") + private String clientIP; + + /** 访问设备 */ + @SerializedName("Browser") + private String browser; + + /** 访问操作系统 */ + @SerializedName("Os") + private String os; + + /** 访问省份信息 */ + @SerializedName("ProvinceCode") + private String provinceCode; + + public String getScenario() { + return scenario; + } + + public void setScenario(String scenario) { + this.scenario = scenario; + } + + public String getShortLink() { + return shortLink; + } + + public void setShortLink(String shortLink) { + this.shortLink = shortLink; + } + + public String getShortLinkDomain() { + return shortLinkDomain; + } + + public void setShortLinkDomain(String shortLinkDomain) { + this.shortLinkDomain = shortLinkDomain; + } + + public Integer getRequestTime() { + return requestTime; + } + + public void setRequestTime(Integer requestTime) { + this.requestTime = requestTime; + } + + public Integer getRedirectTime() { + return redirectTime; + } + + public void setRedirectTime(Integer redirectTime) { + this.redirectTime = redirectTime; + } + + public Integer getAccountID() { + return accountID; + } + + public void setAccountID(Integer accountID) { + this.accountID = accountID; + } + + public Integer getScenarioID() { + return scenarioID; + } + + public void setScenarioID(Integer scenarioID) { + this.scenarioID = scenarioID; + } + + public String getClientIP() { + return clientIP; + } + + public void setClientIP(String clientIP) { + this.clientIP = clientIP; + } + + public String getBrowser() { + return browser; + } + + public void setBrowser(String browser) { + this.browser = browser; + } + + public String getOs() { + return os; + } + + public void setOs(String os) { + this.os = os; + } + + public String getProvinceCode() { + return provinceCode; + } + + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode; + } + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKShortLinkListRequest.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKShortLinkListRequest.java new file mode 100644 index 00000000..2a92b77f --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKShortLinkListRequest.java @@ -0,0 +1,153 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + + +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class DescribeUSLKShortLinkListRequest extends Request { + + /** 页码，从0开始，用于分页查找 */ + @UCloudParam("Page") + private Integer page; + + /** 1: 待生效；2：已生效；3：已失效；4：已删除（预留）；5：已封禁 */ + @UCloudParam("Status") + private Integer status; + + /** 每页个数，用于分页查找，默认20 */ + @UCloudParam("NumPerPage") + private Integer numPerPage; + + /** 根据指定字段排序：默认按创建时间：CreateTime 排序，支持值：CreateTime,StartTime,EndTime */ + @UCloudParam("OrderBy") + private String orderBy; + + /** 排序方式。asc-正序 desc-倒序 */ + @UCloudParam("OrderType") + private String orderType; + + /** 模糊查询字段值，支持根据生成短链接进行模糊查询。支持字段(LonkLink,场景名称) */ + @UCloudParam("FuzzySearch") + private String fuzzySearch; + + /** 查询周期开始时间戳 */ + @UCloudParam("StartTime") + private Integer startTime; + + /** 查询周期结束时间戳 */ + @UCloudParam("EndTime") + private Integer endTime; + + /** 短链 */ + @UCloudParam("ShortLink") + private String shortLink; + + /** 场景ID */ + @UCloudParam("ScenarioID") + private Integer scenarioID; + + /** 长链接ID */ + @UCloudParam("LongLinkID") + private Integer longLinkID; + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getNumPerPage() { + return numPerPage; + } + + public void setNumPerPage(Integer numPerPage) { + this.numPerPage = numPerPage; + } + + public String getOrderBy() { + return orderBy; + } + + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + public String getFuzzySearch() { + return fuzzySearch; + } + + public void setFuzzySearch(String fuzzySearch) { + this.fuzzySearch = fuzzySearch; + } + + public Integer getStartTime() { + return startTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } + + public String getShortLink() { + return shortLink; + } + + public void setShortLink(String shortLink) { + this.shortLink = shortLink; + } + + public Integer getScenarioID() { + return scenarioID; + } + + public void setScenarioID(Integer scenarioID) { + this.scenarioID = scenarioID; + } + + public Integer getLongLinkID() { + return longLinkID; + } + + public void setLongLinkID(Integer longLinkID) { + this.longLinkID = longLinkID; + } +} diff --git a/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKShortLinkListResponse.java b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKShortLinkListResponse.java new file mode 100644 index 00000000..27ec41cb --- /dev/null +++ b/ucloud-sdk-java-uslk/src/main/java/cn/ucloud/uslk/models/DescribeUSLKShortLinkListResponse.java @@ -0,0 +1,389 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

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. + */ +package cn.ucloud.uslk.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class DescribeUSLKShortLinkListResponse extends Response { + + /** 短链接列表 */ + @SerializedName("Data") + private List data; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class SecondaryLinkForQuery extends Response { + + /** 长链接ID */ + @SerializedName("LongLinkID") + private Integer longLinkID; + + /** 长短链接映射ID */ + @SerializedName("ShortLongMapID") + private Integer shortLongMapID; + + /** 长链接 */ + @SerializedName("LongLink") + private String longLink; + + /** 场景ID */ + @SerializedName("ScenarioID") + private Integer scenarioID; + + /** 场景名称 */ + @SerializedName("Scenario") + private String scenario; + + /** 是否是次链接 */ + @SerializedName("IsSecondary") + private Boolean isSecondary; + + /** 省份codes，例如: Hebei,Shandong,多个以逗号分隔 */ + @SerializedName("ProvinceCodes") + private String provinceCodes; + + /** 操作系统,例如: Windows,Android,多个以逗号分隔 */ + @SerializedName("Oses") + private String oses; + + public Integer getLongLinkID() { + return longLinkID; + } + + public void setLongLinkID(Integer longLinkID) { + this.longLinkID = longLinkID; + } + + public Integer getShortLongMapID() { + return shortLongMapID; + } + + public void setShortLongMapID(Integer shortLongMapID) { + this.shortLongMapID = shortLongMapID; + } + + public String getLongLink() { + return longLink; + } + + public void setLongLink(String longLink) { + this.longLink = longLink; + } + + public Integer getScenarioID() { + return scenarioID; + } + + public void setScenarioID(Integer scenarioID) { + this.scenarioID = scenarioID; + } + + public String getScenario() { + return scenario; + } + + public void setScenario(String scenario) { + this.scenario = scenario; + } + + public Boolean getIsSecondary() { + return isSecondary; + } + + public void setIsSecondary(Boolean isSecondary) { + this.isSecondary = isSecondary; + } + + public String getProvinceCodes() { + return provinceCodes; + } + + public void setProvinceCodes(String provinceCodes) { + this.provinceCodes = provinceCodes; + } + + public String getOses() { + return oses; + } + + public void setOses(String oses) { + this.oses = oses; + } + } + + public static class ShortLink extends Response { + + /** 报备场景 */ + @SerializedName("Scenario") + private String scenario; + + /** 短链接 */ + @SerializedName("ShortLink") + private String shortLink; + + /** 短链接域名 */ + @SerializedName("ShortLinkDomain") + private String shortLinkDomain; + + /** 短链接开始生效时间戳 */ + @SerializedName("StartTime") + private Integer startTime; + + /** 短链接过期时间戳 */ + @SerializedName("EndTime") + private Integer endTime; + + /** 关联长链接列表 */ + @SerializedName("LongLinks") + private List longLinks; + + /** 短链接创建时间 */ + @SerializedName("CreateTime") + private Integer createTime; + + /** 短链接ID */ + @SerializedName("ID") + private Integer id; + + /** 场景ID */ + @SerializedName("ScenarioID") + private Integer scenarioID; + + /** 场景描述 */ + @SerializedName("ScenarioDesc") + private String scenarioDesc; + + /** 更新时间戳 */ + @SerializedName("UpdateTime") + private Integer updateTime; + + /** 删除时间戳 */ + @SerializedName("DeleteTime") + private Integer deleteTime; + + /** 链接类型-预留：1:普通跳转 3:智能跳转等 */ + @SerializedName("Type") + private Integer type; + + /** 短链接状态：1: 待生效；2：已生效；3：已失效；4：已删除（预留）；5：已封禁 */ + @SerializedName("Status") + private Integer status; + + /** 操作人 */ + @SerializedName("Operator") + private String operator; + + /** 操作说明(封禁原因) */ + @SerializedName("Remark") + private String remark; + + /** 累计访问量 */ + @SerializedName("ClickCount") + private Integer clickCount; + + /** 当日访问量 */ + @SerializedName("ClickCountToday") + private Integer clickCountToday; + + /** 累计独立访问量 */ + @SerializedName("UniqueClickCount") + private Integer uniqueClickCount; + + /** 今日独立访问量 */ + @SerializedName("UniqueClickCountToday") + private Integer uniqueClickCountToday; + + /** 次链接，智能跳转类型才有 */ + @SerializedName("SecondaryLinks") + private List secondaryLinks; + + public String getScenario() { + return scenario; + } + + public void setScenario(String scenario) { + this.scenario = scenario; + } + + public String getShortLink() { + return shortLink; + } + + public void setShortLink(String shortLink) { + this.shortLink = shortLink; + } + + public String getShortLinkDomain() { + return shortLinkDomain; + } + + public void setShortLinkDomain(String shortLinkDomain) { + this.shortLinkDomain = shortLinkDomain; + } + + public Integer getStartTime() { + return startTime; + } + + public void setStartTime(Integer startTime) { + this.startTime = startTime; + } + + public Integer getEndTime() { + return endTime; + } + + public void setEndTime(Integer endTime) { + this.endTime = endTime; + } + + public List getLongLinks() { + return longLinks; + } + + public void setLongLinks(List longLinks) { + this.longLinks = longLinks; + } + + public Integer getCreateTime() { + return createTime; + } + + public void setCreateTime(Integer createTime) { + this.createTime = createTime; + } + + public Integer getID() { + return id; + } + + public void setID(Integer id) { + this.id = id; + } + + public Integer getScenarioID() { + return scenarioID; + } + + public void setScenarioID(Integer scenarioID) { + this.scenarioID = scenarioID; + } + + public String getScenarioDesc() { + return scenarioDesc; + } + + public void setScenarioDesc(String scenarioDesc) { + this.scenarioDesc = scenarioDesc; + } + + public Integer getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Integer updateTime) { + this.updateTime = updateTime; + } + + public Integer getDeleteTime() { + return deleteTime; + } + + public void setDeleteTime(Integer deleteTime) { + this.deleteTime = deleteTime; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Integer getClickCount() { + return clickCount; + } + + public void setClickCount(Integer clickCount) { + this.clickCount = clickCount; + } + + public Integer getClickCountToday() { + return clickCountToday; + } + + public void setClickCountToday(Integer clickCountToday) { + this.clickCountToday = clickCountToday; + } + + public Integer getUniqueClickCount() { + return uniqueClickCount; + } + + public void setUniqueClickCount(Integer uniqueClickCount) { + this.uniqueClickCount = uniqueClickCount; + } + + public Integer getUniqueClickCountToday() { + return uniqueClickCountToday; + } + + public void setUniqueClickCountToday(Integer uniqueClickCountToday) { + this.uniqueClickCountToday = uniqueClickCountToday; + } + + public List getSecondaryLinks() { + return secondaryLinks; + } + + public void setSecondaryLinks(List secondaryLinks) { + this.secondaryLinks = secondaryLinks; + } + } +} diff --git a/ucloud-sdk-java-usms/pom.xml b/ucloud-sdk-java-usms/pom.xml index dbdef489..8fc05064 100644 --- a/ucloud-sdk-java-usms/pom.xml +++ b/ucloud-sdk-java-usms/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-usms - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-uvms/pom.xml b/ucloud-sdk-java-uvms/pom.xml index 44d706f4..d7ad93bb 100644 --- a/ucloud-sdk-java-uvms/pom.xml +++ b/ucloud-sdk-java-uvms/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-uvms - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release diff --git a/ucloud-sdk-java-vpc/pom.xml b/ucloud-sdk-java-vpc/pom.xml index 1720d5a5..cda51958 100644 --- a/ucloud-sdk-java-vpc/pom.xml +++ b/ucloud-sdk-java-vpc/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.5-release + 1.0.6-release 4.0.0 ucloud-sdk-java-vpc - 1.0.5-release + 1.0.6-release cn.ucloud ucloud-sdk-java-common - 1.0.5-release + 1.0.6-release