From 2c03ed453fda44df3749da3e5abf0b45e2b99221 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期四, 02 七月 2026 10:43:01 +0800
Subject: [PATCH] 新增了部分v2.0 p1功能

---
 ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
index 05bdc0b..df6e060 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
@@ -20,7 +20,7 @@
 import reactor.core.publisher.Mono;
 
 /**
- * 路由配置信息
+ * 璺敱閰嶇疆淇℃伅
  * 
  * @author ruoyi
  */
@@ -28,11 +28,10 @@
 public class RouterFunctionConfiguration {
 
 	/**
-	 * 这里为支持的请求头,如果有自定义的header字段请自己添加
+	 * 杩欓噷涓烘敮鎸佺殑璇锋眰澶达紝濡傛灉鏈夎嚜瀹氫箟鐨刪eader瀛楁璇疯嚜宸辨坊鍔?
 	 */
 	private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, username, client, request-origion, sign, nonce_str, timestamp";
 	private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD";
-	private static final String ALLOWED_ORIGIN = "*";
 	private static final String ALLOWED_EXPOSE = "*";
 	private static final String MAX_AGE = "18000L";
 
@@ -48,7 +47,7 @@
 	}
 
 	/**
-	 * 跨域配置
+	 * 璺ㄥ煙閰嶇疆
 	 */
 	@Bean
 	public WebFilter corsFilter() {
@@ -56,19 +55,29 @@
 			ServerHttpRequest request = ctx.getRequest();
 			if (CorsUtils.isCorsRequest(request)) {
 				ServerHttpResponse response = ctx.getResponse();
-				HttpHeaders headers = response.getHeaders();
-				headers.add("Access-Control-Allow-Headers", ALLOWED_HEADERS);
-				headers.add("Access-Control-Allow-Methods", ALLOWED_METHODS);
-				headers.add("Access-Control-Allow-Origin", ALLOWED_ORIGIN);
-				headers.add("Access-Control-Expose-Headers", ALLOWED_EXPOSE);
-				headers.add("Access-Control-Max-Age", MAX_AGE);
-				headers.add("Access-Control-Allow-Credentials", "true");
-				if (request.getMethod() == HttpMethod.OPTIONS) {
-					response.setStatusCode(HttpStatus.OK);
+				applyCorsHeaders(request, response);
+                if (request.getMethod() == HttpMethod.OPTIONS) {
+                    response.setStatusCode(HttpStatus.OK);
 					return Mono.empty();
 				}
+				response.beforeCommit(() -> {
+					applyCorsHeaders(request, response);
+					return Mono.empty();
+				});
 			}
 			return chain.filter(ctx);
 		};
 	}
+
+	private void applyCorsHeaders(ServerHttpRequest request, ServerHttpResponse response) {
+		HttpHeaders headers = response.getHeaders();
+		String origin = request.getHeaders().getOrigin();
+		headers.set("Access-Control-Allow-Headers", ALLOWED_HEADERS);
+		headers.set("Access-Control-Allow-Methods", ALLOWED_METHODS);
+		headers.set("Access-Control-Allow-Origin", origin == null ? "*" : origin);
+		headers.set("Access-Control-Expose-Headers", ALLOWED_EXPOSE);
+		headers.set("Access-Control-Max-Age", MAX_AGE);
+		headers.set("Access-Control-Allow-Credentials", "true");
+		headers.set(HttpHeaders.VARY, HttpHeaders.ORIGIN);
+	}
 }

--
Gitblit v1.7.1