Skip to content

Commit 8014184

Browse files
author
peggypig
committed
Merge remote-tracking branch 'origin/master' into github
2 parents bd96189 + 33b7468 commit 8014184

42 files changed

Lines changed: 1365 additions & 73 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: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ucloud开发者工具套件（SDK）。<br/>
1515
- censor
1616
- ocr
1717
- usms
18+
- ubill
1819

1920

2021
后续将支持更多的UCloud的产品服务。
@@ -30,7 +31,7 @@ ucloud开发者工具套件（SDK）。<br/>
3031
<dependency>
3132
<groupId>cn.ucloud</groupId>
3233
<artifactId>ucloud-sdk-java-udisk</artifactId>
33-
<version>0.8.2.8-release</version>
34+
<version>0.8.2.9-release</version>
3435
</dependency>
3536

3637
方式二、官网下载（暂时无效）
@@ -187,4 +188,7 @@ public class Main {
187188
- 0.8.2.8-release
188189

189190
PathX、ULB、VPC、UDB维护更新，USMS新增接口；接口调用改用POST方式
191+
192+
- 0.8.2.9-release
193+
UNet、ULB、UDPN维护更新；新增UBill模块
190194

‎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.2.8-release</version>
10+
<version>0.8.2.9-release</version>
1111
<modules>
1212
<module>ucloud-sdk-java-uhost</module>
1313
<module>ucloud-sdk-java-unet</module>
@@ -24,6 +24,7 @@
2424
<module>ucloud-sdk-java-censor</module>
2525
<module>ucloud-sdk-java-ocr</module>
2626
<module>ucloud-sdk-java-usms</module>
27+
<module>ucloud-sdk-java-ubill</module>
2728
</modules>
2829

2930
<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.2.8-release</version>
8+
<version>0.8.2.9-release</version>
99
</parent>
1010

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

1515
<dependencies>
1616
<dependency>
1717
<groupId>cn.ucloud</groupId>
1818
<artifactId>ucloud-sdk-java-common</artifactId>
19-
<version>0.8.2.8-release</version>
19+
<version>0.8.2.9-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.2.8-release</version>
8+
<version>0.8.2.9-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>ucloud-sdk-java-common</artifactId>
13-
<version>0.8.2.8-release</version>
13+
<version>0.8.2.9-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.2.8-release";
34+
private static final String SDK_VERSION = "0.8.2.9-release";
3535

3636
private static final String USER_AGENT;
3737

‎ucloud-sdk-java-common/src/main/java/cn/ucloud/common/util/ObjectToParam.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,16 @@ public class ObjectToParam {
2727
public static List<Param> objectToParams(BaseRequestParam baseRequestParam) throws Exception {
2828
List<Param> params = new ArrayList<>();
2929
if (baseRequestParam != null) {
30-
// 参数转化 1. 转化属性
3130
Class<?> objectClass = baseRequestParam.getClass();
31+
params.addAll(getFieldParam(objectClass, baseRequestParam));
32+
params.addAll(getMethodParam(objectClass, baseRequestParam));
33+
3234
Class<?> superclass = objectClass.getSuperclass();
33-
if (superclass != null) {
35+
while (!superclass.isAssignableFrom(Object.class)){
3436
params.addAll(getFieldParam(superclass, baseRequestParam));
35-
}
36-
params.addAll(getFieldParam(objectClass, baseRequestParam));
37-
// 参数转化 2. 方法转化
38-
if (superclass != null) {
3937
params.addAll(getMethodParam(superclass, baseRequestParam));
38+
superclass = superclass.getSuperclass();
4039
}
41-
params.addAll(getMethodParam(objectClass, baseRequestParam));
4240
} else {
4341
throw new NullPointerException("param object can not be null");
4442
}

‎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.2.8-release</version>
8+
<version>0.8.2.9-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.2.8-release</version>
12+
<version>0.8.2.9-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.2.8-release</version>
19+
<version>0.8.2.9-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.2.8-release</version>
8+
<version>0.8.2.9-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.2.8-release</version>
12+
<version>0.8.2.9-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.2.8-release</version>
19+
<version>0.8.2.9-release</version>
2020
</dependency>
2121

2222
<dependency>

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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.2.9-release</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>ucloud-sdk-java-ubill</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>cn.ucloud</groupId>
17+
<artifactId>ucloud-sdk-java-common</artifactId>
18+
<version>0.8.2.9-release</version>
19+
</dependency>
20+
21+
22+
<dependency>
23+
<groupId>org.hibernate</groupId>
24+
<artifactId>hibernate-validator</artifactId>
25+
</dependency>
26+
27+
<dependency>
28+
<groupId>junit</groupId>
29+
<artifactId>junit</artifactId>
30+
<scope>test</scope>
31+
</dependency>
32+
33+
<dependency>
34+
<groupId>org.slf4j</groupId>
35+
<artifactId>slf4j-api</artifactId>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>org.slf4j</groupId>
40+
<artifactId>slf4j-simple</artifactId>
41+
<scope>provided</scope>
42+
</dependency>
43+
44+
<dependency>
45+
<groupId>org.skyscreamer</groupId>
46+
<artifactId>jsonassert</artifactId>
47+
<scope>test</scope>
48+
</dependency>
49+
</dependencies>
50+
</project>

‎ucloud-sdk-java-ubill/src/main/java/cn/ucloud/ubill/client/DefaultUBillClient.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package cn.ucloud.ubill.client;
2+
3+
import cn.ucloud.common.client.DefaultUcloudClient;
4+
import cn.ucloud.common.handler.UcloudHandler;
5+
import cn.ucloud.common.http.UcloudHttp;
6+
import cn.ucloud.common.http.UcloudHttpImpl;
7+
import cn.ucloud.common.pojo.UcloudConfig;
8+
import cn.ucloud.ubill.model.DescribeOrderDetailInfoParam;
9+
import cn.ucloud.ubill.model.DescribeOrderDetailInfoResult;
10+
import cn.ucloud.ubill.model.GetBillDataFileUrlParam;
11+
import cn.ucloud.ubill.model.GetBillDataFileUrlResult;
12+
13+
/**
14+
* @author: codezhang
15+
* @date: 2020/2/13 11:59 上午
16+
* @describe:
17+
**/
18+
public class DefaultUBillClient extends DefaultUcloudClient implements UBillClient {
19+
20+
public DefaultUBillClient(UcloudConfig config) {
21+
super(config);
22+
}
23+
24+
@Override
25+
public DescribeOrderDetailInfoResult describeOrderDetailInfo(DescribeOrderDetailInfoParam param) throws Exception {
26+
UcloudHttp http = new UcloudHttpImpl(DescribeOrderDetailInfoResult.class);
27+
return (DescribeOrderDetailInfoResult) http.doPost(param, config, null);
28+
}
29+
30+
@Override
31+
public void describeOrderDetailInfo(DescribeOrderDetailInfoParam param, UcloudHandler<DescribeOrderDetailInfoResult> handler, Boolean... asyncFlag) {
32+
UcloudHttp http = new UcloudHttpImpl(DescribeOrderDetailInfoResult.class);
33+
try {
34+
http.doPost(param, config, handler, asyncFlag);
35+
} catch (Exception e) {
36+
}
37+
}
38+
39+
@Override
40+
public GetBillDataFileUrlResult getBillDataFileUrl(GetBillDataFileUrlParam param) throws Exception {
41+
UcloudHttp http = new UcloudHttpImpl(GetBillDataFileUrlResult.class);
42+
return (GetBillDataFileUrlResult) http.doPost(param, config, null);
43+
}
44+
45+
@Override
46+
public void getBillDataFileUrl(GetBillDataFileUrlParam param, UcloudHandler<GetBillDataFileUrlResult> handler, Boolean... asyncFlag) {
47+
UcloudHttp http = new UcloudHttpImpl(GetBillDataFileUrlResult.class);
48+
try {
49+
http.doPost(param, config, handler, asyncFlag);
50+
} catch (Exception e) {
51+
}
52+
}
53+
}

0 commit comments

Comments
 (0)