Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts: # yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.javapull/193/head
commit
5a2668a5e5
|
@ -9,7 +9,6 @@ import org.springframework.stereotype.Component;
|
||||||
import org.springframework.web.server.ServerWebExchange;
|
import org.springframework.web.server.ServerWebExchange;
|
||||||
import reactor.core.publisher.Mono;
|
import reactor.core.publisher.Mono;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -35,6 +34,7 @@ public class CorsResponseHeaderFilter implements GlobalFilter, Ordered {
|
||||||
@Override
|
@Override
|
||||||
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
|
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
|
||||||
return chain.filter(exchange).then(Mono.defer(() -> {
|
return chain.filter(exchange).then(Mono.defer(() -> {
|
||||||
|
// https://gitee.com/zhijiantianya/yudao-cloud/pulls/177/
|
||||||
List<String> keysToModify = exchange.getResponse().getHeaders().entrySet().stream()
|
List<String> keysToModify = exchange.getResponse().getHeaders().entrySet().stream()
|
||||||
.filter(kv -> (kv.getValue() != null && kv.getValue().size() > 1))
|
.filter(kv -> (kv.getValue() != null && kv.getValue().size() > 1))
|
||||||
.filter(kv -> (kv.getKey().equals(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)
|
.filter(kv -> (kv.getKey().equals(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)
|
||||||
|
|
Loading…
Reference in New Issue