From 7a35c474d6153189957422264b57df7ce1daed77 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 29 Jul 2021 14:51:27 +0800
Subject: [PATCH] 统一网关错误码响应
---
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 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 36c72d6..8517c79 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
@@ -7,19 +7,16 @@
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.core.Ordered;
-import org.springframework.core.io.buffer.DataBufferFactory;
import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.stereotype.Component;
import org.springframework.web.server.ServerWebExchange;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.utils.SecurityUtils;
+import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
@@ -34,7 +31,7 @@
public class AuthFilter implements GlobalFilter, Ordered
{
private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
-
+
private final static long EXPIRE_TIME = Constants.TOKEN_EXPIRE * 60;
// 排除过滤的 uri 地址，nacos自行添加
@@ -43,61 +40,68 @@
@Resource(name = "stringRedisTemplate")
private ValueOperations<String, String> sops;
-
+
@Autowired
private RedisService redisService;
@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
{
- String url = exchange.getRequest().getURI().getPath();
+ ServerHttpRequest request = exchange.getRequest();
+ ServerHttpRequest.Builder mutate = request.mutate();
+
+ String url = request.getURI().getPath();
// 跳过不需要验证的路径
if (StringUtils.matches(url, ignoreWhite.getWhites()))
{
return chain.filter(exchange);
}
- String token = getToken(exchange.getRequest());
- if (StringUtils.isBlank(token))
+ String token = getToken(request);
+ if (StringUtils.isEmpty(token))
{
- return setUnauthorizedResponse(exchange, "令牌不能为空");
+ return unauthorizedResponse(exchange, "令牌不能为空");
}
String userStr = sops.get(getTokenKey(token));
- if (StringUtils.isNull(userStr))
+ if (StringUtils.isEmpty(userStr))
{
- return setUnauthorizedResponse(exchange, "登录状态已过期");
+ return unauthorizedResponse(exchange, "登录状态已过期");
}
- JSONObject obj = JSONObject.parseObject(userStr);
- String userid = obj.getString("userid");
- String username = obj.getString("username");
- if (StringUtils.isBlank(userid) || StringUtils.isBlank(username))
+ JSONObject cacheObj = JSONObject.parseObject(userStr);
+ String userid = cacheObj.getString("userid");
+ String username = cacheObj.getString("username");
+ if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username))
{
- return setUnauthorizedResponse(exchange, "令牌验证失败");
+ return unauthorizedResponse(exchange, "令牌验证失败");
}
-
+
// 设置过期时间
redisService.expire(getTokenKey(token), EXPIRE_TIME);
// 设置用户信息到请求
- 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);
+ addHeader(mutate, CacheConstants.DETAILS_USER_ID, userid);
+ addHeader(mutate, CacheConstants.DETAILS_USERNAME, username);
+ return chain.filter(exchange.mutate().request(mutate.build()).build());
}
- private Mono<Void> setUnauthorizedResponse(ServerWebExchange exchange, String msg)
+ private void addHeader(ServerHttpRequest.Builder mutate, String name, Object value)
{
- ServerHttpResponse response = exchange.getResponse();
- response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
- response.setStatusCode(HttpStatus.OK);
-
- log.error("[鉴权异常处理]请求路径:{}", exchange.getRequest().getPath());
-
- return response.writeWith(Mono.fromSupplier(() -> {
- DataBufferFactory bufferFactory = response.bufferFactory();
- return bufferFactory.wrap(JSON.toJSONBytes(R.fail(msg)));
- }));
+ if (value == null)
+ {
+ return;
+ }
+ String valueStr = value.toString();
+ String valueEncode = ServletUtils.urlEncode(valueStr);
+ mutate.header(name, valueEncode);
}
+ private Mono<Void> unauthorizedResponse(ServerWebExchange exchange, String msg)
+ {
+ log.error("[鉴权异常处理]请求路径:{}", exchange.getRequest().getPath());
+ return ServletUtils.webFluxResponseWriter(exchange.getResponse(), msg, HttpStatus.UNAUTHORIZED);
+ }
+
+ /**
+ * 获取缓存key
+ */
private String getTokenKey(String token)
{
return CacheConstants.LOGIN_TOKEN_KEY + token;
@@ -108,12 +112,8 @@
*/
private String getToken(ServerHttpRequest request)
{
- String token = request.getHeaders().getFirst(CacheConstants.HEADER);
- if (StringUtils.isNotEmpty(token) && token.startsWith(CacheConstants.TOKEN_PREFIX))
- {
- token = token.replace(CacheConstants.TOKEN_PREFIX, "");
- }
- return token;
+ String token = request.getHeaders().getFirst(CacheConstants.TOKEN_AUTHENTICATION);
+ return SecurityUtils.replaceTokenPrefix(token);
}
@Override
--
Gitblit v1.9.3