sdk: rolling update for 1.2.25-release (#88)

ucloud · Jun 20, 2024 · 811af72 · 811af72
1 parent 1363095
commit 811af72
Show file tree

Hide file tree

Showing 70 changed files with 1,703 additions and 116 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.24-release
+1.2.25-release
diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml
@@ -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>
@@ -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>
diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml
@@ -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>
@@ -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>
diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>

diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-sts/pom.xml b/ucloud-sdk-java-sts/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-uai_modelverse/pom.xml b/ucloud-sdk-java-uai_modelverse/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailRequest.java b/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailRequest.java
@@ -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;
 

diff --git a/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailResponse.java b/ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/models/ListUBillDetailResponse.java
@@ -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;
@@ -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;
@@ -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;
         }
@@ -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;
         }

diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-ucompshare/pom.xml b/ucloud-sdk-java-ucompshare/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml
@@ -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>

diff --git a/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java b/ucloud-sdk-java-udb/src/main/java/cn/ucloud/udb/client/UDBClient.java
@@ -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;
@@ -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实例的用户表集合
      *