修正feignConfig请求头注入
This commit is contained in:
@ -10,7 +10,6 @@ import java.util.Objects;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import org.apache.commons.lang3.RegExUtils;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
@ -80,17 +79,16 @@ public class FeignConfig implements RequestInterceptor {
|
|||||||
|
|
||||||
// 检查请求头是否包含 Bearer 前缀
|
// 检查请求头是否包含 Bearer 前缀
|
||||||
if (StringUtils.startsWith(header, TOKEN_PREFIX)) {
|
if (StringUtils.startsWith(header, TOKEN_PREFIX)) {
|
||||||
String authToken = RegExUtils.replaceAll(header, TOKEN_PREFIX, "");// 提取 token 信息
|
log.info("FeignConfig request header", header);
|
||||||
|
template.header(AUTHORIZATION_HEADER, header);
|
||||||
log.info("FeignConfig extract token {} from header", authToken);
|
|
||||||
template.header(AUTHORIZATION_HEADER, String.format("%s%s", TOKEN_PREFIX, authToken));
|
|
||||||
} else {// 检查cookie
|
} else {// 检查cookie
|
||||||
Optional.ofNullable(attributes.getRequest().getCookies()).ifPresent(cookies -> {
|
Optional.ofNullable(attributes.getRequest().getCookies()).ifPresent(cookies -> {
|
||||||
Stream.of(cookies).filter(item -> StringUtils.equals(item.getName(), COOKIE_TOKEN_CODE)).findFirst()
|
Stream.of(cookies).filter(item -> StringUtils.equals(item.getName(), COOKIE_TOKEN_CODE)).findFirst()
|
||||||
.ifPresent(token -> {
|
.ifPresent(token -> {
|
||||||
log.info("FeignConfig extract token {} from cookie", token.getValue());
|
String authToken = token.getValue();
|
||||||
template.header(AUTHORIZATION_HEADER,
|
log.info("FeignConfig request header: {} {}",
|
||||||
String.format("%s%s", TOKEN_PREFIX, token.getValue()));
|
String.format("%s%s", TOKEN_PREFIX, authToken));
|
||||||
|
template.header(AUTHORIZATION_HEADER, String.format("%s%s", TOKEN_PREFIX, authToken));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user