Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5dc3913

Browse files
author
jianhui.zhang
committed
Merge branch 'codezhang-dev' into 'master'
关闭日志 See merge request esl_ipdd/ucloud-sdk-java!69
2 parents a5af30b + c47a2b0 commit 5dc3913

File tree

23 files changed

+97
-65
lines changed

23 files changed

+97
-65
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.1-release</version>
35+
<version>0.8.4.2-release</version>
3636
</dependency>
3737

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

205205
- 0.8.4.1-release
206206

207-
修改参数转json逻辑，避免转义问题
207+
修改参数转json逻辑，避免转义问题
208+
209+
- 0.8.4.2-release
210+
211+
默认关闭日志

‎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.1-release</version>
10+
<version>0.8.4.2-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.1-release</version>
8+
<version>0.8.4.2-release</version>
99
</parent>
1010

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

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

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

1515
<dependencies>
1616

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

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,20 @@ public class Http {
2525

2626
private Class<? extends BaseResponseResult> resultClass;
2727

28+
private boolean enableLog = false;
29+
2830
public Http(Class<? extends BaseResponseResult> resultClass) {
2931
this.resultClass = resultClass;
3032
}
3133

34+
public Http(Class<? extends BaseResponseResult> resultClass, boolean enableLog) {
35+
this.resultClass = resultClass;
36+
this.enableLog = enableLog;
37+
}
38+
3239
private static Logger logger = LoggerFactory.getLogger(Http.class);
3340

34-
private static final String SDK_VERSION = "0.8.4.1-release";
41+
private static final String SDK_VERSION = "0.8.4.2-release";
3542

3643
private static final String USER_AGENT;
3744

@@ -47,9 +54,9 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
4754
BaseResponseResult responseResult = null;
4855
request.addHeader("User-Agent", USER_AGENT);
4956

50-
String uriInfo = request.getURI().toString();
51-
String headerInfo = new Gson().toJson(request.getAllHeaders());
52-
if (request instanceof HttpPost) {
57+
if (enableLog && request instanceof HttpPost) {
58+
String uriInfo = request.getURI().toString();
59+
String headerInfo = new Gson().toJson(request.getAllHeaders());
5360
String bodyInfo = EntityUtils.toString(((HttpPost) request).getEntity());
5461
logger.info("http POST request: \n" +
5562
"\tURI:{}\n" +
@@ -58,7 +65,9 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
5865
uriInfo,
5966
bodyInfo,
6067
headerInfo);
61-
} else if (request instanceof HttpGet) {
68+
} else if (enableLog && request instanceof HttpGet) {
69+
String uriInfo = request.getURI().toString();
70+
String headerInfo = new Gson().toJson(request.getAllHeaders());
6271
logger.info("http GET request: \n" +
6372
"\tURI:{}\n" +
6473
"\tHeaders:{}",
@@ -73,7 +82,9 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
7382
if (response != null) {
7483
// 正常响应
7584
String content = EntityUtils.toString(response.getEntity(), "UTF-8");
76-
logger.info("response content:{}", content);
85+
if (enableLog) {
86+
logger.info("response content:{}", content);
87+
}
7788
if (statusOK(response)) {
7889
Gson gson = new Gson();
7990
responseResult = gson.fromJson(content, resultClass);
@@ -96,12 +107,16 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
96107
response.close();
97108
}
98109
} catch (IOException e) {
99-
logger.error("response close error:{}", e.getMessage());
110+
if (enableLog) {
111+
logger.error("response close error:{}", e.getMessage());
112+
}
100113
}
101114
try {
102115
client.close();
103116
} catch (IOException e) {
104-
logger.error("httpClient close error:{}", e.getMessage());
117+
if (enableLog) {
118+
logger.error("httpClient close error:{}", e.getMessage());
119+
}
105120
}
106121
}
107122
return responseResult;
@@ -126,7 +141,9 @@ private boolean statusOK(CloseableHttpResponse response) {
126141
private void handlerException(UcloudHandler handler, Exception e, Boolean async) throws Exception {
127142
if (handler == null) {
128143
if (async != null) {
129-
logger.error("handler is null and async is not null,but get an error:{}", e.getMessage());
144+
if (enableLog) {
145+
logger.error("handler is null and async is not null,but get an error:{}", e.getMessage());
146+
}
130147
} else {
131148
throw e;
132149
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Object doGet(BaseRequestParam param,
4040
try {
4141
String httpGetParamString = ParamConstructor.getHttpGetParamString(param, config.getAccount());
4242
final HttpGet get = new HttpGet(config.getApiServerAddr() + "?" + httpGetParamString);
43-
Http http = new Http(resultClass);
43+
Http http = new Http(resultClass,config.isEnableLog());
4444
result = http.doHttp(get, handler, async(asyncFlag));
4545
} catch (Exception e) {
4646
handlerException(handler, e, async(asyncFlag));
@@ -61,7 +61,7 @@ public Object doPost(BaseRequestParam param, UcloudConfig config,
6161
StringEntity entity = new StringEntity(httpPostParamString, StandardCharsets.UTF_8);
6262
entity.setContentType("application/json");
6363
post.setEntity(entity);
64-
Http http = new Http(resultClass);
64+
Http http = new Http(resultClass,config.isEnableLog());
6565
result = http.doHttp(post, handler, async(asyncFlag));
6666
} catch (Exception e) {
6767
handlerException(handler, e, async(asyncFlag));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public Object doGet(BaseRestRequestParam param, UcloudConfig config, String rest
4242
String restHttpURLParamString = constructor.getRestHttpURLParamString();
4343
HttpGet get = new HttpGet(String.format("%s?%s", restURL, restHttpURLParamString));
4444
get.setHeaders(headers);
45-
Http http = new Http(resultClass);
45+
Http http = new Http(resultClass,config.isEnableLog());
4646
result = http.doHttp(get, handler, async(asyncFlag));
4747
} catch (Exception e) {
4848
handlerException(handler, e, async(asyncFlag));
@@ -63,7 +63,7 @@ public Object doPost(BaseRestRequestParam param, UcloudConfig config, String res
6363
HttpEntity entity = constructor.getEntity();
6464
post.setEntity(entity);
6565
post.setHeaders(headers);
66-
Http http = new Http(resultClass);
66+
Http http = new Http(resultClass,config.isEnableLog());
6767
result = http.doHttp(post, handler, async(asyncFlag));
6868
} catch (Exception e) {
6969
handlerException(handler, e, async(asyncFlag));

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ public class UcloudConfig {
1515

1616
private String apiServerAddr = "https://api.ucloud.cn";
1717

18+
private boolean enableLog = false;
19+
20+
public boolean isEnableLog() {
21+
return enableLog;
22+
}
23+
24+
public UcloudConfig setEnableLog(boolean enableLog) {
25+
this.enableLog = enableLog;
26+
return this;
27+
}
28+
1829
public UcloudConfig(Account account) {
1930
this.account = account;
2031
}

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

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

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.4.1-release</version>
12+
<version>0.8.4.2-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.1-release</version>
19+
<version>0.8.4.2-release</version>
2020
</dependency>
2121

2222
<dependency>

0 commit comments

Comments
 (0)