Skip to content

Commit 811af72

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 1.2.25-release (ucloud#88)
1 parent 1363095 commit 811af72

File tree

70 files changed

+1703
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1703
-116
lines changed

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.24-release
1+
1.2.25-release

‎examples/generic/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>ucloud-sdk-java</artifactId>
99
<groupId>cn.ucloud</groupId>
10-
<version>1.2.24-release</version>
10+
<version>1.2.25-release</version>
1111
</parent>
1212

1313
<modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>cn.ucloud</groupId>
2020
<artifactId>ucloud-sdk-java-common</artifactId>
21-
<version>1.2.24-release</version>
21+
<version>1.2.25-release</version>
2222
</dependency>
2323
</dependencies>
2424
</project>

‎examples/uhost/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>ucloud-sdk-java</artifactId>
99
<groupId>cn.ucloud</groupId>
10-
<version>1.2.24-release</version>
10+
<version>1.2.25-release</version>
1111
</parent>
1212

1313
<modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>cn.ucloud</groupId>
2020
<artifactId>ucloud-sdk-java-uhost</artifactId>
21-
<version>1.2.24-release</version>
21+
<version>1.2.25-release</version>
2222
</dependency>
2323
</dependencies>
2424
</project>

‎pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>cn.ucloud</groupId>
88
<artifactId>ucloud-sdk-java</artifactId>
99
<packaging>pom</packaging>
10-
<version>1.2.24-release</version>
10+
<version>1.2.25-release</version>
1111
<modules>
1212
<module>ucloud-sdk-java-common</module>
1313
<module>ucloud-sdk-java-cube</module>
@@ -31,6 +31,7 @@
3131
<module>ucloud-sdk-java-uhost</module>
3232
<module>ucloud-sdk-java-uk8s</module>
3333
<module>ucloud-sdk-java-ulb</module>
34+
<module>ucloud-sdk-java-ulog</module>
3435
<module>ucloud-sdk-java-umem</module>
3536
<module>ucloud-sdk-java-umongodb</module>
3637
<module>ucloud-sdk-java-unet</module>

‎ucloud-sdk-java-common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<artifactId>ucloud-sdk-java</artifactId>
99
<groupId>cn.ucloud</groupId>
10-
<version>1.2.24-release</version>
10+
<version>1.2.25-release</version>
1111
</parent>
1212

1313
<modelVersion>4.0.0</modelVersion>
1414
<artifactId>ucloud-sdk-java-common</artifactId>
15-
<version>1.2.24-release</version>
15+
<version>1.2.25-release</version>
1616

1717
<dependencies>
1818
<dependency>

‎ucloud-sdk-java-cube/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-cube</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-ipsecvpn/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-ipsecvpn</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-pathx/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-pathx</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-sts/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-sts</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-uaccount/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-uaccount</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-uai_modelverse/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-uai_modelverse</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-ubill/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-ubill</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class ListUBillDetailRequest extends Request {
5656
@UCloudParam("ShowZero")
5757
private Integer showZero;
5858

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

‎ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailResponse.java

+24
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ public void setTotalCount(Integer totalCount) {
4747

4848
public static class BillDetailItem extends Response {
4949

50+
/** 项目id */
51+
@SerializedName("ProjectId")
52+
private String projectId;
53+
5054
/** 订单总金额 */
5155
@SerializedName("Amount")
5256
private String amount;
@@ -130,6 +134,10 @@ public static class BillDetailItem extends Response {
130134
@SerializedName("ResourceExtendInfo")
131135
private List<ResourceExtendInfo> resourceExtendInfo;
132136

137+
/** 资源标签。字符串键值对的map：{"cs_label": "cs_label_value"} */
138+
@SerializedName("ResourceLabel")
139+
private Object resourceLabel;
140+
133141
/** 订单支付状态。枚举值：\\> 0:未支付 \\ > 1:已支付 */
134142
@SerializedName("ShowHover")
135143
private Integer showHover;
@@ -150,6 +158,14 @@ public static class BillDetailItem extends Response {
150158
@SerializedName("Admin")
151159
private Integer admin;
152160

161+
public String getProjectId() {
162+
return projectId;
163+
}
164+
165+
public void setProjectId(String projectId) {
166+
this.projectId = projectId;
167+
}
168+
153169
public String getAmount() {
154170
return amount;
155171
}
@@ -294,6 +310,14 @@ public void setResourceExtendInfo(List<ResourceExtendInfo> resourceExtendInfo) {
294310
this.resourceExtendInfo = resourceExtendInfo;
295311
}
296312

313+
public Object getResourceLabel() {
314+
return resourceLabel;
315+
}
316+
317+
public void setResourceLabel(Object resourceLabel) {
318+
this.resourceLabel = resourceLabel;
319+
}
320+
297321
public Integer getShowHover() {
298322
return showHover;
299323
}

‎ucloud-sdk-java-ucdn/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-ucdn</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-ucompshare/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-ucompshare</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-udb/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<parent>
77
<artifactId>ucloud-sdk-java</artifactId>
88
<groupId>cn.ucloud</groupId>
9-
<version>1.2.24-release</version>
9+
<version>1.2.25-release</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>ucloud-sdk-java-udb</artifactId>
14-
<version>1.2.24-release</version>
14+
<version>1.2.25-release</version>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>cn.ucloud</groupId>
1919
<artifactId>ucloud-sdk-java-common</artifactId>
20-
<version>1.2.24-release</version>
20+
<version>1.2.25-release</version>
2121
</dependency>
2222

2323
<dependency>

‎ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java

+14
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@
101101
import cn.ucloud.udb.models.GetUDBClientConnNumResponse;
102102
import cn.ucloud.udb.models.GetUDBInstanceSSLCertURLRequest;
103103
import cn.ucloud.udb.models.GetUDBInstanceSSLCertURLResponse;
104+
import cn.ucloud.udb.models.ListUDBMachineTypeRequest;
105+
import cn.ucloud.udb.models.ListUDBMachineTypeResponse;
104106
import cn.ucloud.udb.models.ListUDBUserTablesRequest;
105107
import cn.ucloud.udb.models.ListUDBUserTablesResponse;
106108
import cn.ucloud.udb.models.ModifyUDBInstanceNameRequest;
@@ -690,6 +692,18 @@ public GetUDBInstanceSSLCertURLResponse getUDBInstanceSSLCertURL(
690692
this.invoke(request, GetUDBInstanceSSLCertURLResponse.class);
691693
}
692694

695+
/**
696+
* ListUDBMachineType - 获取UDB云数据库计算规格列表
697+
*
698+
* @param request Request object
699+
* @throws UCloudException Exception
700+
*/
701+
public ListUDBMachineTypeResponse listUDBMachineType(ListUDBMachineTypeRequest request)
702+
throws UCloudException {
703+
request.setAction("ListUDBMachineType");
704+
return (ListUDBMachineTypeResponse) this.invoke(request, ListUDBMachineTypeResponse.class);
705+
}
706+
693707
/**
694708
* ListUDBUserTables - 查看udb实例的用户表集合
695709
*

0 commit comments

Comments
 (0)