Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into github
Browse files Browse the repository at this point in the history
  • Loading branch information
peggypig committed Sep 27, 2020
2 parents 6264ed8 + 3921e56 commit ed2055f
Show file tree
Hide file tree
Showing 20 changed files with 68 additions and 58 deletions.
8 changes: 6 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ucloud开发者工具套件（SDK）。<br/>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-udisk</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</dependency>

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

- 0.8.4.2-release

默认关闭日志
默认关闭日志

- 0.8.4.3-release

支持自定义HttpClient
2 changes: 1 addition & 1 deletion pom.xml
View file
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>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
<modules>
<module>ucloud-sdk-java-uhost</module>
<module>ucloud-sdk-java-unet</module>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-censor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-censor</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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


Expand Down
4 changes: 2 additions & 2 deletions ucloud-sdk-java-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

<dependencies>

Expand Down
18 changes: 12 additions & 6 deletions ucloud-sdk-java-common/src/main/java/cn/ucloud/common/http/Http.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,27 @@ public Http(Class<? extends BaseResponseResult> resultClass, boolean enableLog)
this.enableLog = enableLog;
}

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

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

private static final String USER_AGENT;

private static CloseableHttpClient closeableHttpClient = HttpClients.createDefault();

static {
String runTimeVersion = System.getProperty("java.runtime.version");
runTimeVersion = (runTimeVersion == null || runTimeVersion.isEmpty()) ? "UnKnown RuntimeVersion" : runTimeVersion;

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

public static void setHttpClient(CloseableHttpClient httpClient) {
if (httpClient != null) {
closeableHttpClient = httpClient;
}
}

public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler, Boolean async) throws Exception {
CloseableHttpResponse response = null;
BaseResponseResult responseResult = null;
Expand All @@ -75,10 +83,8 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
headerInfo);
}

// 创建HttpClient对象
final CloseableHttpClient client = HttpClients.createDefault();
try {
response = client.execute(request);
response = closeableHttpClient.execute(request);
if (response != null) {
// 正常响应
String content = EntityUtils.toString(response.getEntity(), "UTF-8");
Expand Down Expand Up @@ -112,7 +118,7 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
}
}
try {
client.close();
closeableHttpClient.close();
} catch (IOException e) {
if (enableLog) {
logger.error("httpClient close error:{}", e.getMessage());
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ocr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
<artifactId>ucloud-sdk-java-ocr</artifactId>

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


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

<modelVersion>4.0.0</modelVersion>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
<artifactId>ucloud-sdk-java-pathx</artifactId>

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

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ucloud-sdk-java-ubill/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</dependency>


Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ucdn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ucdn</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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

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

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udb</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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


Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-udisk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udisk</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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

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

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udpn</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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


Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ufs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ufs</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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

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

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-uhost</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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

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

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ulb</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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

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

<modelVersion>4.0.0</modelVersion>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>
<artifactId>ucloud-sdk-java-umem</artifactId>

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

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

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-unet</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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

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

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-usms</artifactId>
<version>0.8.4.2-release</version>
<version>0.8.4.3-release</version>

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

<dependency>
Expand Down
Loading

0 comments on commit ed2055f

Please sign in to comment.