diff --git a/VERSION b/VERSION index 2f009bf5..3fbe01e6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.6-release +1.0.7-release diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml index 6830423d..7e553a7a 100644 --- a/examples/generic/pom.xml +++ b/examples/generic/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.0.6-release + 1.0.7-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml index df489c86..ba6d63b6 100644 --- a/examples/uhost/pom.xml +++ b/examples/uhost/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.0.6-release + 1.0.7-release 4.0.0 @@ -18,7 +18,7 @@ cn.ucloud ucloud-sdk-java-uhost - 1.0.6-release + 1.0.7-release diff --git a/pom.xml b/pom.xml index 8f7e4de9..5726916d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.ucloud ucloud-sdk-java pom - 1.0.6-release + 1.0.7-release ucloud-sdk-java-common ucloud-sdk-java-cube diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml index 2161278b..fc3e52d2 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml index c83d10f0..ddd506f0 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-cube - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml index 656da47c..edee5aac 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-ipsecvpn - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml index 49b8a6d7..62c24dad 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-pathx - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml index fe35efed..ff9ff662 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uaccount - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml index 412dad6b..88d193d4 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-ubill - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml index 9ec73b3e..782dc834 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-ucdn - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/client/UCDNClient.java b/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/client/UCDNClient.java index 1c595f49..fe2e12e4 100644 --- a/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/client/UCDNClient.java +++ b/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/client/UCDNClient.java @@ -47,8 +47,6 @@ import cn.ucloud.ucdn.models.GetUcdnDomainHttpCodeV2Response; import cn.ucloud.ucdn.models.GetUcdnDomainInfoListRequest; import cn.ucloud.ucdn.models.GetUcdnDomainInfoListResponse; -import cn.ucloud.ucdn.models.GetUcdnDomainLogRequest; -import cn.ucloud.ucdn.models.GetUcdnDomainLogResponse; import cn.ucloud.ucdn.models.GetUcdnDomainLogV2Request; import cn.ucloud.ucdn.models.GetUcdnDomainLogV2Response; import cn.ucloud.ucdn.models.GetUcdnDomainOriginHttpCodeDetailRequest; @@ -278,18 +276,6 @@ public GetUcdnDomainInfoListResponse getUcdnDomainInfoList(GetUcdnDomainInfoList this.invoke(request, GetUcdnDomainInfoListResponse.class); } - /** - * GetUcdnDomainLog - 获取加速域名原始日志 - * - * @param request Request object - * @throws UCloudException Exception - */ - public GetUcdnDomainLogResponse getUcdnDomainLog(GetUcdnDomainLogRequest request) - throws UCloudException { - request.setAction("GetUcdnDomainLog"); - return (GetUcdnDomainLogResponse) this.invoke(request, GetUcdnDomainLogResponse.class); - } - /** * GetUcdnDomainLogV2 - 获取域名5分钟日志 * diff --git a/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/client/UCDNClientInterface.java b/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/client/UCDNClientInterface.java index 8dc315a2..74e85670 100644 --- a/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/client/UCDNClientInterface.java +++ b/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/client/UCDNClientInterface.java @@ -45,8 +45,6 @@ import cn.ucloud.ucdn.models.GetUcdnDomainHttpCodeV2Response; import cn.ucloud.ucdn.models.GetUcdnDomainInfoListRequest; import cn.ucloud.ucdn.models.GetUcdnDomainInfoListResponse; -import cn.ucloud.ucdn.models.GetUcdnDomainLogRequest; -import cn.ucloud.ucdn.models.GetUcdnDomainLogResponse; import cn.ucloud.ucdn.models.GetUcdnDomainLogV2Request; import cn.ucloud.ucdn.models.GetUcdnDomainLogV2Response; import cn.ucloud.ucdn.models.GetUcdnDomainOriginHttpCodeDetailRequest; @@ -216,15 +214,6 @@ public GetUcdnDomainHttpCodeV2Response getUcdnDomainHttpCodeV2( public GetUcdnDomainInfoListResponse getUcdnDomainInfoList(GetUcdnDomainInfoListRequest request) throws UCloudException; - /** - * GetUcdnDomainLog - 获取加速域名原始日志 - * - * @param request Request object - * @throws UCloudException Exception - */ - public GetUcdnDomainLogResponse getUcdnDomainLog(GetUcdnDomainLogRequest request) - throws UCloudException; - /** * GetUcdnDomainLogV2 - 获取域名5分钟日志 * diff --git a/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/models/GetUcdnDomainLogRequest.java b/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/models/GetUcdnDomainLogRequest.java deleted file mode 100644 index 33fb739d..00000000 --- a/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/models/GetUcdnDomainLogRequest.java +++ /dev/null @@ -1,85 +0,0 @@ -/** - * 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.ucdn.models; - -import cn.ucloud.common.annotation.UCloudParam; -import cn.ucloud.common.request.Request; - -import java.util.List; - -public class GetUcdnDomainLogRequest extends Request { - - /** - * 项目ID。不填写为默认项目,子帐号必须填写。 - * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - */ - @UCloudParam("ProjectId") - private String projectId; - - /** 域名ID,创建加速域名时生成。默认全部域名 */ - @UCloudParam("DomainId") - private List domainId; - - /** 查询的起始时间,格式为Unix Timestamp。如果有EndTime,BeginTime必须赋值。 */ - @UCloudParam("BeginTime") - private Integer beginTime; - - /** 查询的结束时间,格式为Unix Timestamp。EndTime默认为当前时间,BeginTime默认为当前时间前一天时间。 */ - @UCloudParam("EndTime") - private Integer endTime; - - /** 查询粒度 0=default(没有粒度) 1=按小时 2=按天 */ - @UCloudParam("Type") - private Integer type; - - public String getProjectId() { - return projectId; - } - - public void setProjectId(String projectId) { - this.projectId = projectId; - } - - public List getDomainId() { - return domainId; - } - - public void setDomainId(List domainId) { - this.domainId = domainId; - } - - public Integer getBeginTime() { - return beginTime; - } - - public void setBeginTime(Integer beginTime) { - this.beginTime = beginTime; - } - - 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; - } -} diff --git a/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/models/GetUcdnDomainLogResponse.java b/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/models/GetUcdnDomainLogResponse.java deleted file mode 100644 index ff641d89..00000000 --- a/ucloud-sdk-java-ucdn/src/main/java/cn/ucloud/ucdn/models/GetUcdnDomainLogResponse.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * 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.ucdn.models; - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -public class GetUcdnDomainLogResponse extends Response { - - /** 获取日志的连接地址。具体参考下面LogSetList */ - @SerializedName("LogSet") - private List logSet; - - public List getLogSet() { - return logSet; - } - - public void setLogSet(List logSet) { - this.logSet = logSet; - } - - public static class LogSetInfo extends Response { - - /** 日志时间UnixTime */ - @SerializedName("Time") - private Integer time; - - /** 国内日志url列表 */ - @SerializedName("CnLog") - private List cnLog; - - /** 国外日志url列表 */ - @SerializedName("AbroadLog") - private List abroadLog; - - public Integer getTime() { - return time; - } - - public void setTime(Integer time) { - this.time = time; - } - - public List getCnLog() { - return cnLog; - } - - public void setCnLog(List cnLog) { - this.cnLog = cnLog; - } - - public List getAbroadLog() { - return abroadLog; - } - - public void setAbroadLog(List abroadLog) { - this.abroadLog = abroadLog; - } - } - - public static class LogSetList extends Response { - - /** 域名 */ - @SerializedName("Domain") - private String domain; - - /** 域名信息列表,参考LogSetInfo */ - @SerializedName("Logs") - private List logs; - - public String getDomain() { - return domain; - } - - public void setDomain(String domain) { - this.domain = domain; - } - - public List getLogs() { - return logs; - } - - public void setLogs(List logs) { - this.logs = logs; - } - } -} diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml index f345d02e..5418ca49 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-udb - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uddb/pom.xml b/ucloud-sdk-java-uddb/pom.xml index bc95ca1c..f39267a9 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uddb - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-udisk/pom.xml b/ucloud-sdk-java-udisk/pom.xml index d256e5bd..c61c9174 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-udisk - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-udpn/pom.xml b/ucloud-sdk-java-udpn/pom.xml index 56a9e853..b6da45b8 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-udpn - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uec/pom.xml b/ucloud-sdk-java-uec/pom.xml index a0fa16a6..8d008af4 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uec - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-ufile/pom.xml b/ucloud-sdk-java-ufile/pom.xml index b590615e..6c996c67 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-ufile - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-ufs/pom.xml b/ucloud-sdk-java-ufs/pom.xml index b5aaeb90..0720932d 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-ufs - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uhost/pom.xml b/ucloud-sdk-java-uhost/pom.xml index e2fe13d0..65f5bfd9 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uhost - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateUHostInstanceRequest.java b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateUHostInstanceRequest.java index 2eced7e3..f50541a7 100644 --- a/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateUHostInstanceRequest.java +++ b/ucloud-sdk-java-uhost/src/main/java/cn/ucloud/uhost/models/CreateUHostInstanceRequest.java @@ -93,8 +93,8 @@ public class CreateUHostInstanceRequest extends Request { private Integer memory; /** - * GPU类型,枚举值["K80", "P40", "V100", "T4", "T4S","2080Ti","2080Ti-4C","1080Ti", "T4/4", "MI100", - * "V100S"],MachineType为G时必填 + * GPU类型,枚举值["K80", "P40", "V100", "T4","T4A", "T4S","2080Ti","2080Ti-4C","1080Ti", "T4/4", + * "MI100", "V100S",2080","2080TiS","2080TiPro","3090","A100"],MachineType为G时必填 */ @UCloudParam("GpuType") private String gpuType; @@ -148,7 +148,7 @@ public class CreateUHostInstanceRequest extends Request { /** * 最低cpu平台,枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", "Intel/Broadwell", * "Intel/Skylake", "Intel/Cascadelake", "Intel/CascadelakeR", "Intel/IceLake", "Amd/Epyc2", - * "Amd/Auto"],默认值是"Intel/Auto"。 + * "Amd/Auto","Ampere/Auto","Ampere/Altra"],默认值是"Intel/Auto"。 */ @UCloudParam("MinimalCpuPlatform") private String minimalCpuPlatform; diff --git a/ucloud-sdk-java-uk8s/pom.xml b/ucloud-sdk-java-uk8s/pom.xml index f98aa710..60b30aac 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uk8s - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-ulb/pom.xml b/ucloud-sdk-java-ulb/pom.xml index cb759f10..6f861b4b 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-ulb - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-umem/pom.xml b/ucloud-sdk-java-umem/pom.xml index 2d9dae01..bf0276b5 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-umem - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-unet/pom.xml b/ucloud-sdk-java-unet/pom.xml index 1fa0a7a2..f83b5101 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-unet - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uphone/pom.xml b/ucloud-sdk-java-uphone/pom.xml index 0cd957ab..c281b3f6 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uphone - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/client/UPhoneClient.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/client/UPhoneClient.java index 224f835e..e60996ea 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/client/UPhoneClient.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/client/UPhoneClient.java @@ -43,6 +43,8 @@ import cn.ucloud.uphone.models.DescribeUPhoneCitiesResponse; import cn.ucloud.uphone.models.DescribeUPhoneDetailByAppRequest; import cn.ucloud.uphone.models.DescribeUPhoneDetailByAppResponse; +import cn.ucloud.uphone.models.DescribeUPhoneEipListRequest; +import cn.ucloud.uphone.models.DescribeUPhoneEipListResponse; import cn.ucloud.uphone.models.DescribeUPhoneImageRequest; import cn.ucloud.uphone.models.DescribeUPhoneImageResponse; import cn.ucloud.uphone.models.DescribeUPhoneIpRegionsRequest; @@ -117,10 +119,6 @@ import cn.ucloud.uphone.models.SetUPhoneRootModeResponse; import cn.ucloud.uphone.models.SetUPhoneTokenRequest; import cn.ucloud.uphone.models.SetUPhoneTokenResponse; -import cn.ucloud.uphone.models.SwitchUPhoneIndependentIpRequest; -import cn.ucloud.uphone.models.SwitchUPhoneIndependentIpResponse; -import cn.ucloud.uphone.models.SwitchUPhoneInstanceRequest; -import cn.ucloud.uphone.models.SwitchUPhoneInstanceResponse; import cn.ucloud.uphone.models.UnInstallUPhoneAppVersionRequest; import cn.ucloud.uphone.models.UnInstallUPhoneAppVersionResponse; import cn.ucloud.uphone.models.UpdateUPhoneImageRequest; @@ -303,6 +301,19 @@ public DescribeUPhoneDetailByAppResponse describeUPhoneDetailByApp( this.invoke(request, DescribeUPhoneDetailByAppResponse.class); } + /** + * DescribeUPhoneEipList - 获取云手机Eip列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeUPhoneEipListResponse describeUPhoneEipList(DescribeUPhoneEipListRequest request) + throws UCloudException { + request.setAction("DescribeUPhoneEipList"); + return (DescribeUPhoneEipListResponse) + this.invoke(request, DescribeUPhoneEipListResponse.class); + } + /** * DescribeUPhoneImage - 获取云手机镜像信息列表 * @@ -748,32 +759,6 @@ public SetUPhoneTokenResponse setUPhoneToken(SetUPhoneTokenRequest request) return (SetUPhoneTokenResponse) this.invoke(request, SetUPhoneTokenResponse.class); } - /** - * SwitchUPhoneIndependentIp - 更换云手机独立IP - * - * @param request Request object - * @throws UCloudException Exception - */ - public SwitchUPhoneIndependentIpResponse switchUPhoneIndependentIp( - SwitchUPhoneIndependentIpRequest request) throws UCloudException { - request.setAction("SwitchUPhoneIndependentIp"); - return (SwitchUPhoneIndependentIpResponse) - this.invoke(request, SwitchUPhoneIndependentIpResponse.class); - } - - /** - * SwitchUPhoneInstance - 故障更换云手机 - * - * @param request Request object - * @throws UCloudException Exception - */ - public SwitchUPhoneInstanceResponse switchUPhoneInstance(SwitchUPhoneInstanceRequest request) - throws UCloudException { - request.setAction("SwitchUPhoneInstance"); - return (SwitchUPhoneInstanceResponse) - this.invoke(request, SwitchUPhoneInstanceResponse.class); - } - /** * UnInstallUPhoneAppVersion - 卸载云手机应用版本 * diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/client/UPhoneClientInterface.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/client/UPhoneClientInterface.java index 18532273..258eb9cb 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/client/UPhoneClientInterface.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/client/UPhoneClientInterface.java @@ -41,6 +41,8 @@ import cn.ucloud.uphone.models.DescribeUPhoneCitiesResponse; import cn.ucloud.uphone.models.DescribeUPhoneDetailByAppRequest; import cn.ucloud.uphone.models.DescribeUPhoneDetailByAppResponse; +import cn.ucloud.uphone.models.DescribeUPhoneEipListRequest; +import cn.ucloud.uphone.models.DescribeUPhoneEipListResponse; import cn.ucloud.uphone.models.DescribeUPhoneImageRequest; import cn.ucloud.uphone.models.DescribeUPhoneImageResponse; import cn.ucloud.uphone.models.DescribeUPhoneIpRegionsRequest; @@ -115,10 +117,6 @@ import cn.ucloud.uphone.models.SetUPhoneRootModeResponse; import cn.ucloud.uphone.models.SetUPhoneTokenRequest; import cn.ucloud.uphone.models.SetUPhoneTokenResponse; -import cn.ucloud.uphone.models.SwitchUPhoneIndependentIpRequest; -import cn.ucloud.uphone.models.SwitchUPhoneIndependentIpResponse; -import cn.ucloud.uphone.models.SwitchUPhoneInstanceRequest; -import cn.ucloud.uphone.models.SwitchUPhoneInstanceResponse; import cn.ucloud.uphone.models.UnInstallUPhoneAppVersionRequest; import cn.ucloud.uphone.models.UnInstallUPhoneAppVersionResponse; import cn.ucloud.uphone.models.UpdateUPhoneImageRequest; @@ -251,6 +249,15 @@ public DescribeUPhoneCitiesResponse describeUPhoneCities(DescribeUPhoneCitiesReq public DescribeUPhoneDetailByAppResponse describeUPhoneDetailByApp( DescribeUPhoneDetailByAppRequest request) throws UCloudException; + /** + * DescribeUPhoneEipList - 获取云手机Eip列表 + * + * @param request Request object + * @throws UCloudException Exception + */ + public DescribeUPhoneEipListResponse describeUPhoneEipList(DescribeUPhoneEipListRequest request) + throws UCloudException; + /** * DescribeUPhoneImage - 获取云手机镜像信息列表 * @@ -569,24 +576,6 @@ public SetUPhoneRootModeResponse setUPhoneRootMode(SetUPhoneRootModeRequest requ public SetUPhoneTokenResponse setUPhoneToken(SetUPhoneTokenRequest request) throws UCloudException; - /** - * SwitchUPhoneIndependentIp - 更换云手机独立IP - * - * @param request Request object - * @throws UCloudException Exception - */ - public SwitchUPhoneIndependentIpResponse switchUPhoneIndependentIp( - SwitchUPhoneIndependentIpRequest request) throws UCloudException; - - /** - * SwitchUPhoneInstance - 故障更换云手机 - * - * @param request Request object - * @throws UCloudException Exception - */ - public SwitchUPhoneInstanceResponse switchUPhoneInstance(SwitchUPhoneInstanceRequest request) - throws UCloudException; - /** * UnInstallUPhoneAppVersion - 卸载云手机应用版本 * diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/CreateUPhoneImageRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/CreateUPhoneImageRequest.java index e215b86e..36bf5707 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/CreateUPhoneImageRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/CreateUPhoneImageRequest.java @@ -27,18 +27,17 @@ public class CreateUPhoneImageRequest extends Request { @UCloudParam("ProjectId") private String projectId; + /** 手机实例的资源ID */ + @NotEmpty + @UCloudParam("UPhoneId") + private String uPhoneId; + /** * 城市Id,通过[获取城市列表](https://cms-docs.ucloudadmin.com/api/uphone-api/describe_u_phone_cities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; - /** 手机实例的资源ID */ - @NotEmpty - @UCloudParam("UPhoneId") - private String uPhoneId; - /** 镜像名称。长度为2~128个英文或中文字符。 */ @UCloudParam("Name") private String name; @@ -59,14 +58,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getUPhoneId() { return uPhoneId; } @@ -75,6 +66,14 @@ public void setUPhoneId(String uPhoneId) { this.uPhoneId = uPhoneId; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getName() { return name; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/CreateUPhoneRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/CreateUPhoneRequest.java index 605b7a92..182addd2 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/CreateUPhoneRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/CreateUPhoneRequest.java @@ -77,22 +77,10 @@ public class CreateUPhoneRequest extends Request { @UCloudParam("BindIp") private Boolean bindIp; - /** 共享带宽大小 */ - @UCloudParam("Bandwidth") - private Integer bandwidth; - /** 独立IP参数。需要独立IP的比例。eg: [4:1]->4, [3:1]->3。 */ @UCloudParam("IpProportion") private Integer ipProportion; - /** 共享带宽名称,可以在创建新的共享带宽时指定一个名称 */ - @UCloudParam("ShareBandwidthName") - private String shareBandwidthName; - - /** 共享带宽ID,使用现有共享带宽时需要传入此参数 */ - @UCloudParam("ShareBandwidthId") - private String shareBandwidthId; - /** 云手机代金券ID。请通过DescribeCoupon接口查询,或登录用户中心查看。注:代金券对带宽不适用,仅适用于云手机计费 */ @UCloudParam("CouponId") private String couponId; @@ -193,14 +181,6 @@ public void setBindIp(Boolean bindIp) { this.bindIp = bindIp; } - public Integer getBandwidth() { - return bandwidth; - } - - public void setBandwidth(Integer bandwidth) { - this.bandwidth = bandwidth; - } - public Integer getIpProportion() { return ipProportion; } @@ -209,22 +189,6 @@ public void setIpProportion(Integer ipProportion) { this.ipProportion = ipProportion; } - public String getShareBandwidthName() { - return shareBandwidthName; - } - - public void setShareBandwidthName(String shareBandwidthName) { - this.shareBandwidthName = shareBandwidthName; - } - - public String getShareBandwidthId() { - return shareBandwidthId; - } - - public void setShareBandwidthId(String shareBandwidthId) { - this.shareBandwidthId = shareBandwidthId; - } - public String getCouponId() { return couponId; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DeleteUPhoneRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DeleteUPhoneRequest.java index a161082d..e7b754f9 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DeleteUPhoneRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DeleteUPhoneRequest.java @@ -28,11 +28,6 @@ public class DeleteUPhoneRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](https://docs.ucloud.cn/api/uphone-api/describe_u_phone_cities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** * 【数组】云手机实例的资源 ID,N<200;调用方式举例:UPhoneIds.0=希望获取信息的云手机 1 的 UPhoneId,UPhoneIds.1=云手机实例 2 的 * UPhoneId @@ -41,6 +36,10 @@ public class DeleteUPhoneRequest extends Request { @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](https://docs.ucloud.cn/api/uphone-api/describe_u_phone_cities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -53,14 +52,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public List getUPhoneIds() { return uPhoneIds; } @@ -69,6 +60,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneDetailByAppRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneDetailByAppRequest.java index 7b942954..6947984d 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneDetailByAppRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneDetailByAppRequest.java @@ -33,7 +33,6 @@ public class DescribeUPhoneDetailByAppRequest extends Request { private String appId; /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneIndependentIpRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneEipListRequest.java similarity index 64% rename from ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneIndependentIpRequest.java rename to ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneEipListRequest.java index 75a16b91..7540a08f 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneIndependentIpRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneEipListRequest.java @@ -14,11 +14,10 @@ package cn.ucloud.uphone.models; -import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; -public class SwitchUPhoneIndependentIpRequest extends Request { +public class DescribeUPhoneEipListRequest extends Request { /** * 项目ID。不填写为默认项目,子帐号必须填写。 @@ -27,10 +26,13 @@ public class SwitchUPhoneIndependentIpRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 云手机独立IP地址ID */ - @NotEmpty - @UCloudParam("EipId") - private String eipId; + /** Eip所属区域,没有该参数表示获取所有区域 */ + @UCloudParam("Region") + private String region; + + /** 云手机与Eip绑定比例,没有该参数表示获取所有绑定比例 */ + @UCloudParam("Proportion") + private String proportion; public String getProjectId() { return projectId; @@ -40,11 +42,19 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getEipId() { - return eipId; + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getProportion() { + return proportion; } - public void setEipId(String eipId) { - this.eipId = eipId; + public void setProportion(String proportion) { + this.proportion = proportion; } } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneEipListResponse.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneEipListResponse.java new file mode 100644 index 00000000..138dc8bd --- /dev/null +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneEipListResponse.java @@ -0,0 +1,194 @@ +/** + * 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.uphone.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class DescribeUPhoneEipListResponse extends Response { + + /** Eip信息列表 */ + @SerializedName("EipInfos") + private List eipInfos; + + /** Eip信息数量 */ + @SerializedName("TotalCount") + private Integer totalCount; + + public List getEipInfos() { + return eipInfos; + } + + public void setEipInfos(List eipInfos) { + this.eipInfos = eipInfos; + } + + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public static class EipInfo extends Response { + + /** Eip所属区域 */ + @SerializedName("Region") + private String region; + + /** Eip资源ID */ + @SerializedName("EipId") + private String eipId; + + /** Eip地址 */ + @SerializedName("EipIp") + private String eipIp; + + /** Eip名称 */ + @SerializedName("Name") + private String name; + + /** Eip备注 */ + @SerializedName("Remark") + private String remark; + + /** 云手机与Eip绑定比例 */ + @SerializedName("Proportion") + private Integer proportion; + + /** 创建时间;格式为Unix时间戳 */ + @SerializedName("CreateTime") + private Integer createTime; + + /** 到期时间;格式为Unix时间戳 */ + @SerializedName("ExpireTime") + private Integer expireTime; + + /** 计费模式。枚举值为: > 年 Year,按年付费; > Month,按月付费; > Dynamic,按小时预付费; 默认为月付 */ + @SerializedName("ChargeType") + private String chargeType; + + /** 绑定的云手机ID */ + @SerializedName("UPhoneIds") + private List uPhoneIds; + + /** 当前绑定云手机数量 */ + @SerializedName("BindCount") + private Integer bindCount; + + /** 剩余可绑定手机数量 */ + @SerializedName("RemainCount") + private Integer remainCount; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getEipId() { + return eipId; + } + + public void setEipId(String eipId) { + this.eipId = eipId; + } + + public String getEipIp() { + return eipIp; + } + + public void setEipIp(String eipIp) { + this.eipIp = eipIp; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Integer getProportion() { + return proportion; + } + + public void setProportion(Integer proportion) { + this.proportion = proportion; + } + + public Integer getCreateTime() { + return createTime; + } + + public void setCreateTime(Integer createTime) { + this.createTime = createTime; + } + + public Integer getExpireTime() { + return expireTime; + } + + public void setExpireTime(Integer expireTime) { + this.expireTime = expireTime; + } + + public String getChargeType() { + return chargeType; + } + + public void setChargeType(String chargeType) { + this.chargeType = chargeType; + } + + public List getUPhoneIds() { + return uPhoneIds; + } + + public void setUPhoneIds(List uPhoneIds) { + this.uPhoneIds = uPhoneIds; + } + + public Integer getBindCount() { + return bindCount; + } + + public void setBindCount(Integer bindCount) { + this.bindCount = bindCount; + } + + public Integer getRemainCount() { + return remainCount; + } + + public void setRemainCount(Integer remainCount) { + this.remainCount = remainCount; + } + } +} diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneJobRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneJobRequest.java index ab3e6fd0..db067717 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneJobRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneJobRequest.java @@ -13,7 +13,6 @@ */ package cn.ucloud.uphone.models; -import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; @@ -29,7 +28,6 @@ public class DescribeUPhoneJobRequest extends Request { private String projectId; /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneRequest.java index a767c781..512f1c66 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneRequest.java @@ -13,7 +13,6 @@ */ package cn.ucloud.uphone.models; -import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; @@ -28,8 +27,7 @@ public class DescribeUPhoneRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取,没有该参数表示获取所有城市 */ @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneResponse.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneResponse.java index 72e6863d..14b47fcc 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneResponse.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/DescribeUPhoneResponse.java @@ -61,7 +61,7 @@ public static class UPhoneInstance extends Response { /** 虚拟CPU核数。 */ @SerializedName("CPU") - private Integer cpu; + private Double cpu; /** 内存大小。单位MB */ @SerializedName("Memory") @@ -164,6 +164,10 @@ public static class UPhoneInstance extends Response { @SerializedName("ShareBandwidthName") private String shareBandwidthName; + /** 云手机的ADB信息 */ + @SerializedName("ADB") + private String adb; + public String getUPhoneName() { return uPhoneName; } @@ -188,11 +192,11 @@ public void setUPhoneModelName(String uPhoneModelName) { this.uPhoneModelName = uPhoneModelName; } - public Integer getCPU() { + public Double getCPU() { return cpu; } - public void setCPU(Integer cpu) { + public void setCPU(Double cpu) { this.cpu = cpu; } @@ -371,5 +375,13 @@ public String getShareBandwidthName() { public void setShareBandwidthName(String shareBandwidthName) { this.shareBandwidthName = shareBandwidthName; } + + public String getADB() { + return adb; + } + + public void setADB(String adb) { + this.adb = adb; + } } } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/GetUPhoneRenewPriceRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/GetUPhoneRenewPriceRequest.java index aa9b9287..ff2ef15f 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/GetUPhoneRenewPriceRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/GetUPhoneRenewPriceRequest.java @@ -33,7 +33,6 @@ public class GetUPhoneRenewPriceRequest extends Request { private String uPhoneId; /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/GetUPhoneScreenCaptureRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/GetUPhoneScreenCaptureRequest.java index 15fe0e86..0ac1631e 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/GetUPhoneScreenCaptureRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/GetUPhoneScreenCaptureRequest.java @@ -33,7 +33,6 @@ public class GetUPhoneScreenCaptureRequest extends Request { private String uPhoneID; /** 城市Id,通过[获取城市列表](https://docs.ucloud.cn/api/uphone-api/describe_u_phone_cities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ImportFileRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ImportFileRequest.java index a8da6481..98f3ef91 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ImportFileRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ImportFileRequest.java @@ -38,16 +38,15 @@ public class ImportFileRequest extends Request { @UCloudParam("FileName") private String fileName; - /** 城市。 参见 [云手机城市列表](https://docs.ucloud.cn/api/uphone-api/describe_u_phone_cities) */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 文件下载链接 */ @NotEmpty @UCloudParam("URL") private String url; + /** 城市。 参见 [云手机城市列表](https://docs.ucloud.cn/api/uphone-api/describe_u_phone_cities) */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -76,14 +75,6 @@ public void setFileName(String fileName) { this.fileName = fileName; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getURL() { return url; } @@ -92,6 +83,14 @@ public void setURL(String url) { this.url = url; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/InstallUPhoneAppVersionRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/InstallUPhoneAppVersionRequest.java index cbd748e8..c6883097 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/InstallUPhoneAppVersionRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/InstallUPhoneAppVersionRequest.java @@ -28,11 +28,6 @@ public class InstallUPhoneAppVersionRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 应用版本的唯一标识ID */ @NotEmpty @UCloudParam("AppVersionId") @@ -45,6 +40,10 @@ public class InstallUPhoneAppVersionRequest extends Request { @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -57,14 +56,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getAppVersionId() { return appVersionId; } @@ -81,6 +72,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ModifyUPhoneNameRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ModifyUPhoneNameRequest.java index 7178c89e..2e841007 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ModifyUPhoneNameRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ModifyUPhoneNameRequest.java @@ -27,11 +27,6 @@ public class ModifyUPhoneNameRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 云手机实例的资源ID */ @NotEmpty @UCloudParam("UPhoneId") @@ -42,6 +37,10 @@ public class ModifyUPhoneNameRequest extends Request { @UCloudParam("Name") private String name; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + public String getProjectId() { return projectId; } @@ -50,14 +49,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getUPhoneId() { return uPhoneId; } @@ -73,4 +64,12 @@ public String getName() { public void setName(String name) { this.name = name; } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ModifyUPhoneRemarkRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ModifyUPhoneRemarkRequest.java index b4e37680..d6b3e6ca 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ModifyUPhoneRemarkRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ModifyUPhoneRemarkRequest.java @@ -27,16 +27,15 @@ public class ModifyUPhoneRemarkRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 云手机实例的资源ID */ @NotEmpty @UCloudParam("UPhoneId") private String uPhoneId; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 备注 */ @UCloudParam("Remark") private String remark; @@ -49,14 +48,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getUPhoneId() { return uPhoneId; } @@ -65,6 +56,14 @@ public void setUPhoneId(String uPhoneId) { this.uPhoneId = uPhoneId; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getRemark() { return remark; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweroffUPhoneRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweroffUPhoneRequest.java index c406ee0a..be846c20 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweroffUPhoneRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweroffUPhoneRequest.java @@ -36,7 +36,6 @@ public class PoweroffUPhoneRequest extends Request { private List uPhoneIds; /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweroffUPhoneResponse.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweroffUPhoneResponse.java index a32016f2..7d5130ae 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweroffUPhoneResponse.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweroffUPhoneResponse.java @@ -14,7 +14,21 @@ package cn.ucloud.uphone.models; - import cn.ucloud.common.response.Response; -public class PoweroffUPhoneResponse extends Response {} +import com.google.gson.annotations.SerializedName; + +public class PoweroffUPhoneResponse extends Response { + + /** 任务ID,用来查询当前任务状态 */ + @SerializedName("JobId") + private String jobId; + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } +} diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweronUPhoneRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweronUPhoneRequest.java index 0d6de693..b3f5b35e 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweronUPhoneRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweronUPhoneRequest.java @@ -28,16 +28,15 @@ public class PoweronUPhoneRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 【数组】云手机实例的资源ID,调用方式举例:UPhoneIds.0=希望开启的云手机实例1的UPhoneId,UPhoneIds.1=云手机实例2的UPhoneId。 */ @NotEmpty @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -50,14 +49,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public List getUPhoneIds() { return uPhoneIds; } @@ -66,6 +57,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweronUPhoneResponse.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweronUPhoneResponse.java index 190c695f..c4048d5d 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweronUPhoneResponse.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/PoweronUPhoneResponse.java @@ -14,7 +14,21 @@ package cn.ucloud.uphone.models; - import cn.ucloud.common.response.Response; -public class PoweronUPhoneResponse extends Response {} +import com.google.gson.annotations.SerializedName; + +public class PoweronUPhoneResponse extends Response { + + /** 任务ID,用来查询当前任务状态 */ + @SerializedName("JobId") + private String jobId; + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } +} diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RebootUPhoneRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RebootUPhoneRequest.java index f2088d43..2b7a6c12 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RebootUPhoneRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RebootUPhoneRequest.java @@ -36,7 +36,6 @@ public class RebootUPhoneRequest extends Request { private List uPhoneIds; /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RenewUPhoneRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RenewUPhoneRequest.java index 06781b33..62567f66 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RenewUPhoneRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RenewUPhoneRequest.java @@ -28,11 +28,6 @@ public class RenewUPhoneRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** * 【数组】云手机实例的资源 ID,调用方式举例:UPhoneIds.0=希望重启的云手机实例 1 的 UPhoneId,UPhoneIds.1=云手机实例 2 的 UPhoneId。 */ @@ -40,6 +35,10 @@ public class RenewUPhoneRequest extends Request { @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -152,14 +151,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public List getUPhoneIds() { return uPhoneIds; } @@ -168,6 +159,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RenewUPhoneResponse.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RenewUPhoneResponse.java index 532341f5..7c9dfc6f 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RenewUPhoneResponse.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RenewUPhoneResponse.java @@ -14,7 +14,21 @@ package cn.ucloud.uphone.models; - import cn.ucloud.common.response.Response; -public class RenewUPhoneResponse extends Response {} +import com.google.gson.annotations.SerializedName; + +public class RenewUPhoneResponse extends Response { + + /** 任务ID,用来查询一键新机任务状态 */ + @SerializedName("JobId") + private String jobId; + + public String getJobId() { + return jobId; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } +} diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ResetUPhoneRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ResetUPhoneRequest.java index 8c05a92e..ff0b087b 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ResetUPhoneRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/ResetUPhoneRequest.java @@ -28,11 +28,6 @@ public class ResetUPhoneRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** * 【数组】云手机实例的资源 ID,调用方式举例:UPhoneIds.0=希望重置的云手机实例 1 的 UPhoneId,UPhoneIds.1=云手机实例 2 的 UPhoneId。 */ @@ -40,6 +35,10 @@ public class ResetUPhoneRequest extends Request { @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -56,14 +55,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public List getUPhoneIds() { return uPhoneIds; } @@ -72,6 +63,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RunAsyncCommandRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RunAsyncCommandRequest.java index 5a163dee..3404eb6e 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RunAsyncCommandRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RunAsyncCommandRequest.java @@ -28,11 +28,6 @@ public class RunAsyncCommandRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 待执行的命令。 */ @NotEmpty @UCloudParam("Content") @@ -45,6 +40,10 @@ public class RunAsyncCommandRequest extends Request { @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -57,14 +56,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getContent() { return content; } @@ -81,6 +72,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RunSyncCommandRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RunSyncCommandRequest.java index d3f2d848..5d9e18a9 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RunSyncCommandRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/RunSyncCommandRequest.java @@ -28,11 +28,6 @@ public class RunSyncCommandRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 待执行的命令。 */ @NotEmpty @UCloudParam("Content") @@ -45,6 +40,10 @@ public class RunSyncCommandRequest extends Request { @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -57,14 +56,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getContent() { return content; } @@ -81,6 +72,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneCallbackRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneCallbackRequest.java index 57ad911c..f03b3869 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneCallbackRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneCallbackRequest.java @@ -27,11 +27,6 @@ public class SetUPhoneCallbackRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市ID */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 云手机ID。 */ @NotEmpty @UCloudParam("UPhoneId") @@ -42,6 +37,10 @@ public class SetUPhoneCallbackRequest extends Request { @UCloudParam("URL") private String url; + /** 城市ID */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -54,14 +53,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getUPhoneId() { return uPhoneId; } @@ -78,6 +69,14 @@ public void setURL(String url) { this.url = url; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneConfigRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneConfigRequest.java index e7791d73..3ea4c643 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneConfigRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneConfigRequest.java @@ -28,16 +28,15 @@ public class SetUPhoneConfigRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 【数组】云手机实例的资源 ID,调用方式举例:UPhoneIds.0=云手机实例 1 的 UPhoneId,UPhoneIds.1=云手机实例 2 的 UPhoneId。 */ @NotEmpty @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 云手机画面分辨率(宽x高) (例,1920x1080,中间是字母x)宽和高的取值范围[100,5000] */ @UCloudParam("Resolution") private String resolution; @@ -70,14 +69,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public List getUPhoneIds() { return uPhoneIds; } @@ -86,6 +77,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getResolution() { return resolution; } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneGPSRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneGPSRequest.java index c9ac34ea..222b93ab 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneGPSRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneGPSRequest.java @@ -13,7 +13,6 @@ */ package cn.ucloud.uphone.models; -import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; @@ -29,7 +28,6 @@ public class SetUPhoneGPSRequest extends Request { private String projectId; /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; @@ -91,6 +89,10 @@ public static class UPhoneGPSs extends Request { @UCloudParam("Altitude") private Double altitude; + /** GPS开关,true开启,false关闭,默认false */ + @UCloudParam("Enabled") + private Boolean enabled; + public String getUPhoneId() { return uPhoneId; } @@ -122,5 +124,13 @@ public Double getAltitude() { public void setAltitude(Double altitude) { this.altitude = altitude; } + + public Boolean getEnabled() { + return enabled; + } + + public void setEnabled(Boolean enabled) { + this.enabled = enabled; + } } } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneManagerModeRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneManagerModeRequest.java index 4fa0997a..acacae0d 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneManagerModeRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneManagerModeRequest.java @@ -38,7 +38,6 @@ public class SetUPhoneManagerModeRequest extends Request { private String mode; /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneRootModeRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneRootModeRequest.java index 7bfbda6f..2e619369 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneRootModeRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneRootModeRequest.java @@ -29,11 +29,6 @@ public class SetUPhoneRootModeRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** * 【数组】云手机实例的资源 ID,调用方式举例:UPhoneIds.0=希望重启的云手机实例 1 的 UPhoneId,UPhoneIds.1=云手机实例 2 的 UPhoneId。 */ @@ -46,10 +41,18 @@ public class SetUPhoneRootModeRequest extends Request { @UCloudParam("Root") private Boolean root; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; + /** 【数组】加入应用白名单的包名 */ + @UCloudParam("PkgNames") + private List pkgNames; + public String getProjectId() { return projectId; } @@ -58,14 +61,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public List getUPhoneIds() { return uPhoneIds; } @@ -82,6 +77,14 @@ public void setRoot(Boolean root) { this.root = root; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } @@ -89,4 +92,12 @@ public String getProductType() { public void setProductType(String productType) { this.productType = productType; } + + public List getPkgNames() { + return pkgNames; + } + + public void setPkgNames(List pkgNames) { + this.pkgNames = pkgNames; + } } diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneTokenRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneTokenRequest.java index 6e7a087a..f1ed8f62 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneTokenRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SetUPhoneTokenRequest.java @@ -33,7 +33,6 @@ public class SetUPhoneTokenRequest extends Request { private String uPhoneId; /** 城市Id,通过[获取城市列表](https://docs.ucloud.cn/api/uphone-api/describe_u_phone_cities)获取 */ - @NotEmpty @UCloudParam("CityId") private String cityId; diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneIndependentIpResponse.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneIndependentIpResponse.java deleted file mode 100644 index bd9cbafb..00000000 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneIndependentIpResponse.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * 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.uphone.models; - - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -public class SwitchUPhoneIndependentIpResponse extends Response { - - /** 更换后的新IP地址 */ - @SerializedName("NewIp") - private String newIp; - - public String getNewIp() { - return newIp; - } - - public void setNewIp(String newIp) { - this.newIp = newIp; - } -} diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneInstanceRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneInstanceRequest.java deleted file mode 100644 index 01b85834..00000000 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneInstanceRequest.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * 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.uphone.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 SwitchUPhoneInstanceRequest extends Request { - - /** - * 项目ID。不填写为默认项目,子帐号必须填写。 - * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - */ - @UCloudParam("ProjectId") - private String projectId; - - /** - * 城市Id,通过[获取城市列表](https://cms-docs.ucloudadmin.com/api/uphone-api/describe_u_phone_cities)获取 - */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - - /** */ - @UCloudParam("SwitchInfos") - private List switchInfos; - - public String getProjectId() { - return projectId; - } - - public void setProjectId(String projectId) { - this.projectId = projectId; - } - - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - - public List getSwitchInfos() { - return switchInfos; - } - - public void setSwitchInfos(List switchInfos) { - this.switchInfos = switchInfos; - } - - public static class SwitchInfos extends Request { - - /** 【数组】云手机实例的资源 ID,N<200 */ - @NotEmpty - @UCloudParam("UPhoneId") - private String uPhoneId; - - /** 【数组】云手机实例的镜像ID,N<200,该值为空时,默认使用云手机之前的镜像ID,如果镜像ID已经不存在了则会返回错误 */ - @UCloudParam("ImageId") - private String imageId; - - public String getUPhoneId() { - return uPhoneId; - } - - public void setUPhoneId(String uPhoneId) { - this.uPhoneId = uPhoneId; - } - - public String getImageId() { - return imageId; - } - - public void setImageId(String imageId) { - this.imageId = imageId; - } - } -} diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneInstanceResponse.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneInstanceResponse.java deleted file mode 100644 index 2da3473c..00000000 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/SwitchUPhoneInstanceResponse.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * 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.uphone.models; - - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -public class SwitchUPhoneInstanceResponse extends Response { - - /** 任务ID,用来查询故障更换云手机任务状态 */ - @SerializedName("JobId") - private String jobId; - - public String getJobId() { - return jobId; - } - - public void setJobId(String jobId) { - this.jobId = jobId; - } -} diff --git a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/UnInstallUPhoneAppVersionRequest.java b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/UnInstallUPhoneAppVersionRequest.java index 90ca0d66..791f4ec9 100644 --- a/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/UnInstallUPhoneAppVersionRequest.java +++ b/ucloud-sdk-java-uphone/src/main/java/cn/ucloud/uphone/models/UnInstallUPhoneAppVersionRequest.java @@ -28,11 +28,6 @@ public class UnInstallUPhoneAppVersionRequest extends Request { @UCloudParam("ProjectId") private String projectId; - /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ - @NotEmpty - @UCloudParam("CityId") - private String cityId; - /** 应用版本的唯一标识ID */ @NotEmpty @UCloudParam("AppVersionId") @@ -45,6 +40,10 @@ public class UnInstallUPhoneAppVersionRequest extends Request { @UCloudParam("UPhoneIds") private List uPhoneIds; + /** 城市Id,通过[获取城市列表](#DescribeUPhoneCities)获取 */ + @UCloudParam("CityId") + private String cityId; + /** 枚举值。当前操作的产品类型,1、uphone:云手机场景;2、uphone-server:云手机服务器场景。默认云手机服务器场景。 */ @UCloudParam("ProductType") private String productType; @@ -57,14 +56,6 @@ public void setProjectId(String projectId) { this.projectId = projectId; } - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - public String getAppVersionId() { return appVersionId; } @@ -81,6 +72,14 @@ public void setUPhoneIds(List uPhoneIds) { this.uPhoneIds = uPhoneIds; } + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getProductType() { return productType; } diff --git a/ucloud-sdk-java-uphost/pom.xml b/ucloud-sdk-java-uphost/pom.xml index 8f866509..c73cd846 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uphost - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uslk/pom.xml b/ucloud-sdk-java-uslk/pom.xml index a690e3b2..704b1859 100644 --- a/ucloud-sdk-java-uslk/pom.xml +++ b/ucloud-sdk-java-uslk/pom.xml @@ -5,18 +5,18 @@ ucloud-sdk-java cn.ucloud - 1.0.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uslk - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-usms/pom.xml b/ucloud-sdk-java-usms/pom.xml index 8fc05064..f4d0cbd4 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-usms - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-uvms/pom.xml b/ucloud-sdk-java-uvms/pom.xml index d7ad93bb..2faecee5 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-uvms - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release diff --git a/ucloud-sdk-java-vpc/pom.xml b/ucloud-sdk-java-vpc/pom.xml index cda51958..014dc52c 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.6-release + 1.0.7-release 4.0.0 ucloud-sdk-java-vpc - 1.0.6-release + 1.0.7-release cn.ucloud ucloud-sdk-java-common - 1.0.6-release + 1.0.7-release