From 1e2b3b34520218d910ca72754e3eaa4dd8d7ae09 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 12 Oct 2022 18:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96HttpRequestHandler=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asgc/neutrino/core/web/HttpRequestHandler.java  | 13 ++++++++-----
 .../base/rest/interceptor/BaseAuthInterceptor.java  |  5 -----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
index 65017509..2d2e0b6f 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
@@ -40,9 +40,11 @@ import fun.asgc.neutrino.core.web.router.HttpRouteParam;
 import fun.asgc.neutrino.core.web.router.HttpRouteResult;
 import fun.asgc.neutrino.core.web.router.HttpRouterType;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.*;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpResponseStatus;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;
@@ -117,9 +119,10 @@ public class HttpRequestHandler {
 				httpResponseWrapper.writeAndFlush();
 				return;
 			} else if(HttpRouterType.PAGE == httpRouteResult.getType()) {
-				if (!preHandle(httpRouteResult.getPageRoute(), null)) {
-					return;
-				}
+				// 静态页面无需前置拦截
+//				if (!preHandle(httpRouteResult.getPageRoute(), null)) {
+//					return;
+//				}
 
 				// 前端页面
 				String mimeType = MimeType.getMimeType(MimeType.parseSuffix(httpRouteResult.getPageLocation()));
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
index 955c943b..40320809 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
@@ -46,11 +46,6 @@ public class BaseAuthInterceptor implements HandlerInterceptor {
 
 	@Override
 	public boolean preHandle(HttpRequestWrapper requestParser, HttpResponseWrapper responseWrapper, String route, Method targetMethod) throws Exception {
-		// TODO 临时解决静态页面被拦截的问题
-		if (null == targetMethod) {
-			return true;
-		}
-
 		SystemContext systemContext = new SystemContext();
 		SystemContextHolder.set(systemContext);
 		systemContext.setIp(HttpUtil.getIP(HttpContextHolder.getChannelHandlerContext(), requestParser));