liuchang/mall-ebtp-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正从cookie取token的错误

Browse Source
This commit is contained in:
ajaxfan
2021-04-23 15:51:33 +08:00
parent cca27674b9
commit a1b132234e
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/filter/TokenAuthenticationFilter.java
View File

@ -12,7 +12,6 @@ import java.util.stream.Stream;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -68,11 +67,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
} }
// 检查cookie // 检查cookie
else { else {
Cookie[] cookieArray = request.getCookies(); Optional.ofNullable(request.getCookies()).ifPresent(cookies -> {
log.info("TokenAuthenticationFilter: cookies [{}]", cookieArray == null ? null : cookieArray);
Optional.ofNullable(cookieArray).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(cookie -> setAuthentication(currentRoleCode, cookie.getValue())); .ifPresent(cookie -> setAuthentication(currentRoleCode, cookie.getValue()));
}); });

2
uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/FeignConfig.java
View File

@ -88,7 +88,7 @@ public class FeignConfig implements RequestInterceptor {
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); log.info("FeignConfig extract token {} from cookie", token.getValue());
template.header(AUTHORIZATION_HEADER, template.header(AUTHORIZATION_HEADER,
String.format("%s%s", TOKEN_PREFIX, token.getValue())); String.format("%s%s", TOKEN_PREFIX, token.getValue()));
}); });