diff --git a/README.md b/README.md index 2a9e695..0b4faa3 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,8 @@ micro-fast ![](./all/ms/架构图.png) ## swagger系统文档聚合 ![](./all/ms/swagger.png) +## 监控中心 +![](./all/ms/monitor.png) ## 各模块的详细介绍 - `boot-starter`项目介绍[README.md](boot-starter/README.md) - `ms`项目介绍[README.md](ms/README.md) diff --git a/all/ms/monitor.png b/all/ms/monitor.png new file mode 100644 index 0000000..695402a Binary files /dev/null and b/all/ms/monitor.png differ diff --git a/ms/gateway/src/main/java/com/micro/fast/gateway/filter/PreRequestFilter.java b/ms/gateway/src/main/java/com/micro/fast/gateway/filter/PreRequestFilter.java index 99cfa4c..211a725 100644 --- a/ms/gateway/src/main/java/com/micro/fast/gateway/filter/PreRequestFilter.java +++ b/ms/gateway/src/main/java/com/micro/fast/gateway/filter/PreRequestFilter.java @@ -45,10 +45,17 @@ public class PreRequestFilter extends ZuulFilter { // 对请求进行后续处理 requestContext.setSendZuulResponse(true); }else { - // 不进行后续操作,返回401状态码 - requestContext.setSendZuulResponse(false); - requestContext.setResponseStatusCode(HttpStatus.UNAUTHORIZED.value()); + String remoteHost = request.getRemoteHost(); + if (remoteHost.equals("127.0.0.1")){ + // 对本地请求不过滤 + requestContext.setSendZuulResponse(true); + }else { + // 不进行后续操作,返回401状态码 + requestContext.setSendZuulResponse(false); + requestContext.setResponseStatusCode(HttpStatus.UNAUTHORIZED.value()); + } } + return null; } } diff --git a/ms/gateway/src/main/java/com/micro/fast/gateway/jwt/ValidateJwtToken.java b/ms/gateway/src/main/java/com/micro/fast/gateway/jwt/ValidateJwtToken.java index 3c5f0a0..d6acb14 100644 --- a/ms/gateway/src/main/java/com/micro/fast/gateway/jwt/ValidateJwtToken.java +++ b/ms/gateway/src/main/java/com/micro/fast/gateway/jwt/ValidateJwtToken.java @@ -6,6 +6,7 @@ import io.jsonwebtoken.Jwts; import org.apache.commons.lang.StringUtils; import javax.servlet.http.HttpServletRequest; +import javax.validation.constraints.NotNull; import java.io.UnsupportedEncodingException; /** @@ -18,7 +19,13 @@ public class ValidateJwtToken { */ public static ServerResponse validate(HttpServletRequest request,String signingKey){ String authorization = request.getHeader("Authorization"); + if (authorization==null){ + return ServerResponse.error(); + } String token = StringUtils.substringAfter(authorization, "bearer "); + if (token==null){ + return ServerResponse.error(); + } //解析jwt Claims body = null; try {