Merge branch 'master' of https://gitee.com/zhijiantianya/yudao-cloud
commit
e354108f31
|
@ -10,6 +10,10 @@ import org.springframework.web.server.ServerWebExchange;
|
||||||
import reactor.core.publisher.Mono;
|
import reactor.core.publisher.Mono;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 解决 Spring Cloud Gateway 2.x 跨域时,出现重复 Origin 的 BUG
|
* 解决 Spring Cloud Gateway 2.x 跨域时,出现重复 Origin 的 BUG
|
||||||
|
@ -31,13 +35,18 @@ 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(() -> {
|
||||||
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)
|
||||||
|| kv.getKey().equals(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)))
|
|| kv.getKey().equals(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS)))
|
||||||
.forEach(kv -> kv.setValue(new ArrayList<String>() {{
|
.map(Map.Entry::getKey)
|
||||||
add(kv.getValue().get(0));
|
.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);
|
return chain.filter(exchange);
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue