From 5f5c4e8415105d29e97f2bb703f8eb13a7e7b72c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 31 Aug 2020 17:55:18 +0800
Subject: [PATCH] remove pig
---
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
index 8d6a8a5..6172c8d 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
@@ -3,6 +3,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilter;
import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.stereotype.Component;
@@ -25,6 +26,16 @@
@Autowired
private ValidateCodeService validateCodeService;
+ private static final String BASIC_ = "Basic ";
+
+ private static final String CODE = "code";
+
+ private static final String UUID = "uuid";
+
+ private static final String GRANT_TYPE = "grant_type";
+
+ private static final String REFRESH_TOKEN = "refresh_token";
+
@Override
public GatewayFilter apply(Object config)
{
@@ -36,14 +47,30 @@
{
return chain.filter(exchange);
}
+
+ // 刷新token请求，不处理
+ String grantType = request.getQueryParams().getFirst(GRANT_TYPE);
+ if (StringUtils.containsIgnoreCase(request.getURI().getPath(), AUTH_URL) && StringUtils.containsIgnoreCase(grantType, REFRESH_TOKEN))
+ {
+ return chain.filter(exchange);
+ }
+
+ // 消息头存在内容，且不存在验证码参数，不处理
+ String header = request.getHeaders().getFirst(HttpHeaders.AUTHORIZATION);
+ if (StringUtils.isNotEmpty(header) && StringUtils.startsWith(header, BASIC_)
+ && !request.getQueryParams().containsKey(CODE) && !request.getQueryParams().containsKey(UUID))
+ {
+ return chain.filter(exchange);
+ }
try
{
- validateCodeService.checkCapcha(request.getQueryParams().getFirst("code"),
- request.getQueryParams().getFirst("uuid"));
+ validateCodeService.checkCapcha(request.getQueryParams().getFirst(CODE),
+ request.getQueryParams().getFirst(UUID));
}
catch (Exception e)
{
ServerHttpResponse response = exchange.getResponse();
+ response.getHeaders().add("Content-Type", "application/json;charset=UTF-8");
return exchange.getResponse().writeWith(
Mono.just(response.bufferFactory().wrap(JSON.toJSONBytes(AjaxResult.error(e.getMessage())))));
}
--
Gitblit v1.9.3