From edb74f64d9cf344c93001ab6cd6e36c7b0889548 Mon Sep 17 00:00:00 2001
From: zhengpingzhong <pingzhong.zheng@outlook.com>
Date: Tue, 30 Dec 2025 14:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E7=94=A8=20https://github.com/spring-?=
 =?UTF-8?q?cloud/spring-cloud-gateway/pull/866=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=A4=B4=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/cors/CorsResponseHeaderFilter.java | 54 -------------------
 .../src/main/resources/application.yaml       |  2 +
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.java

diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.java b/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.java
deleted file mode 100644
index 041a98529..000000000
--- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.iocoder.yudao.gateway.filter.cors;
-
-import org.springframework.cloud.gateway.filter.GatewayFilterChain;
-import org.springframework.cloud.gateway.filter.GlobalFilter;
-import org.springframework.cloud.gateway.filter.NettyWriteResponseFilter;
-import org.springframework.core.Ordered;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Component;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 解决 Spring Cloud Gateway 2.x 跨域时，出现重复 Origin 的 BUG
- *
- * 参考文档：<a href="https://blog.csdn.net/zimou5581/article/details/90043178" />
- *
- * @author 芋道源码
- */
-@Component
-public class CorsResponseHeaderFilter implements GlobalFilter, Ordered {
-
-    @Override
-    public int getOrder() {
-        // 指定此过滤器位于 NettyWriteResponseFilter 之后
-        // 即待处理完响应体后接着处理响应头
-        return NettyWriteResponseFilter.WRITE_RESPONSE_FILTER_ORDER + 1;
-    }
-
-    @Override
-    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
-        return chain.filter(exchange).then(Mono.defer(() -> {
-            // https://gitee.com/zhijiantianya/yudao-cloud/pulls/177/
-            List<String> keysToModify = exchange.getResponse().getHeaders().entrySet().stream()
-                    .filter(kv -> (kv.getValue() != null && kv.getValue().size() > 1))
-                    .filter(kv -> (kv.getKey().equals(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)
-                            || kv.getKey().equals(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)))
-                    .map(Map.Entry::getKey)
-                    .collect(Collectors.toList());
-            keysToModify.forEach(key->{
-                List<String> values = exchange.getResponse().getHeaders().get(key);
-                if (values != null && !values.isEmpty()) {
-                    exchange.getResponse().getHeaders().put(key, Collections.singletonList(values.get(0)));
-                }
-            });
-            return chain.filter(exchange);
-        }));
-    }
-
-}
diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml
index 3786d0527..142a950a1 100644
--- a/yudao-gateway/src/main/resources/application.yaml
+++ b/yudao-gateway/src/main/resources/application.yaml
@@ -197,6 +197,8 @@ spring:
                 - RewritePath=/admin-api/iot/v3/api-docs, /v3/api-docs # 配置，保证转发到 /v3/api-docs
           x-forwarded:
             prefix-enabled: false # 避免 Swagger 重复带上额外的 /admin-api/system 前缀
+          default-filters:
+            - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin # 采用 https://github.com/spring-cloud/spring-cloud-gateway/pull/866 解决响应头重复问题
 
 server:
   port: 48080