Skip to content

fix issues #352 #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EmmetZC merged 4 commits into from
Apr 11, 2025
Merged

fix issues #352 #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65e3fa1
fix issues #352
Memory-9527 Apr 10, 2025
cbf2894
fix issues #352
Memory-9527 Apr 11, 2025
acbb75c
修改设置指定ContentType参数方法后忘记添加import的问题
Memory-9527 Apr 11, 2025
01a5b8a
测试用例增加指定ContentType参数为UTF-8
Memory-9527 Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions core/src/main/java/com/wechat/pay/java/core/http/apache/ApacheHttpClientAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.wechat.pay.java.core.http.OriginalResponse;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.http.Header;
Expand Down Expand Up @@ -104,11 +105,11 @@ private HttpEntity buildApacheHttpEntity(
if (wechatPayRequestBody == null) {
return new StringEntity("", "");
}

// 指定ContentType参数为UTF-8， fix issues #352
if (wechatPayRequestBody instanceof JsonRequestBody) {
return new StringEntity(
((JsonRequestBody) wechatPayRequestBody).getBody(),
ContentType.create(wechatPayRequestBody.getContentType()));
ContentType.create(wechatPayRequestBody.getContentType(), StandardCharsets.UTF_8));
}
if (wechatPayRequestBody instanceof FileRequestBody) {
FileRequestBody fileRequestBody = (FileRequestBody) wechatPayRequestBody;
Expand Down
5 changes: 3 additions & 2 deletions core/src/test/java/com/wechat/pay/java/core/http/ApacheHttpClientAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import org.apache.http.Header;
Expand Down Expand Up @@ -253,7 +254,7 @@ public void process(org.apache.http.HttpRequest request, HttpContext context)
HttpEntity entity =
new StringEntity(
JSON_REQUEST_BODY.getBody(),
ContentType.create(JSON_REQUEST_BODY.getContentType()));
ContentType.create(JSON_REQUEST_BODY.getContentType(), StandardCharsets.UTF_8));
Assert.assertEquals(
entity.getContentType().getValue(), reqEntity.getContentType().getValue());
Assert.assertEquals(entity.getContentLength(), reqEntity.getContentLength());
Expand Down Expand Up @@ -1057,7 +1058,7 @@ public void process(org.apache.http.HttpRequest request, HttpContext context)
HttpEntity entity =
new StringEntity(
JSON_REQUEST_BODY.getBody(),
ContentType.create(JSON_REQUEST_BODY.getContentType()));
ContentType.create(JSON_REQUEST_BODY.getContentType(), StandardCharsets.UTF_8));
Assert.assertEquals(
entity.getContentType().getValue(), reqEntity.getContentType().getValue());
Assert.assertEquals(entity.getContentLength(), reqEntity.getContentLength());
Expand Down
Loading