From b0a4ce6982a3b3694679f69c39c59df84ecdcb06 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 11 Feb 2026 11:12:40 +0800
Subject: [PATCH] 2026-02-04 优化minio中转接口
---
ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java | 183 ++++++++++++++++++++++++++-------------------
1 files changed, 105 insertions(+), 78 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java
index 2fc1b51..9f1f104 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java
@@ -15,9 +15,11 @@
import javax.net.ssl.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
import java.util.Enumeration;
import java.util.concurrent.TimeUnit;
@@ -29,68 +31,59 @@
// ==================== 常量配置 ====================
private static final String PROXY_PREFIX = "/minioTransfer";
- private static final int BUFFER_SIZE = 32768;
+ private static final int BUFFER_SIZE = 65536; // 64K缓冲区
+ private static final long MAX_MEMORY_SIZE = 1024 * 1024 * 100; // 100MB
private static final String X_AMZ_SECURITY_TOKEN = "X-Amz-Security-Token";
private static final String TRANSFER_ENCODING = "Transfer-Encoding";
- private static final String CONTENT_LENGTH = "Content-Length";
private static final String HOST = "Host";
- // 配置文件注入
+ // 配置注入
@Value("${oss.endpoint}")
private String minioEndpoint;
-
- private static final Integer connectTimeout=10;
-
- private static final Integer readWriteTimeout=300;
+ private static final Integer connectTimeout = 30;
+ private static final Integer readWriteTimeout = 1800;
@Autowired
private OssServiceContext ossService;
- // OkHttp 单例客户端，全局复用
+ // OkHttp客户端（全局单例，极简配置）
private static OkHttpClient httpClient;
- // 静态初始化，仅执行一次
+ // 静态初始化：仅做最必要的SSL配置，避免过度封装
static {
- createUnsafeOkHttpClient();
- }
-
- /**
- * 修复SSL配置：创建忽略证书校验的OkHttp客户端
- */
- private static void createUnsafeOkHttpClient() {
try {
- // 1. 创建信任所有证书的TrustManager
+ // 1. 全局禁用SSL证书校验（内网环境专用）
TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() {
@Override
- public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {}
+ public void checkClientTrusted(X509Certificate[] chain, String authType) {}
@Override
- public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {}
+ public void checkServerTrusted(X509Certificate[] chain, String authType) {}
@Override
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return new java.security.cert.X509Certificate[0];
- }
+ public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
}
};
- // 2. 初始化SSL上下文
- SSLContext sslContext = SSLContext.getInstance("TLS");
+ // 2. 强制TLS 1.2
+ SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
sslContext.init(null, trustAllCerts, new SecureRandom());
- SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
- // 3. 构建OkHttp客户端
+ // 3. 构建OkHttp客户端（原生配置，无自定义封装）
httpClient = new OkHttpClient.Builder()
- .sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0])
- .hostnameVerifier((hostname, session) -> true)
+ .sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
+ .hostnameVerifier((hostname, session) -> true) // 禁用主机名校验
.connectTimeout(connectTimeout, TimeUnit.SECONDS)
.readTimeout(readWriteTimeout, TimeUnit.SECONDS)
.writeTimeout(readWriteTimeout, TimeUnit.SECONDS)
- .connectionPool(new ConnectionPool(10, 5, TimeUnit.MINUTES))
- .retryOnConnectionFailure(true)
+ .connectionPool(new ConnectionPool(20, 10, TimeUnit.MINUTES))
+ .retryOnConnectionFailure(true) // 开启重试
+ .pingInterval(10, TimeUnit.SECONDS) // TCP保活
+ .callTimeout(60, TimeUnit.SECONDS) // 全局调用超时
.build();
+ log.info("OkHttp客户端初始化完成（极简SSL配置）");
} catch (Exception e) {
- log.error("OkHttp SSL配置初始化失败，使用默认客户端", e);
+ log.error("OkHttp初始化失败，使用默认客户端", e);
httpClient = new OkHttpClient();
}
}
@@ -101,36 +94,37 @@
String method = request.getMethod();
String requestUri = request.getRequestURI();
String queryString = request.getQueryString();
- log.info("STS代理请求开始 | 方法:{} | URI:{} | 参数:{}", method, requestUri, queryString);
+ long contentLength = request.getContentLengthLong();
+ log.info("STS代理请求开始 | 方法:{} | URI:{} | 参数:{} | 内容长度:{}B",
+ method, requestUri, queryString, contentLength);
- // 构造目标地址
+ // 1. 构造目标地址
String targetUrl = buildTargetUrl(requestUri, queryString);
if (targetUrl == null) {
sendError(response, HttpServletResponse.SC_BAD_REQUEST, "请求路径非法");
return;
}
- // 获取STS凭证
+ // 2. 获取STS凭证
CredentialsDTO credentials = getCredentials();
if (credentials == null) {
sendError(response, HttpServletResponse.SC_FORBIDDEN, "STS凭证无效");
return;
}
+ // 3. 构建并执行请求
try {
- // 构建请求
Request okRequest = buildRequest(request, method, targetUrl, credentials);
- // 执行并转发响应
forwardResponse(okRequest, response);
log.info("STS代理请求成功 | 目标地址:{}", targetUrl);
} catch (Exception e) {
log.error("STS代理请求执行异常", e);
- sendError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "代理服务异常");
+ sendError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "代理服务异常：" + e.getMessage());
}
}
/**
- * 构造MinIO请求地址
+ * 构造MinIO目标地址
*/
private String buildTargetUrl(String requestUri, String queryString) {
try {
@@ -147,7 +141,7 @@
}
/**
- * 获取并校验STS临时凭证
+ * 获取并校验STS凭证
*/
private CredentialsDTO getCredentials() {
try {
@@ -165,78 +159,111 @@
}
/**
- * 构建OkHttp请求对象 - 核心修复：移除Content-Length过滤
+ * 构建OkHttp请求（核心：分文件大小处理）
*/
private Request buildRequest(HttpServletRequest request, String method, String url, CredentialsDTO credentials) throws IOException {
Request.Builder builder = new Request.Builder().url(url);
- // 透传原始请求头，仅过滤Host头（OkHttp自动管理），保留Content-Length
+ // 透传请求头：仅过滤Host（OkHttp自动处理）
Enumeration<String> headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
String name = headerNames.nextElement();
- // 仅过滤Host，不再过滤Content-Length，修复MissingContentLength错误
- if (name.equalsIgnoreCase(HOST)) {
- continue;
+ if (!name.equalsIgnoreCase(HOST)) {
+ builder.addHeader(name, request.getHeader(name));
}
- builder.addHeader(name, request.getHeader(name));
}
- // 强制添加STS安全令牌（MinIO必填）
+ // 添加STS安全令牌
builder.addHeader(X_AMZ_SECURITY_TOKEN, credentials.getSecurityToken());
- // 构造请求体：非GET/HEAD请求携带流数据
+ // 构建请求体（GET/HEAD无请求体）
RequestBody body = null;
if (!"GET".equalsIgnoreCase(method) && !"HEAD".equalsIgnoreCase(method)) {
- // 获取客户端原始Content-Length
+ InputStream inputStream = request.getInputStream();
long contentLength = request.getContentLengthLong();
- body = new RequestBody() {
- @Override
- public MediaType contentType() {
- String contentType = request.getContentType();
- return contentType != null ? MediaType.parse(contentType) : MediaType.parse("application/octet-stream");
- }
- // 重写方法，告知OkHttp固定长度，避免转为chunked编码
- @Override
- public long contentLength() {
- return contentLength;
- }
+ // 小文件：预读取到内存（稳定）
+ if (contentLength > 0 && contentLength <= MAX_MEMORY_SIZE) {
+ log.info("小文件上传：预读取到内存，大小:{:.2f}MB", contentLength / 1024.0 / 1024.0);
+ byte[] content = readInputStreamToBytes(inputStream);
+ MediaType mediaType = MediaType.parse(request.getContentType() == null ? "application/octet-stream" : request.getContentType());
+ body = RequestBody.create(content, mediaType);
+ }
+ // 大文件：流式上传（省内存）
+ else {
+ log.info("大文件/未知长度上传：使用流式传输");
+ body = new RequestBody() {
+ @Override
+ public MediaType contentType() {
+ return MediaType.parse(request.getContentType() == null ? "application/octet-stream" : request.getContentType());
+ }
- @Override
- public void writeTo(BufferedSink sink) {
- try (InputStream inputStream = request.getInputStream()) {
+ @Override
+ public long contentLength() {
+ return contentLength; // 避免chunked编码
+ }
+
+ @Override
+ public void writeTo(BufferedSink sink) throws IOException {
byte[] buffer = new byte[BUFFER_SIZE];
int len;
- while ((len = inputStream.read(buffer)) != -1) {
- sink.write(buffer, 0, len);
+ long totalWritten = 0;
+ try (InputStream in = inputStream) {
+ while ((len = in.read(buffer)) != -1) {
+ sink.write(buffer, 0, len);
+ totalWritten += len;
+ // 每100MB刷新一次
+ if (totalWritten % (1024 * 1024 * 100) == 0) {
+ sink.flush();
+ log.info("已上传：{:.2f}MB", totalWritten / 1024.0 / 1024.0);
+ }
+ }
+ sink.flush();
+ log.info("流式上传完成，总写入：{:.2f}MB", totalWritten / 1024.0 / 1024.0);
}
- sink.flush();
- } catch (IOException e) {
- log.error("请求体流写入失败", e);
}
- }
- };
+ };
+ }
}
- builder.method(method, body);
- return builder.build();
+ return builder.method(method, body).build();
}
/**
- * 执行请求并将响应透传给前端
+ * 读取InputStream到字节数组（小文件专用）
+ */
+ private byte[] readInputStreamToBytes(InputStream inputStream) throws IOException {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ byte[] buffer = new byte[BUFFER_SIZE];
+ int len;
+ while ((len = inputStream.read(buffer)) != -1) {
+ bos.write(buffer, 0, len);
+ }
+ bos.flush();
+ byte[] result = bos.toByteArray();
+ bos.close();
+ return result;
+ }
+
+ /**
+ * 转发MinIO响应到客户端
*/
private void forwardResponse(Request request, HttpServletResponse response) throws IOException {
try (Response okResponse = httpClient.newCall(request).execute()) {
- // 设置响应状态码
+ // 配置响应头
response.setStatus(okResponse.code());
+ response.setCharacterEncoding("UTF-8");
+ String contentType = okResponse.header("Content-Type");
+ if (contentType != null) {
+ response.setContentType(contentType);
+ }
// 透传响应头
Headers headers = okResponse.headers();
for (String name : headers.names()) {
- if (TRANSFER_ENCODING.equalsIgnoreCase(name)) {
- continue;
+ if (!name.equalsIgnoreCase(TRANSFER_ENCODING)) {
+ response.setHeader(name, headers.get(name));
}
- response.setHeader(name, headers.get(name));
}
// 透传响应体
@@ -255,13 +282,13 @@
}
/**
- * 统一错误响应工具方法
+ * 统一返回错误响应
*/
private void sendError(HttpServletResponse response, int code, String msg) {
try {
response.sendError(code, msg);
} catch (IOException e) {
- log.error("响应错误信息失败", e);
+ log.error("发送错误响应失败", e);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3