Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.100-release
1.2.101-release
4 changes: 2 additions & 2 deletions examples/generic/pom.xml
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.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions examples/uhost/pom.xml
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.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-uhost</artifactId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion pom.xml
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.100-release</version>
<version>1.2.101-release</version>
<modules>
<module>ucloud-sdk-java-common</module>
<module>ucloud-sdk-java-cloudwatch</module>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-cloudwatch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-cloudwatch</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ucloud-sdk-java-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-common</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-cube/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-cube</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ipsecvpn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ipsecvpn</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-label/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-label</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-nlb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-nlb</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-pathx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-pathx</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-sandbox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-sandbox</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ public static class Site extends Response {
@SerializedName("ConnectKey")
private String connectKey;

/** 计算资源 */
@SerializedName("Resource")
private SiteResource resource;

/** 站点环境变量。格式:["key=value"] */
@SerializedName("Envs")
private List<String> envs;
Expand Down Expand Up @@ -163,6 +167,14 @@ public void setConnectKey(String connectKey) {
this.connectKey = connectKey;
}

public SiteResource getResource() {
return resource;
}

public void setResource(SiteResource resource) {
this.resource = resource;
}

public List<String> getEnvs() {
return envs;
}
Expand Down Expand Up @@ -230,4 +242,31 @@ public void setMode(String mode) {
this.mode = mode;
}
}

public static class SiteResource extends Response {

/** CPU核心 */
@SerializedName("CPU")
private Integer cpu;

/** 内存占用MB */
@SerializedName("MemoryMB")
private Integer memoryMB;

public Integer getCPU() {
return cpu;
}

public void setCPU(Integer cpu) {
this.cpu = cpu;
}

public Integer getMemoryMB() {
return memoryMB;
}

public void setMemoryMB(Integer memoryMB) {
this.memoryMB = memoryMB;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ public static class Site extends Response {
@SerializedName("ConnectKey")
private String connectKey;

/** 计算资源 */
@SerializedName("Resource")
private SiteResource resource;

/** 站点环境变量。格式:["key=value"] */
@SerializedName("Envs")
private List<String> envs;
Expand Down Expand Up @@ -175,6 +179,14 @@ public void setConnectKey(String connectKey) {
this.connectKey = connectKey;
}

public SiteResource getResource() {
return resource;
}

public void setResource(SiteResource resource) {
this.resource = resource;
}

public List<String> getEnvs() {
return envs;
}
Expand Down Expand Up @@ -242,4 +254,31 @@ public void setMode(String mode) {
this.mode = mode;
}
}

public static class SiteResource extends Response {

/** CPU核心 */
@SerializedName("CPU")
private Integer cpu;

/** 内存占用MB */
@SerializedName("MemoryMB")
private Integer memoryMB;

public Integer getCPU() {
return cpu;
}

public void setCPU(Integer cpu) {
this.cpu = cpu;
}

public Integer getMemoryMB() {
return memoryMB;
}

public void setMemoryMB(Integer memoryMB) {
this.memoryMB = memoryMB;
}
}
}
6 changes: 3 additions & 3 deletions ucloud-sdk-java-sts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-sts</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-tidb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.100-release</version>
<version>1.2.101-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-tidb</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.100-release</version>
<version>1.2.101-release</version>

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

<dependency>
Expand Down
Loading
Loading