Compare commits

...

3 Commits

Author SHA1 Message Date
Looly
5c93ca2cf4 fix issue#3765 2024-10-09 18:12:31 +08:00
Looly
64efd26c5f Merge branch 'v6-dev' of gitee.com:dromara/hutool into v6-dev 2024-10-09 18:12:21 +08:00
Looly
e03cc1cb68 fix issue#3765 2024-10-09 17:52:53 +08:00
4 changed files with 12 additions and 5 deletions

View File

@@ -3,10 +3,11 @@
-------------------------------------------------------------------------------------------------------------
# 6.0.0-M17 (2024-09-09)
# 6.0.0-M17 (2024-10-09)
### 计划实现
* 【db 】 增加DDL封装
* 【db 】 Entity数据量大时占用较多内存考虑共享meta信息
### ❌不兼容特性

View File

@@ -250,7 +250,7 @@ public class ReUtil {
* result : year: 2021, month: 10, day: 11
* </pre>
*
* <p>jdk9+之后,因为此方法无效</p>
* <p>jdk9+之后,此方法无效</p>
*
* @param pattern 匹配的正则
* @param content 被匹配的内容

View File

@@ -217,8 +217,14 @@ public class HttpClient4Engine extends AbstractClientEngine {
// 连接池配置
if (config instanceof ApacheHttpClientConfig) {
final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config;
manager.setMaxTotal(apacheHttpClientConfig.getMaxTotal());
manager.setDefaultMaxPerRoute(apacheHttpClientConfig.getMaxPerRoute());
final int maxTotal = apacheHttpClientConfig.getMaxTotal();
if(maxTotal > 0){
manager.setMaxTotal(maxTotal);
}
final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute();
if(maxPerRoute > 0){
manager.setDefaultMaxPerRoute(maxPerRoute);
}
}
return manager;

View File

@@ -226,10 +226,10 @@ public class HttpClient5Engine extends AbstractClientEngine {
if (config instanceof ApacheHttpClientConfig) {
final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config;
final int maxTotal = apacheHttpClientConfig.getMaxTotal();
final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute();
if (maxTotal > 0) {
connectionManagerBuilder.setMaxConnTotal(maxTotal);
}
final int maxPerRoute = apacheHttpClientConfig.getMaxPerRoute();
if (maxPerRoute > 0) {
connectionManagerBuilder.setMaxConnPerRoute(maxPerRoute);
}