~nishiwei/ard-uav-server.git

			@@ -18,15 +18,15 @@
			import java.io.ByteArrayOutputStream;
			import java.io.IOException;
			import java.io.InputStream;
			import java.net.Socket;
			import java.security.KeyManagementException;
			import java.security.NoSuchAlgorithmException;
			import java.security.SecureRandom;
			import java.security.cert.X509Certificate;
			import java.util.Arrays;
			import java.util.Enumeration;
			import java.util.concurrent.TimeUnit;

			/**
			* MinIO STS代理控制器（适配分块上传全流程：初始化/传块/合并）
			* 解决SSL连接重置、鉴权透传、分块合并XML透传问题
			*/
			@Api(tags = "机场上传minio")
			@Slf4j
			@RestController
			@@ -35,14 +35,13 @@

			// ==================== 常量配置 ====================
			private static final String PROXY_PREFIX = "/minioTransfer";
			private static final int BUFFER_SIZE = 65536;
			private static final long MAX_MEMORY_SIZE = 1024 * 1024 * 100; // 100MB
			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";

			// 配置注入
			// 配置注入（支持yml配置，避免硬编码）
			@Value("${oss.endpoint}")
			private String minioEndpoint;
			private static final Integer connectTimeout = 30;
			@@ -51,206 +50,131 @@
			@Autowired
			private OssServiceContext ossService;

			// OkHttp客户端（全局）
			// OkHttp客户端（全局单例，优化SSL/TCP）
			private static OkHttpClient httpClient;

			// 静态初始化：全局禁用SSL校验 + 强制兼容加密套件
			// 静态初始化：SSL/TCP优化（适配MinIO内网环境）
			static {
			// 第一步：全局禁用SSL证书校验（终极兜底）
			disableSslVerification();
			// 第二步：创建兼容MinIO的OkHttp客户端
			createOkHttpClient();
			}

			/**
			* 全局禁用SSL证书校验（绕过所有SSL检查，仅内网/测试环境使用）
			*/
			private static void disableSslVerification() {
			try {
			// 获取信任所有证书的TrustManager
			TrustManager[] trustAllCerts = new TrustManager[]{
			new X509TrustManager() {
			public X509Certificate[] getAcceptedIssuers() { return null; }
			public void checkClientTrusted(X509Certificate[] certs, String authType) {}
			public void checkServerTrusted(X509Certificate[] certs, String authType) {}
			}
			};

			// 获取SSL上下文，强制TLS 1.2
			SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
			sslContext.init(null, trustAllCerts, new SecureRandom());
			HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());

			// 禁用主机名验证
			HostnameVerifier allHostsValid = (hostname, session) -> true;
			HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);

			log.info("全局SSL证书校验已禁用（仅测试环境）");
			} catch (NoSuchAlgorithmException \| KeyManagementException e) {
			log.error("全局禁用SSL校验失败", e);
			}
			}

			/**
			* 创建兼容MinIO的OkHttp客户端（强制加密套件 + TCP优化）
			*/
			private static void createOkHttpClient() {
			try {
			// 1. 初始化SSL上下文（强制TLS 1.2 + 信任所有证书）
			SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
			// 1. 全局信任所有SSL证书（内网专用，生产需替换合法证书）
			TrustManager[] trustAllCerts = new TrustManager[]{
			new X509TrustManager() {
			@Override
			public void checkClientTrusted(X509Certificate[] certs, String authType) {}
			public void checkClientTrusted(X509Certificate[] chain, String authType) {}
			@Override
			public void checkServerTrusted(X509Certificate[] certs, String authType) {}
			public void checkServerTrusted(X509Certificate[] chain, String authType) {}
			@Override
			public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
			}
			};

			// 2. 强制TLS 1.2（解决MinIO SSL版本兼容问题）
			SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
			sslContext.init(null, trustAllCerts, new SecureRandom());
			SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();

			// 2. 配置MinIO兼容的加密套件（关键！解决握手后断开）
			String[] compatibleCiphers = {
			"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
			"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
			"TLS_RSA_WITH_AES_128_GCM_SHA256",
			"TLS_RSA_WITH_AES_256_GCM_SHA384"
			};

			// 3. 自定义SSLSocketFactory，强制加密套件
			SSLSocketFactory customSslSocketFactory = new SSLSocketFactory() {
			@Override
			public String[] getDefaultCipherSuites() {
			return compatibleCiphers;
			}

			@Override
			public String[] getSupportedCipherSuites() {
			return compatibleCiphers;
			}

			@Override
			public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
			SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(s, host, port, autoClose);
			sslSocket.setEnabledCipherSuites(compatibleCiphers);
			sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
			return sslSocket;
			}

			@Override
			public Socket createSocket(String host, int port) throws IOException {
			SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(host, port);
			sslSocket.setEnabledCipherSuites(compatibleCiphers);
			sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
			return sslSocket;
			}

			@Override
			public Socket createSocket(String host, int port, java.net.InetAddress localHost, int localPort) throws IOException {
			SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(host, port, localHost, localPort);
			sslSocket.setEnabledCipherSuites(compatibleCiphers);
			sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
			return sslSocket;
			}

			@Override
			public Socket createSocket(java.net.InetAddress host, int port) throws IOException {
			SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(host, port);
			sslSocket.setEnabledCipherSuites(compatibleCiphers);
			sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
			return sslSocket;
			}

			@Override
			public Socket createSocket(java.net.InetAddress address, int port, java.net.InetAddress localAddress, int localPort) throws IOException {
			SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(address, port, localAddress, localPort);
			sslSocket.setEnabledCipherSuites(compatibleCiphers);
			sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
			return sslSocket;
			}
			};

			// 4. 构建OkHttp客户端（简化TCP优化，避免SocketFactory编译错误）
			// 3. 构建高兼容性OkHttp客户端
			httpClient = new OkHttpClient.Builder()
			.sslSocketFactory(customSslSocketFactory, (X509TrustManager) trustAllCerts[0])
			.hostnameVerifier((hostname, session) -> true)
			// 强制TLS 1.2和兼容加密套件
			.connectionSpecs(Arrays.asList(
			new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
			.tlsVersions(TlsVersion.TLS_1_2)
			.cipherSuites(compatibleCiphers)
			.build()
			))
			// TCP优化：禁用Nagle算法（通过JVM参数或OkHttp的callTimeout间接优化）
			.callTimeout(30, TimeUnit.SECONDS) // 调用总超时
			.connectTimeout(connectTimeout, TimeUnit.SECONDS)
			.readTimeout(readWriteTimeout, TimeUnit.SECONDS)
			.writeTimeout(readWriteTimeout, TimeUnit.SECONDS)
			.connectionPool(new ConnectionPool(20, 10, TimeUnit.MINUTES))
			.retryOnConnectionFailure(true)
			.pingInterval(10, TimeUnit.SECONDS) // 缩短保活间隔
			.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
			.hostnameVerifier((hostname, session) -> true) // 禁用主机名校验
			.connectTimeout(30, TimeUnit.SECONDS)
			.readTimeout(1800, TimeUnit.SECONDS) // 30分钟读超时（适配大文件）
			.writeTimeout(1800, TimeUnit.SECONDS) // 30分钟写超时
			.connectionPool(new ConnectionPool(30, 10, TimeUnit.MINUTES)) // 扩大连接池
			.retryOnConnectionFailure(true) // 开启连接重试
			.pingInterval(10, TimeUnit.SECONDS) // TCP保活（防止连接被重置）
			.callTimeout(60, TimeUnit.SECONDS)
			.build();

			log.info("OkHttp客户端初始化完成（兼容MinIO TLS 1.2）");
			log.info("OkHttp客户端初始化完成（适配MinIO分块上传）");
			} catch (Exception e) {
			log.error("OkHttp初始化失败，使用默认客户端", e);
			log.error("OkHttp初始化失败，降级为默认客户端", e);
			httpClient = new OkHttpClient();
			}
			}

			// ========== 以下方法与之前一致，无需修改 ==========
			@ApiOperation("MinIO STS临时凭证通用代理")
			/**
			* 核心代理方法：适配MinIO分块上传全流程（POST初始化/PUT传块/POST合并）
			*/
			@ApiOperation("MinIO STS临时凭证通用代理（支持分块上传）")
			@RequestMapping("/**")
			public void proxyRequest(HttpServletRequest request, HttpServletResponse response) {
			String method = request.getMethod();
			String requestUri = request.getRequestURI();
			String queryString = request.getQueryString();
			log.info("STS代理请求开始 \| 方法:{} \| URI:{} \| 参数:{} \| 内容长度:{}",
			method, requestUri, queryString, request.getContentLengthLong());
			long contentLength = request.getContentLengthLong();

			// 日志增强：区分分块上传阶段
			String uploadStage = getUploadStage(queryString);
			log.info("STS代理请求开始 \| 阶段:{} \| 方法:{} \| URI:{} \| 参数:{} \| 内容长度:{}B",
			uploadStage, method, requestUri, queryString, contentLength);

			// 1. 构造MinIO目标地址
			String targetUrl = buildTargetUrl(requestUri, queryString);
			if (targetUrl == null) {
			sendError(response, HttpServletResponse.SC_BAD_REQUEST, "请求路径非法");
			sendError(response, HttpServletResponse.SC_BAD_REQUEST, "请求路径非法（缺失MinIO前缀）");
			return;
			}

			// 2. 获取并校验STS凭证（鉴权核心）
			CredentialsDTO credentials = getCredentials();
			if (credentials == null) {
			sendError(response, HttpServletResponse.SC_FORBIDDEN, "STS凭证无效");
			sendError(response, HttpServletResponse.SC_FORBIDDEN, "STS凭证无效/缺失");
			return;
			}

			// 3. 构建请求+转发响应（核心逻辑）
			try {
			Request okRequest = buildRequest(request, method, targetUrl, credentials);
			forwardResponse(okRequest, response);
			log.info("STS代理请求成功 \| 目标地址:{}", targetUrl);
			log.info("STS代理请求成功 \| 阶段:{} \| 目标地址:{}", uploadStage, targetUrl);
			} catch (Exception e) {
			log.error("STS代理请求执行异常", e);
			sendError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "代理服务异常：" + e.getMessage());
			log.error("STS代理请求执行异常 \| 阶段:{}", uploadStage, e);
			// 友好错误提示：区分SSL/分块/鉴权错误
			String errorMsg = e.getMessage().contains("SSL") ? "SSL连接异常（请检查MinIO HTTPS配置）" :
			e.getMessage().contains("Credentials") ? "STS凭证异常" : "代理服务异常";
			sendError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, errorMsg);
			}
			}

			/**
			* 识别分块上传阶段（日志优化）
			*/
			private String getUploadStage(String queryString) {
			if (queryString == null) return "普通请求";
			if (queryString.contains("uploads") && !queryString.contains("uploadId")) return "分块初始化";
			if (queryString.contains("partNumber") && queryString.contains("uploadId")) return "分块上传";
			if (queryString.contains("uploadId") && !queryString.contains("partNumber")) return "分块合并";
			return "普通请求";
			}

			/**
			* 构造MinIO目标地址（兼容分块参数透传）
			*/
			private String buildTargetUrl(String requestUri, String queryString) {
			try {
			// 截取代理前缀后的路径（/minioTransfer/xxx → xxx）
			String targetPath = requestUri.substring(PROXY_PREFIX.length());
			StringBuilder urlBuilder = new StringBuilder(minioEndpoint).append(targetPath);
			// 透传分块参数（uploads/uploadId/partNumber）
			if (queryString != null && !queryString.isBlank()) {
			urlBuilder.append("?").append(queryString);
			}
			return urlBuilder.toString();
			} catch (Exception e) {
			log.error("目标地址构造失败", e);
			log.error("构造MinIO目标地址失败", e);
			return null;
			}
			}

			/**
			* 获取并校验STS凭证（确保AK/SK/Token完整）
			*/
			private CredentialsDTO getCredentials() {
			try {
			CredentialsDTO dto = ossService.getCredentials();
			if (dto == null \|\| dto.getAccessKeyId() == null \|\| dto.getSecurityToken() == null) {
			log.error("STS凭证核心字段缺失");
			// 严格校验核心字段（避免鉴权失败）
			if (dto == null \|\| dto.getAccessKeyId() == null \|\| dto.getAccessKeySecret() == null \|\| dto.getSecurityToken() == null) {
			log.error("STS凭证核心字段缺失：AK/SK/Token不能为空");
			return null;
			}
			log.info("STS凭证获取成功 \| AK前缀:{}", dto.getAccessKeyId().substring(0, 4) + "***");
			@@ -261,48 +185,51 @@
			}
			}

			/**
			* 构建OkHttp请求（适配分块上传的请求体/头透传）
			*/
			private Request buildRequest(HttpServletRequest request, String method, String url, CredentialsDTO credentials) throws IOException {
			Request.Builder builder = new Request.Builder().url(url);

			// 透传请求头
			// 1. 透传所有请求头（排除Host，OkHttp自动处理）
			Enumeration<String> headerNames = request.getHeaderNames();
			while (headerNames.hasMoreElements()) {
			String name = headerNames.nextElement();
			if (name.equalsIgnoreCase(HOST)) {
			continue;
			if (!name.equalsIgnoreCase(HOST)) {
			builder.addHeader(name, request.getHeader(name));
			}
			builder.addHeader(name, request.getHeader(name));
			}

			// 添加STS令牌
			// 2. 添加STS鉴权头（MinIO分块上传必须）
			builder.addHeader(X_AMZ_SECURITY_TOKEN, credentials.getSecurityToken());
			// 补充MinIO鉴权必要的头（防止签名失败）
			builder.addHeader("X-Amz-Date", String.valueOf(System.currentTimeMillis()));

			// 构建请求体
			// 3. 构建请求体（区分小文件/大文件/分块合并XML）
			RequestBody body = null;
			if (!"GET".equalsIgnoreCase(method) && !"HEAD".equalsIgnoreCase(method)) {
			long contentLength = request.getContentLengthLong();
			InputStream inputStream = request.getInputStream();
			long contentLength = request.getContentLengthLong();

			// 小文件预读取
			// 小文件：预读取到内存（稳定，适配分块上传的小文件块）
			if (contentLength > 0 && contentLength <= MAX_MEMORY_SIZE) {
			log.info("小文件上传：预读取到内存，长度:{:.2f}MB", contentLength / 1024.0 / 1024.0);
			log.info("小文件/分块上传：预读取到内存，大小:{:.2f}MB", contentLength / 1024.0 / 1024.0);
			byte[] content = readInputStreamToBytes(inputStream);
			MediaType mediaType = request.getContentType() != null
			? MediaType.parse(request.getContentType())
			: MediaType.parse("application/octet-stream");
			MediaType mediaType = MediaType.parse(request.getContentType() == null ? "application/xml" : request.getContentType());
			body = RequestBody.create(content, mediaType);
			} else {
			log.info("大文件/未知长度上传：使用流式传输");
			}
			// 大文件/未知长度：流式上传（省内存，适配大文件分块）
			else {
			log.info("大文件/未知长度上传：使用流式传输（适配分块上传）");
			body = new RequestBody() {
			@Override
			public MediaType contentType() {
			String contentType = request.getContentType();
			return contentType != null ? MediaType.parse(contentType) : MediaType.parse("application/octet-stream");
			return MediaType.parse(request.getContentType() == null ? "application/xml" : request.getContentType());
			}

			@Override
			public long contentLength() {
			return contentLength;
			return contentLength; // 避免chunked编码，适配MinIO分块
			}

			@Override
			@@ -314,60 +241,61 @@
			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);
			log.info("分块上传进度：已写入{:.2f}MB", totalWritten / 1024.0 / 1024.0);
			}
			}
			sink.flush();
			log.info("流式上传完成，总写入：{:.2f}MB", totalWritten / 1024.0 / 1024.0);
			} catch (IOException e) {
			log.error("流式上传失败，已写入：{:.2f}MB", totalWritten / 1024.0 / 1024.0, e);
			throw 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);
			try (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();
			return bos.toByteArray();
			}
			bos.flush();
			byte[] result = bos.toByteArray();
			bos.close();
			return result;
			}

			/**
			* 转发MinIO响应到客户端（关键：透传ETag/UploadId等分块参数）
			*/
			private void forwardResponse(Request request, HttpServletResponse response) throws IOException {
			try (Response okResponse = httpClient.newCall(request).execute()) {
			// 新增：确保响应编码和类型正确
			// 1. 基础响应配置（确保分块合并的XML响应正常透传）
			response.setStatus(okResponse.code());
			response.setCharacterEncoding("UTF-8");
			String responseContentType = okResponse.header("Content-Type");
			if (responseContentType != null) {
			response.setContentType(responseContentType);
			String contentType = okResponse.header("Content-Type");
			if (contentType != null) {
			response.setContentType(contentType); // 透传XML/JSON类型
			}

			response.setStatus(okResponse.code());

			// 透传响应头
			// 2. 透传所有响应头（重点：ETag/UploadId等分块核心参数）
			Headers headers = okResponse.headers();
			for (String name : headers.names()) {
			if (TRANSFER_ENCODING.equalsIgnoreCase(name)) {
			continue;
			// 排除Transfer-Encoding（防止Tomcat重复编码）
			if (!name.equalsIgnoreCase(TRANSFER_ENCODING)) {
			response.setHeader(name, headers.get(name));
			}
			response.setHeader(name, headers.get(name));
			}

			// 透传响应体
			// 3. 透传响应体（分块初始化的UploadId、合并的成功响应等）
			ResponseBody responseBody = okResponse.body();
			if (responseBody != null) {
			try (InputStream in = responseBody.byteStream()) {
			@@ -377,18 +305,19 @@
			response.getOutputStream().write(buffer, 0, len);
			}
			response.getOutputStream().flush();
			} catch (IOException e) {
			log.warn("响应体转发失败（客户端可能已断开连接）", e);
			}
			}
			}
			}

			/**
			* 统一返回错误响应
			*/
			private void sendError(HttpServletResponse response, int code, String msg) {
			try {
			response.sendError(code, msg);
			} catch (IOException e) {
			log.error("响应错误信息失败", e);
			log.error("发送错误响应失败", e);
			}
			}
			}