From 8601b26cff1e1357cc63656b94f6eeebe30bd08b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 15 Sep 2020 17:10:37 +0800
Subject: [PATCH] 退出登录接口加入白名单&修改过期提示
---
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
index d1c26b6..03099dd 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
@@ -1,9 +1,9 @@
package com.ruoyi.gateway.filter;
-import java.util.Arrays;
import javax.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.core.Ordered;
@@ -20,6 +20,7 @@
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
import reactor.core.publisher.Mono;
/**
@@ -32,9 +33,9 @@
{
private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
- // 排除过滤的 uri 地址，swagger排除自行添加
- private static final String[] whiteList = { "/auth/login", "/code/v2/api-docs", "/schedule/v2/api-docs",
- "/system/v2/api-docs", "/csrf" };
+ // 排除过滤的 uri 地址，nacos自行添加
+ @Autowired
+ private IgnoreWhiteProperties ignoreWhite;
@Resource(name = "stringRedisTemplate")
private ValueOperations<String, String> sops;
@@ -44,7 +45,7 @@
{
String url = exchange.getRequest().getURI().getPath();
// 跳过不需要验证的路径
- if (Arrays.asList(whiteList).contains(url))
+ if (StringUtils.matches(url, ignoreWhite.getWhites()))
{
return chain.filter(exchange);
}
@@ -56,7 +57,7 @@
String userStr = sops.get(CacheConstants.LOGIN_TOKEN_KEY + token);
if (StringUtils.isNull(userStr))
{
- return setUnauthorizedResponse(exchange, "令牌验证失败");
+ return setUnauthorizedResponse(exchange, "登录状态已过期");
}
JSONObject obj = JSONObject.parseObject(userStr);
String userid = obj.getString("userid");
@@ -69,7 +70,7 @@
ServerHttpRequest mutableReq = exchange.getRequest().mutate().header(CacheConstants.DETAILS_USER_ID, userid)
.header(CacheConstants.DETAILS_USERNAME, username).build();
ServerWebExchange mutableExchange = exchange.mutate().request(mutableReq).build();
-
+
return chain.filter(mutableExchange);
}
--
Gitblit v1.9.3