Skip to content

sdk: rolling update for 1.2.25-release #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2024
Merged

sdk: rolling update for 1.2.25-release #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.24-release
1.2.25-release
4 changes: 2 additions & 2 deletions examples/generic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions examples/uhost/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-uhost</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>
</dependencies>
</project>
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java</artifactId>
<packaging>pom</packaging>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
<modules>
<module>ucloud-sdk-java-common</module>
<module>ucloud-sdk-java-cube</module>
Expand All @@ -31,6 +31,7 @@
<module>ucloud-sdk-java-uhost</module>
<module>ucloud-sdk-java-uk8s</module>
<module>ucloud-sdk-java-ulb</module>
<module>ucloud-sdk-java-ulog</module>
<module>ucloud-sdk-java-umem</module>
<module>ucloud-sdk-java-umongodb</module>
<module>ucloud-sdk-java-unet</module>
Expand Down
4 changes: 2 additions & 2 deletions ucloud-sdk-java-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-cube/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-cube</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ipsecvpn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ipsecvpn</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-pathx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-pathx</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-sts/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-sts</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-uaccount/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-uaccount</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-uai_modelverse/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-uai_modelverse</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ubill/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ubill</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class ListUBillDetailRequest extends Request {
@UCloudParam("ShowZero")
private Integer showZero;

/** 支付状态 (筛选项, 1:仅显示未支付订单; 2:仅显示已支付订单; 0:两者都显示) */
/** 支付状态 (筛选项, 1:仅显示未支付订单; 2:仅显示已支付订单; 0:两者都显示) 当前月份 传递1或者0，会返回历史所有未支付账单；历史月份不支持查询未支付，请勿传递1 */
@UCloudParam("PaidState")
private Integer paidState;

Expand Down
24 changes: 24 additions & 0 deletions ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ public void setTotalCount(Integer totalCount) {

public static class BillDetailItem extends Response {

/** 项目id */
@SerializedName("ProjectId")
private String projectId;

/** 订单总金额 */
@SerializedName("Amount")
private String amount;
Expand Down Expand Up @@ -130,6 +134,10 @@ public static class BillDetailItem extends Response {
@SerializedName("ResourceExtendInfo")
private List<ResourceExtendInfo> resourceExtendInfo;

/** 资源标签。字符串键值对的map：{"cs_label": "cs_label_value"} */
@SerializedName("ResourceLabel")
private Object resourceLabel;

/** 订单支付状态。枚举值：\\> 0:未支付 \\ > 1:已支付 */
@SerializedName("ShowHover")
private Integer showHover;
Expand All @@ -150,6 +158,14 @@ public static class BillDetailItem extends Response {
@SerializedName("Admin")
private Integer admin;

public String getProjectId() {
return projectId;
}

public void setProjectId(String projectId) {
this.projectId = projectId;
}

public String getAmount() {
return amount;
}
Expand Down Expand Up @@ -294,6 +310,14 @@ public void setResourceExtendInfo(List<ResourceExtendInfo> resourceExtendInfo) {
this.resourceExtendInfo = resourceExtendInfo;
}

public Object getResourceLabel() {
return resourceLabel;
}

public void setResourceLabel(Object resourceLabel) {
this.resourceLabel = resourceLabel;
}

public Integer getShowHover() {
return showHover;
}
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ucdn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ucdn</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ucompshare/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ucompshare</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-udb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udb</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.24-release</version>
<version>1.2.25-release</version>
</dependency>

<dependency>
Expand Down
14 changes: 14 additions & 0 deletions ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
import cn.ucloud.udb.models.GetUDBClientConnNumResponse;
import cn.ucloud.udb.models.GetUDBInstanceSSLCertURLRequest;
import cn.ucloud.udb.models.GetUDBInstanceSSLCertURLResponse;
import cn.ucloud.udb.models.ListUDBMachineTypeRequest;
import cn.ucloud.udb.models.ListUDBMachineTypeResponse;
import cn.ucloud.udb.models.ListUDBUserTablesRequest;
import cn.ucloud.udb.models.ListUDBUserTablesResponse;
import cn.ucloud.udb.models.ModifyUDBInstanceNameRequest;
Expand Down Expand Up @@ -690,6 +692,18 @@ public GetUDBInstanceSSLCertURLResponse getUDBInstanceSSLCertURL(
this.invoke(request, GetUDBInstanceSSLCertURLResponse.class);
}

/**
* ListUDBMachineType - 获取UDB云数据库计算规格列表
*
* @param request Request object
* @throws UCloudException Exception
*/
public ListUDBMachineTypeResponse listUDBMachineType(ListUDBMachineTypeRequest request)
throws UCloudException {
request.setAction("ListUDBMachineType");
return (ListUDBMachineTypeResponse) this.invoke(request, ListUDBMachineTypeResponse.class);
}

/**
* ListUDBUserTables - 查看udb实例的用户表集合
*
Expand Down
Loading