记得上下班打卡 | git大法好,push需谨慎

Commit 035ff8fd authored by 张国柄's avatar 张国柄

配置KYLIN.AUTH.URL;

parent 613f42ea
......@@ -5,3 +5,4 @@ liquidnet:
logfile:
path: ./logs
name: support-zuul
level: debug
......@@ -5,4 +5,5 @@ liquidnet:
logfile:
path: ./logs
name: support-zuul
level: debug
......@@ -28,7 +28,7 @@ logging:
level:
root: info
#以下是为指定包设置日志级别
com.netflix: info
com.liquidnet: ${liquidnet.logfile.level}
# -----------------------------------------------------------
spring:
application:
......@@ -75,18 +75,26 @@ zuul:
# ignored-patterns: /**/div/**
# -----------------------------------------------------------
# 判断顺序: exclude.url > include.url > include.url-pattern > exclude.url-pattern
global:
include:
url:
url-pattern: /kylin/station/**
exclude:
url: /adam/send,
/adam/member/info,
/kylin/station/login,
/kylin/station/login/sms
url-pattern: /**/login/**,
/*/v2/api-docs*,
/kylin/**
global-auth:
include-url:
- /kylin/performance/payDetail
- /kylin/order/pre
- /kylin/order/checkPayment
- /kylin/order/details
- /kylin/order/list
- /kylin/order/payAgain
include-url-pattern:
- /kylin/station/**
- /kylin/performance/partner/**
exclude-url:
- /adam/send
- /adam/member/info
- /kylin/station/login
- /kylin/station/login/sms
exclude-url-pattern:
- /**/login/**
- /*/v2/api-docs*
- /kylin/**
# -----------------------------------------------------------
#解决错误 com.netflix.client.ClientException: Load balancer does not have available server for client:panfeng-item-service
#这样就可以即指定path与URL,又不破坏Zuul的Hystrix与Ribbon特性了。
......
......@@ -11,10 +11,11 @@ import com.netflix.zuul.ZuulFilter;
import com.netflix.zuul.context.RequestContext;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.util.DigestUtils;
......@@ -25,19 +26,19 @@ import java.util.List;
import java.util.Map;
@Slf4j
@Data
@Component
@ConfigurationProperties(prefix = "global-auth")
public class GlobalAuthFilter extends ZuulFilter {
@Value("#{'${global.include.url}'.split(', ')}")
private List<String> includeUrls;
@Value("#{'${global.include.url-pattern}'.split(', ')}")
private List<String> includeUrlPatterns;
@Value("#{'${global.exclude.url}'.split(', ')}")
private List<String> excludeUrls;
@Value("#{'${global.exclude.url-pattern}'.split(', ')}")
private List<String> excludeUrlPatterns;
private List<String> includeUrl;
private List<String> includeUrlPattern;
private List<String> excludeUrl;
private List<String> excludeUrlPattern;
private static final String CONTENT_TYPE = "application/json;charset=utf-8";
private static final String AUTHORIZATION = "authorization";
private static final String TOKEN_STATUS = "token_status";
private static final String TOKEN_ILLEGAL = "40001";
private static final String TOKEN_KICK = "40002";
private static final String TOKEN_INVALID = "40003";
......@@ -83,18 +84,18 @@ public class GlobalAuthFilter extends ZuulFilter {
String requestURI = ctxRequest.getRequestURI();
if (excludeUrls.contains(requestURI)) {
if (excludeUrl.contains(requestURI)) {
return false;
}
if (includeUrls.contains(requestURI)) {
if (includeUrl.contains(requestURI)) {
return true;
}
for (String urlPattern : includeUrlPatterns) {
for (String urlPattern : includeUrlPattern) {
if (PathMatchUtil.isPathMatch(urlPattern, requestURI)) {
return true;
}
}
for (String urlPattern : excludeUrlPatterns) {
for (String urlPattern : excludeUrlPattern) {
if (PathMatchUtil.isPathMatch(urlPattern, requestURI)) {
return false;
}
......@@ -110,8 +111,7 @@ public class GlobalAuthFilter extends ZuulFilter {
String uToken = zuulRequestHeaders.get(CurrentUtil.uToken);
log.info("headers:{}", JsonUtils.toJson(ctx.getRequest().getHeaderNames()));
log.info("uToken:{}", uToken);
log.debug("headers:{}", zuulRequestHeaders);
if (StringUtils.isEmpty(uToken)) {
respHandler(ctx, TOKEN_ILLEGAL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment