记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
035ff8fd
Commit
035ff8fd
authored
Jun 04, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配置KYLIN.AUTH.URL;
parent
613f42ea
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
28 deletions
+38
-28
liquidnet-support-zuul-dev.yml
...us-config/liquidnet-config/liquidnet-support-zuul-dev.yml
+1
-0
liquidnet-support-zuul-test.yml
...s-config/liquidnet-config/liquidnet-support-zuul-test.yml
+1
-0
liquidnet-support-zuul.yml
...et-bus-config/liquidnet-config/liquidnet-support-zuul.yml
+21
-13
GlobalAuthFilter.java
...a/com/liquidnet/support/zuul/filter/GlobalAuthFilter.java
+15
-15
No files found.
liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul-dev.yml
View file @
035ff8fd
...
@@ -5,3 +5,4 @@ liquidnet:
...
@@ -5,3 +5,4 @@ liquidnet:
logfile
:
logfile
:
path
:
./logs
path
:
./logs
name
:
support-zuul
name
:
support-zuul
level
:
debug
liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul-test.yml
View file @
035ff8fd
...
@@ -5,4 +5,5 @@ liquidnet:
...
@@ -5,4 +5,5 @@ liquidnet:
logfile
:
logfile
:
path
:
./logs
path
:
./logs
name
:
support-zuul
name
:
support-zuul
level
:
debug
liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul.yml
View file @
035ff8fd
...
@@ -28,7 +28,7 @@ logging:
...
@@ -28,7 +28,7 @@ logging:
level
:
level
:
root
:
info
root
:
info
#以下是为指定包设置日志级别
#以下是为指定包设置日志级别
com.
netflix
:
info
com.
liquidnet
:
${liquidnet.logfile.level}
# -----------------------------------------------------------
# -----------------------------------------------------------
spring
:
spring
:
application
:
application
:
...
@@ -75,18 +75,26 @@ zuul:
...
@@ -75,18 +75,26 @@ zuul:
# ignored-patterns: /**/div/**
# ignored-patterns: /**/div/**
# -----------------------------------------------------------
# -----------------------------------------------------------
# 判断顺序: exclude.url > include.url > include.url-pattern > exclude.url-pattern
# 判断顺序: exclude.url > include.url > include.url-pattern > exclude.url-pattern
global
:
global-auth
:
include
:
include-url
:
url
:
-
/kylin/performance/payDetail
url-pattern
:
/kylin/station/**
-
/kylin/order/pre
exclude
:
-
/kylin/order/checkPayment
url
:
/adam/send,
-
/kylin/order/details
/adam/member/info,
-
/kylin/order/list
/kylin/station/login,
-
/kylin/order/payAgain
/kylin/station/login/sms
include-url-pattern
:
url-pattern
:
/**/login/**,
-
/kylin/station/**
/*/v2/api-docs*,
-
/kylin/performance/partner/**
/kylin/**
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
#解决错误 com.netflix.client.ClientException: Load balancer does not have available server for client:panfeng-item-service
#这样就可以即指定path与URL,又不破坏Zuul的Hystrix与Ribbon特性了。
#这样就可以即指定path与URL,又不破坏Zuul的Hystrix与Ribbon特性了。
...
...
liquidnet-bus-support/liquidnet-support-zuul/src/main/java/com/liquidnet/support/zuul/filter/GlobalAuthFilter.java
View file @
035ff8fd
...
@@ -11,10 +11,11 @@ import com.netflix.zuul.ZuulFilter;
...
@@ -11,10 +11,11 @@ import com.netflix.zuul.ZuulFilter;
import
com.netflix.zuul.context.RequestContext
;
import
com.netflix.zuul.context.RequestContext
;
import
io.jsonwebtoken.Claims
;
import
io.jsonwebtoken.Claims
;
import
io.jsonwebtoken.ExpiredJwtException
;
import
io.jsonwebtoken.ExpiredJwtException
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.b
eans.factory.annotation.Value
;
import
org.springframework.b
oot.context.properties.ConfigurationProperties
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.DigestUtils
;
import
org.springframework.util.DigestUtils
;
...
@@ -25,19 +26,19 @@ import java.util.List;
...
@@ -25,19 +26,19 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
@Slf4j
@Slf4j
@Data
@Component
@Component
@ConfigurationProperties
(
prefix
=
"global-auth"
)
public
class
GlobalAuthFilter
extends
ZuulFilter
{
public
class
GlobalAuthFilter
extends
ZuulFilter
{
@Value
(
"#{'${global.include.url}'.split(', ')}"
)
private
List
<
String
>
includeUrl
;
private
List
<
String
>
includeUrls
;
private
List
<
String
>
includeUrlPattern
;
@Value
(
"#{'${global.include.url-pattern}'.split(', ')}"
)
private
List
<
String
>
excludeUrl
;
private
List
<
String
>
includeUrlPatterns
;
private
List
<
String
>
excludeUrlPattern
;
@Value
(
"#{'${global.exclude.url}'.split(', ')}"
)
private
List
<
String
>
excludeUrls
;
@Value
(
"#{'${global.exclude.url-pattern}'.split(', ')}"
)
private
List
<
String
>
excludeUrlPatterns
;
private
static
final
String
CONTENT_TYPE
=
"application/json;charset=utf-8"
;
private
static
final
String
CONTENT_TYPE
=
"application/json;charset=utf-8"
;
private
static
final
String
AUTHORIZATION
=
"authorization"
;
private
static
final
String
AUTHORIZATION
=
"authorization"
;
private
static
final
String
TOKEN_STATUS
=
"token_status"
;
private
static
final
String
TOKEN_STATUS
=
"token_status"
;
private
static
final
String
TOKEN_ILLEGAL
=
"40001"
;
private
static
final
String
TOKEN_ILLEGAL
=
"40001"
;
private
static
final
String
TOKEN_KICK
=
"40002"
;
private
static
final
String
TOKEN_KICK
=
"40002"
;
private
static
final
String
TOKEN_INVALID
=
"40003"
;
private
static
final
String
TOKEN_INVALID
=
"40003"
;
...
@@ -83,18 +84,18 @@ public class GlobalAuthFilter extends ZuulFilter {
...
@@ -83,18 +84,18 @@ public class GlobalAuthFilter extends ZuulFilter {
String
requestURI
=
ctxRequest
.
getRequestURI
();
String
requestURI
=
ctxRequest
.
getRequestURI
();
if
(
excludeUrl
s
.
contains
(
requestURI
))
{
if
(
excludeUrl
.
contains
(
requestURI
))
{
return
false
;
return
false
;
}
}
if
(
includeUrl
s
.
contains
(
requestURI
))
{
if
(
includeUrl
.
contains
(
requestURI
))
{
return
true
;
return
true
;
}
}
for
(
String
urlPattern
:
includeUrlPattern
s
)
{
for
(
String
urlPattern
:
includeUrlPattern
)
{
if
(
PathMatchUtil
.
isPathMatch
(
urlPattern
,
requestURI
))
{
if
(
PathMatchUtil
.
isPathMatch
(
urlPattern
,
requestURI
))
{
return
true
;
return
true
;
}
}
}
}
for
(
String
urlPattern
:
excludeUrlPattern
s
)
{
for
(
String
urlPattern
:
excludeUrlPattern
)
{
if
(
PathMatchUtil
.
isPathMatch
(
urlPattern
,
requestURI
))
{
if
(
PathMatchUtil
.
isPathMatch
(
urlPattern
,
requestURI
))
{
return
false
;
return
false
;
}
}
...
@@ -110,8 +111,7 @@ public class GlobalAuthFilter extends ZuulFilter {
...
@@ -110,8 +111,7 @@ public class GlobalAuthFilter extends ZuulFilter {
String
uToken
=
zuulRequestHeaders
.
get
(
CurrentUtil
.
uToken
);
String
uToken
=
zuulRequestHeaders
.
get
(
CurrentUtil
.
uToken
);
log
.
info
(
"headers:{}"
,
JsonUtils
.
toJson
(
ctx
.
getRequest
().
getHeaderNames
()));
log
.
debug
(
"headers:{}"
,
zuulRequestHeaders
);
log
.
info
(
"uToken:{}"
,
uToken
);
if
(
StringUtils
.
isEmpty
(
uToken
))
{
if
(
StringUtils
.
isEmpty
(
uToken
))
{
respHandler
(
ctx
,
TOKEN_ILLEGAL
);
respHandler
(
ctx
,
TOKEN_ILLEGAL
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment