Skip to content

Commit c39f0b1

Browse files
author
peggypig
committed
Merge remote-tracking branch 'origin/master' into github
2 parents 47b3252 + b148bb0 commit c39f0b1

79 files changed

Lines changed: 5166 additions & 50 deletions

File tree

Some content is hidden

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

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ucloud开发者工具套件（SDK）。<br/>
1616
- ocr
1717
- usms
1818
- ubill
19+
- ucdn
1920

2021

2122
后续将支持更多的UCloud的产品服务。
@@ -31,7 +32,7 @@ ucloud开发者工具套件（SDK）。<br/>
3132
<dependency>
3233
<groupId>cn.ucloud</groupId>
3334
<artifactId>ucloud-sdk-java-udisk</artifactId>
34-
<version>0.8.3.0-release</version>
35+
<version>0.8.4.0-release</version>
3536
</dependency>
3637

3738
方式二、官网下载（暂时无效）
@@ -196,4 +197,8 @@ public class Main {
196197
- 0.8.3.0-release
197198

198199
USMS修复SendUSMSMessage接口模板参数问题
200+
201+
- 0.8.4.0-release
202+
203+
新增业务模块Ucdn
199204

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
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>0.8.3.0-release</version>
10+
<version>0.8.4.0-release</version>
1111
<modules>
1212
<module>ucloud-sdk-java-uhost</module>
1313
<module>ucloud-sdk-java-unet</module>
@@ -25,6 +25,7 @@
2525
<module>ucloud-sdk-java-ocr</module>
2626
<module>ucloud-sdk-java-usms</module>
2727
<module>ucloud-sdk-java-ubill</module>
28+
<module>ucloud-sdk-java-ucdn</module>
2829
</modules>
2930

3031
<name>ucloud-sdk-java</name>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.3.0-release</version>
8+
<version>0.8.4.0-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>ucloud-sdk-java-censor</artifactId>
13-
<version>0.8.3.0-release</version>
13+
<version>0.8.4.0-release</version>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>cn.ucloud</groupId>
1818
<artifactId>ucloud-sdk-java-common</artifactId>
19-
<version>0.8.3.0-release</version>
19+
<version>0.8.4.0-release</version>
2020
</dependency>
2121

2222

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.3.0-release</version>
8+
<version>0.8.4.0-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>ucloud-sdk-java-common</artifactId>
13-
<version>0.8.3.0-release</version>
13+
<version>0.8.4.0-release</version>
1414

1515
<dependencies>
1616

‎ucloud-sdk-java-common/src/main/java/cn/ucloud/common/http/Http.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public Http(Class<? extends BaseResponseResult> resultClass) {
3131

3232
private static Logger logger = LoggerFactory.getLogger(Http.class);
3333

34-
private static final String SDK_VERSION = "0.8.3.0-release";
34+
private static final String SDK_VERSION = "0.8.4.0-release";
3535

3636
private static final String USER_AGENT;
3737

‎ucloud-sdk-java-common/src/main/java/cn/ucloud/common/pojo/BaseRequestParam.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class BaseRequestParam {
4040
@UcloudParam("ProjectId")
4141
protected String projectId;
4242

43-
protected BaseRequestParam(@NotEmpty(message = "action can not be empty") String action) {
43+
public BaseRequestParam(@NotEmpty(message = "action can not be empty") String action) {
4444
this.action = action;
4545
}
4646

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.3.0-release</version>
8+
<version>0.8.4.0-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.3.0-release</version>
12+
<version>0.8.4.0-release</version>
1313
<artifactId>ucloud-sdk-java-ocr</artifactId>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>cn.ucloud</groupId>
1818
<artifactId>ucloud-sdk-java-common</artifactId>
19-
<version>0.8.3.0-release</version>
19+
<version>0.8.4.0-release</version>
2020
</dependency>
2121

2222

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.3.0-release</version>
8+
<version>0.8.4.0-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.3.0-release</version>
12+
<version>0.8.4.0-release</version>
1313
<artifactId>ucloud-sdk-java-pathx</artifactId>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>cn.ucloud</groupId>
1818
<artifactId>ucloud-sdk-java-common</artifactId>
19-
<version>0.8.3.0-release</version>
19+
<version>0.8.4.0-release</version>
2020
</dependency>
2121

2222
<dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.3.0-release</version>
8+
<version>0.8.4.0-release</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>cn.ucloud</groupId>
1717
<artifactId>ucloud-sdk-java-common</artifactId>
18-
<version>0.8.3.0-release</version>
18+
<version>0.8.4.0-release</version>
1919
</dependency>
2020

2121

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>ucloud-sdk-java</artifactId>
7+
<groupId>cn.ucloud</groupId>
8+
<version>0.8.4.0-release</version>
9+
</parent>
10+
11+
<modelVersion>4.0.0</modelVersion>
12+
<artifactId>ucloud-sdk-java-ucdn</artifactId>
13+
<version>0.8.4.0-release</version>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>cn.ucloud</groupId>
18+
<artifactId>ucloud-sdk-java-common</artifactId>
19+
<version>0.8.4.0-release</version>
20+
</dependency>
21+
22+
<dependency>
23+
<groupId>org.hibernate</groupId>
24+
<artifactId>hibernate-validator</artifactId>
25+
</dependency>
26+
27+
<dependency>
28+
<groupId>com.google.code.gson</groupId>
29+
<artifactId>gson</artifactId>
30+
</dependency>
31+
32+
<dependency>
33+
<groupId>org.apache.commons</groupId>
34+
<artifactId>commons-lang3</artifactId>
35+
</dependency>
36+
37+
<dependency>
38+
<groupId>junit</groupId>
39+
<artifactId>junit</artifactId>
40+
<scope>test</scope>
41+
</dependency>
42+
43+
<dependency>
44+
<groupId>org.slf4j</groupId>
45+
<artifactId>slf4j-simple</artifactId>
46+
<scope>provided</scope>
47+
</dependency>
48+
49+
<dependency>
50+
<groupId>org.skyscreamer</groupId>
51+
<artifactId>jsonassert</artifactId>
52+
<scope>test</scope>
53+
</dependency>
54+
</dependencies>
55+
</project>

0 commit comments

Comments
 (0)