From a6df1c8aaef57455447e54951c2962a97bb28432 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Fri, 23 Apr 2021 16:01:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3feignConfig=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=A4=B4=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/common/config/FeignConfig.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java index d313664..8aa5a34 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java @@ -10,7 +10,6 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; -import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -80,17 +79,16 @@ public class FeignConfig implements RequestInterceptor { // 检查请求头是否包含 Bearer 前缀 if (StringUtils.startsWith(header, TOKEN_PREFIX)) { - String authToken = RegExUtils.replaceAll(header, TOKEN_PREFIX, "");// 提取 token 信息 - - log.info("FeignConfig extract token {} from header", authToken); - template.header(AUTHORIZATION_HEADER, String.format("%s%s", TOKEN_PREFIX, authToken)); + log.info("FeignConfig request header", header); + template.header(AUTHORIZATION_HEADER, header); } else {// 检查cookie Optional.ofNullable(attributes.getRequest().getCookies()).ifPresent(cookies -> { Stream.of(cookies).filter(item -> StringUtils.equals(item.getName(), COOKIE_TOKEN_CODE)).findFirst() .ifPresent(token -> { - log.info("FeignConfig extract token {} from cookie", token.getValue()); - template.header(AUTHORIZATION_HEADER, - String.format("%s%s", TOKEN_PREFIX, token.getValue())); + String authToken = token.getValue(); + log.info("FeignConfig request header: {} {}", + String.format("%s%s", TOKEN_PREFIX, authToken)); + template.header(AUTHORIZATION_HEADER, String.format("%s%s", TOKEN_PREFIX, authToken)); }); }); }