zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化ExcelWriter中使用比较器writer的方法，只对第一条数据进行排序（pr#3807@Github）

Browse Source
This commit is contained in:
Looly
2024-12-04 12:13:05 +08:00
parent 873a8d221e
commit 9997d72ef6
3 changed files with 128 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java
View File

@@ -99,7 +99,35 @@ public class JdkClientEngine extends AbstractClientEngine {
throw new IORuntimeException(e);
}
return sendRedirectIfPossible(conn, context);
// 自定义重定向
final int maxRedirects = message.maxRedirects();
if (maxRedirects > 0 && context.getRedirectCount() < maxRedirects) {
final int code;
try {
code = conn.getCode();
} catch (final IOException e) {
// 错误时静默关闭连接
conn.closeQuietly();
throw new HttpException(e);
}
if (HttpStatus.isRedirected(code)) {
// https://www.rfc-editor.org/rfc/rfc7231#section-6.4.7
// https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Redirections
// 307方法和消息主体都不发生变化。
if (HttpStatus.HTTP_TEMP_REDIRECT != code) {
// 重定向默认使用GET
message.method(Method.GET);
}
message.locationTo(conn.header(HeaderName.LOCATION));
// 自增计数器
context.incrementRedirectCount();
return doSend(context);
}
}
// 最终页面
return new JdkHttpResponse(conn, this.cookieManager, context.getRequest());
}
/**
@@ -167,44 +195,4 @@ public class JdkClientEngine extends AbstractClientEngine {
return conn;
}
/**
* 调用转发，如果需要转发返回转发结果，否则返回{@code null}
*
* @param conn {@link JdkHttpConnection}}
* @param context 请求上下文
* @return {@link JdkHttpResponse}，无转发返回 {@code null}
*/
private JdkHttpResponse sendRedirectIfPossible(final JdkHttpConnection conn, final RequestContext context) {
final Request message = context.getRequest();
final int maxRedirects = message.maxRedirects();
// 手动实现重定向
if (maxRedirects > 0 && context.getRedirectCount() < maxRedirects) {
final int code;
try {
code = conn.getCode();
} catch (final IOException e) {
// 错误时静默关闭连接
conn.closeQuietly();
throw new HttpException(e);
}
if (HttpStatus.isRedirected(code)) {
// https://www.rfc-editor.org/rfc/rfc7231#section-6.4.7
// https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Redirections
// 307方法和消息主体都不发生变化。
if (HttpStatus.HTTP_TEMP_REDIRECT != code) {
// 重定向默认使用GET
message.method(Method.GET);
}
message.locationTo(conn.header(HeaderName.LOCATION));
// 自增计数器
context.incrementRedirectCount();
return doSend(context);
}
}
// 最终页面
return new JdkHttpResponse(conn, this.cookieManager, context.getRequest());
}
}