Skip to content

#3534 为connectionRequestTimeout设置默认值，避免开发者在虚拟线程中调用框架的httpClient时，造成的无限等待，整个应用永久性“假死”问题 #3540

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
merged 2 commits into from
Apr 7, 2025
Merged

#3534 为connectionRequestTimeout设置默认值，避免开发者在虚拟线程中调用框架的httpClient时，造成的无限等待，整个应用永久性“假死”问题 #3540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdd7ef6
#3532 在解析回调内容时，直接调用getConfig()，而不是临时拼一次configKey，因为getConfig()中的逻辑是：当…
yangmengyu2021 Mar 23, 2025
960abce
commit
tsmengyu2024 Apr 6, 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
2 changes: 1 addition & 1 deletion ...c/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class DefaultApacheHttpClientBuilder implements ApacheHttpClientBuilder {
* 设置为负数是使用系统默认设置(非3000ms的默认值,而是httpClient的默认设置).
* </p>
*/
private int connectionRequestTimeout = -1;
private int connectionRequestTimeout = 3000;

/**
* 建立链接的超时时间,默认为5000ms.由于是在链接池获取链接,此设置应该并不起什么作用
Expand Down
7 changes: 3 additions & 4 deletions ...java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,14 +323,13 @@ public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData, String sign
log.debug("微信支付异步通知请求参数：{}", xmlData);
WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
if (signType == null) {
String configKey = this.getConfigKey(result.getMchId(), result.getAppid());
this.switchover(result.getMchId(), result.getAppid());
if (result.getSignType() != null) {
// 如果解析的通知对象中signType有值，则使用它进行验签
signType = result.getSignType();
} else if (configMap.get(configKey).getSignType() != null) {
} else if (this.getConfig().getSignType() != null) {
// 如果配置中signType有值，则使用它进行验签
signType = configMap.get(configKey).getSignType();
this.switchover(result.getMchId(), result.getAppid());
signType = this.getConfig().getSignType();
}
}

Expand Down