Skip to content

Commit 32f7277

Browse files
binarywangbinarywang
committed
🎨 升级依赖jodd-http版本，并修复不兼容代码
1 parent 697a680 commit 32f7277

13 files changed

+27
-15
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<dependency>
135135
<groupId>org.jodd</groupId>
136136
<artifactId>jodd-http</artifactId>
137-
<version>5.1.6</version>
137+
<version>5.2.0</version>
138138
<scope>provided</scope>
139139
</dependency>
140140
<dependency>

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.File;
2020
import java.io.IOException;
2121
import java.io.InputStream;
22+
import java.nio.charset.StandardCharsets;
2223

2324
/**
2425
* .
@@ -47,7 +48,7 @@ public File execute(String uri, String queryParam, WxType wxType) throws WxError
4748
request.withConnectionProvider(requestHttp.getRequestHttpClient());
4849

4950
HttpResponse response = request.send();
50-
response.charset(StringPool.UTF_8);
51+
response.charset(StandardCharsets.UTF_8.name());
5152

5253
String contentType = response.header("Content-Type");
5354
if (contentType != null && contentType.startsWith("application/json")) {

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaUploadRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import java.io.File;
1616
import java.io.IOException;
17+
import java.nio.charset.StandardCharsets;
1718

1819
/**
1920
* .
@@ -35,7 +36,7 @@ public WxMediaUploadResult execute(String uri, File file, WxType wxType) throws
3536
request.withConnectionProvider(requestHttp.getRequestHttpClient());
3637
request.form("media", file);
3738
HttpResponse response = request.send();
38-
response.charset(StringPool.UTF_8);
39+
response.charset(StandardCharsets.UTF_8.name());
3940

4041
String responseContent = response.bodyText();
4142
WxError error = WxError.fromJson(responseContent, wxType);

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
1212

1313
import java.io.IOException;
14+
import java.nio.charset.StandardCharsets;
1415

1516
/**
1617
* .
@@ -38,7 +39,7 @@ public String execute(String uri, String queryParam, WxType wxType) throws WxErr
3839
}
3940
request.withConnectionProvider(requestHttp.getRequestHttpClient());
4041
HttpResponse response = request.send();
41-
response.charset(StringPool.UTF_8);
42+
response.charset(StandardCharsets.UTF_8.name());
4243

4344
return handleResponse(wxType, response.bodyText());
4445
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
1212

1313
import java.io.IOException;
14+
import java.nio.charset.StandardCharsets;
1415

1516
/**
1617
* .
@@ -37,7 +38,7 @@ public String execute(String uri, String postEntity, WxType wxType) throws WxErr
3738
request.bodyText(postEntity);
3839
}
3940
HttpResponse response = request.send();
40-
response.charset(StringPool.UTF_8);
41+
response.charset(StandardCharsets.UTF_8.name());
4142

4243
return this.handleResponse(wxType, response.bodyText());
4344
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteJoddHttpRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import me.chanjar.weixin.common.util.http.RequestHttp;
1313

1414
import java.io.IOException;
15+
import java.nio.charset.StandardCharsets;
1516

1617
/**
1718
* Created by ecoolper on 2017/5/5.
@@ -31,7 +32,7 @@ public Boolean execute(String uri, String materialId, WxType wxType) throws WxEr
3132

3233
request.query("media_id", materialId);
3334
HttpResponse response = request.send();
34-
response.charset(StringPool.UTF_8);
35+
response.charset(StandardCharsets.UTF_8.name());
3536
String responseContent = response.bodyText();
3637
WxError error = WxError.fromJson(responseContent, WxType.MP);
3738
if (error.getErrorCode() != 0) {

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoJoddHttpRequestExecutor.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import jodd.http.ProxyInfo;
88
import jodd.util.StringPool;
99

10+
import lombok.extern.slf4j.Slf4j;
1011
import me.chanjar.weixin.common.enums.WxType;
1112
import me.chanjar.weixin.common.error.WxError;
1213
import me.chanjar.weixin.common.error.WxErrorException;
@@ -18,12 +19,13 @@
1819
import org.slf4j.LoggerFactory;
1920

2021
import java.io.IOException;
22+
import java.nio.charset.StandardCharsets;
2123

2224
/**
2325
* Created by ecoolper on 2017/5/5.
2426
*/
27+
@Slf4j
2528
public class MaterialNewsInfoJoddHttpRequestExecutor extends MaterialNewsInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> {
26-
private final Logger logger = LoggerFactory.getLogger(this.getClass());
2729
public MaterialNewsInfoJoddHttpRequestExecutor(RequestHttp requestHttp) {
2830
super(requestHttp);
2931
}
@@ -38,10 +40,10 @@ public WxMpMaterialNews execute(String uri, String materialId, WxType wxType) th
3840
.withConnectionProvider(requestHttp.getRequestHttpClient())
3941
.body(WxGsonBuilder.create().toJson(ImmutableMap.of("media_id", materialId)));
4042
HttpResponse response = request.send();
41-
response.charset(StringPool.UTF_8);
43+
response.charset(StandardCharsets.UTF_8.name());
4244

4345
String responseContent = response.bodyText();
44-
this.logger.debug("响应原始数据：{}", responseContent);
46+
log.debug("响应原始数据：{}", responseContent);
4547
WxError error = WxError.fromJson(responseContent, WxType.MP);
4648
if (error.getErrorCode() != 0) {
4749
throw new WxErrorException(error);

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadJoddHttpRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.io.File;
1818
import java.io.FileNotFoundException;
1919
import java.io.IOException;
20+
import java.nio.charset.StandardCharsets;
2021
import java.util.Map;
2122

2223
/**
@@ -50,7 +51,7 @@ public WxMpMaterialUploadResult execute(String uri, WxMpMaterial material, WxTyp
5051
}
5152

5253
HttpResponse response = request.send();
53-
response.charset(StringPool.UTF_8);
54+
response.charset(StandardCharsets.UTF_8.name());
5455
String responseContent = response.bodyText();
5556
WxError error = WxError.fromJson(responseContent, WxType.MP);
5657
if (error.getErrorCode() != 0) {

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoJoddHttpRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult;
1414

1515
import java.io.IOException;
16+
import java.nio.charset.StandardCharsets;
1617

1718
/**
1819
* Created by ecoolper on 2017/5/5.
@@ -32,7 +33,7 @@ public WxMpMaterialVideoInfoResult execute(String uri, String materialId, WxType
3233

3334
request.query("media_id", materialId);
3435
HttpResponse response = request.send();
35-
response.charset(StringPool.UTF_8);
36+
response.charset(StandardCharsets.UTF_8.name());
3637
String responseContent = response.bodyText();
3738
WxError error = WxError.fromJson(responseContent, WxType.MP);
3839
if (error.getErrorCode() != 0) {

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadJoddHttpRequestExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public InputStream execute(String uri, String materialId, WxType wxType) throws
3737

3838
request.query("media_id", materialId);
3939
HttpResponse response = request.send();
40-
response.charset(StringPool.UTF_8);
40+
response.charset(StandardCharsets.UTF_8.name());
4141
try (InputStream inputStream = new ByteArrayInputStream(response.bodyBytes())) {
4242
// 下载媒体文件出错
4343
byte[] responseContent = IOUtils.toByteArray(inputStream);

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadHttpRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import java.io.File;
1616
import java.io.IOException;
17+
import java.nio.charset.StandardCharsets;
1718

1819
/**
1920
* Created by ecoolper on 2017/5/5.
@@ -39,7 +40,7 @@ public WxMediaImgUploadResult execute(String uri, File data, WxType wxType) thro
3940

4041
request.form("media", data);
4142
HttpResponse response = request.send();
42-
response.charset(StringPool.UTF_8);
43+
response.charset(StandardCharsets.UTF_8.name());
4344
String responseContent = response.bodyText();
4445
WxError error = WxError.fromJson(responseContent, WxType.MP);
4546
if (error.getErrorCode() != 0) {

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.IOException;
2020
import java.io.InputStream;
2121
import java.net.URLEncoder;
22+
import java.nio.charset.StandardCharsets;
2223
import java.util.UUID;
2324

2425
/**
@@ -47,7 +48,7 @@ public File execute(String uri, WxMpQrCodeTicket ticket, WxType wxType) throws W
4748
request.withConnectionProvider(requestHttp.getRequestHttpClient());
4849

4950
HttpResponse response = request.send();
50-
response.charset(StringPool.UTF_8);
51+
response.charset(StandardCharsets.UTF_8.name());
5152
String contentTypeHeader = response.header("Content-Type");
5253
if (MimeTypes.MIME_TEXT_PLAIN.equals(contentTypeHeader)) {
5354
String responseContent = response.bodyText();

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.IOException;
2020
import java.io.InputStream;
2121
import java.net.URLEncoder;
22+
import java.nio.charset.StandardCharsets;
2223
import java.util.UUID;
2324

2425
/**
@@ -49,7 +50,7 @@ public File execute(String uri, WxMaQrcodeParam qrcodeParam, WxType wxType) thro
4950
request.withConnectionProvider(requestHttp.getRequestHttpClient());
5051

5152
HttpResponse response = request.send();
52-
response.charset(StringPool.UTF_8);
53+
response.charset(StandardCharsets.UTF_8.name());
5354
String contentTypeHeader = response.header("Content-Type");
5455
if (MimeTypes.MIME_TEXT_PLAIN.equals(contentTypeHeader)) {
5556
String responseContent = response.bodyText();

0 commit comments

Comments
 (0)