Skip to content

Commit ed2055f

Browse files
author
peggypig
committed
Merge remote-tracking branch 'origin/master' into github
2 parents 6264ed8 + 3921e56 commit ed2055f

File tree

20 files changed

+68
-58
lines changed

20 files changed

+68
-58
lines changed

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ucloud开发者工具套件（SDK）。<br/>
3232
<dependency>
3333
<groupId>cn.ucloud</groupId>
3434
<artifactId>ucloud-sdk-java-udisk</artifactId>
35-
<version>0.8.4.2-release</version>
35+
<version>0.8.4.3-release</version>
3636
</dependency>
3737

3838
方式二、官网下载（暂时无效）
@@ -208,4 +208,8 @@ public class Main {
208208

209209
- 0.8.4.2-release
210210

211-
默认关闭日志
211+
默认关闭日志
212+
213+
- 0.8.4.3-release
214+
215+
支持自定义HttpClient

‎pom.xml‎

Lines changed: 1 addition & 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.4.2-release</version>
10+
<version>0.8.4.3-release</version>
1111
<modules>
1212
<module>ucloud-sdk-java-uhost</module>
1313
<module>ucloud-sdk-java-unet</module>

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

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

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

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

1515
<dependencies>
1616

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,27 @@ public Http(Class<? extends BaseResponseResult> resultClass, boolean enableLog)
3636
this.enableLog = enableLog;
3737
}
3838

39-
private static Logger logger = LoggerFactory.getLogger(Http.class);
39+
private static final Logger logger = LoggerFactory.getLogger(Http.class);
4040

41-
private static final String SDK_VERSION = "0.8.4.2-release";
41+
private static final String SDK_VERSION = "0.8.4.3-release";
4242

4343
private static final String USER_AGENT;
4444

45+
private static CloseableHttpClient closeableHttpClient = HttpClients.createDefault();
46+
4547
static {
4648
String runTimeVersion = System.getProperty("java.runtime.version");
4749
runTimeVersion = (runTimeVersion == null || runTimeVersion.isEmpty()) ? "UnKnown RuntimeVersion" : runTimeVersion;
4850

4951
USER_AGENT = String.format("JAVA_%s/JAVA-SDK/%s", runTimeVersion, SDK_VERSION);
5052
}
5153

54+
public static void setHttpClient(CloseableHttpClient httpClient) {
55+
if (httpClient != null) {
56+
closeableHttpClient = httpClient;
57+
}
58+
}
59+
5260
public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler, Boolean async) throws Exception {
5361
CloseableHttpResponse response = null;
5462
BaseResponseResult responseResult = null;
@@ -75,10 +83,8 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
7583
headerInfo);
7684
}
7785

78-
// 创建HttpClient对象
79-
final CloseableHttpClient client = HttpClients.createDefault();
8086
try {
81-
response = client.execute(request);
87+
response = closeableHttpClient.execute(request);
8288
if (response != null) {
8389
// 正常响应
8490
String content = EntityUtils.toString(response.getEntity(), "UTF-8");
@@ -112,7 +118,7 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
112118
}
113119
}
114120
try {
115-
client.close();
121+
closeableHttpClient.close();
116122
} catch (IOException e) {
117123
if (enableLog) {
118124
logger.error("httpClient close error:{}", e.getMessage());

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

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.4.2-release</version>
12+
<version>0.8.4.3-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.4.2-release</version>
19+
<version>0.8.4.3-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.4.2-release</version>
8+
<version>0.8.4.3-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.4.2-release</version>
12+
<version>0.8.4.3-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.4.2-release</version>
19+
<version>0.8.4.3-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.4.2-release</version>
8+
<version>0.8.4.3-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.4.2-release</version>
18+
<version>0.8.4.3-release</version>
1919
</dependency>
2020

2121

‎ucloud-sdk-java-ucdn/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.4.2-release</version>
8+
<version>0.8.4.3-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>ucloud-sdk-java-ucdn</artifactId>
13-
<version>0.8.4.2-release</version>
13+
<version>0.8.4.3-release</version>
1414

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

2222
<dependency>

‎ucloud-sdk-java-udb/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.4.2-release</version>
8+
<version>0.8.4.3-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>ucloud-sdk-java-udb</artifactId>
13-
<version>0.8.4.2-release</version>
13+
<version>0.8.4.3-release</version>
1414

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

2222

0 commit comments

Comments
 (0)