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 - * - * 参考文档: - * - * @author 芋道源码 - */ -@Component -public class CorsResponseHeaderFilter implements GlobalFilter, Ordered { - - @Override - public int getOrder() { - // 指定此过滤器位于 NettyWriteResponseFilter 之后 - // 即待处理完响应体后接着处理响应头 - return NettyWriteResponseFilter.WRITE_RESPONSE_FILTER_ORDER + 1; - } - - @Override - public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { - return chain.filter(exchange).then(Mono.defer(() -> { - // https://gitee.com/zhijiantianya/yudao-cloud/pulls/177/ - List 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 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