From 98737f0e9d5a9c12e5ecc8899a64b75bc3dd9cbd Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Wed, 31 May 2023 21:41:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E5=BE=97=E8=A1=A8=E4=B9=89=E6=9B=B4=E5=8A=A0=E5=87=86?= =?UTF-8?q?=E7=A1=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rverChannelHandler.java => ProxyTunnelChannelHandler.java} | 4 ++-- .../neutrinoproxy/server/proxy/core/ProxyTunnelServer.java | 2 +- .../server/proxy/{core => enhance}/HttpProxy.java | 3 ++- .../proxy/{core => enhance}/HttpVisitorChannelHandler.java | 2 +- .../server/proxy/{core => enhance}/HttpsProxy.java | 3 ++- todolist.MD | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) rename neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/{ServerChannelHandler.java => ProxyTunnelChannelHandler.java} (97%) rename neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/{core => enhance}/HttpProxy.java (94%) rename neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/{core => enhance}/HttpVisitorChannelHandler.java (99%) rename neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/{core => enhance}/HttpsProxy.java (96%) diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ServerChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java similarity index 97% rename from neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ServerChannelHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java index b0b68b00..6e78924a 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ServerChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java @@ -47,10 +47,10 @@ import java.util.Date; * @date: 2022/6/16 */ @Slf4j -public class ServerChannelHandler extends SimpleChannelInboundHandler { +public class ProxyTunnelChannelHandler extends SimpleChannelInboundHandler { private static volatile Dispatcher dispatcher; - public ServerChannelHandler() { + public ProxyTunnelChannelHandler() { dispatcher = Solon.context().getBean(Dispatcher.class); } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelServer.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelServer.java index e6d00a14..bd7e8c35 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelServer.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelServer.java @@ -117,6 +117,6 @@ public class ProxyTunnelServer implements EventListener { proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip())); ch.pipeline().addLast(new ProxyMessageEncoder()); ch.pipeline().addLast(new IdleStateHandler(proxyConfig.getProtocol().getReadIdleTime(), proxyConfig.getProtocol().getWriteIdleTime(), proxyConfig.getProtocol().getAllIdleTimeSeconds())); - ch.pipeline().addLast(new ServerChannelHandler()); + ch.pipeline().addLast(new ProxyTunnelChannelHandler()); } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java similarity index 94% rename from neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpProxy.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java index e58aa407..b3f1f6ad 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java @@ -1,4 +1,4 @@ -package org.dromara.neutrinoproxy.server.proxy.core; +package org.dromara.neutrinoproxy.server.proxy.enhance; import cn.hutool.core.util.StrUtil; import io.netty.bootstrap.ServerBootstrap; @@ -8,6 +8,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import lombok.extern.slf4j.Slf4j; import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig; +import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; import org.noear.solon.core.event.AppLoadEndEvent; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpVisitorChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java similarity index 99% rename from neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpVisitorChannelHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java index adf00073..40882d8e 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpVisitorChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java @@ -1,4 +1,4 @@ -package org.dromara.neutrinoproxy.server.proxy.core; +package org.dromara.neutrinoproxy.server.proxy.enhance; import cn.hutool.core.util.StrUtil; import io.netty.buffer.ByteBuf; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpsProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java similarity index 96% rename from neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpsProxy.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java index e2eb3ad3..0af8f0f2 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpsProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java @@ -1,4 +1,4 @@ -package org.dromara.neutrinoproxy.server.proxy.core; +package org.dromara.neutrinoproxy.server.proxy.enhance; import cn.hutool.core.util.StrUtil; import io.netty.bootstrap.ServerBootstrap; @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.dromara.neutrinoproxy.core.util.FileUtil; import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig; +import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; import org.noear.solon.core.event.AppLoadEndEvent; diff --git a/todolist.MD b/todolist.MD index 07476287..9af5aa0c 100644 --- a/todolist.MD +++ b/todolist.MD @@ -2,7 +2,7 @@ - [ ] 增加针对https的支持 # Bug -- 指令通达被close的问题，org.dromara.neutrinoproxy.server.proxy.core.ServerChannelHandler.channelInactive +- 指令通达被close的问题，org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelChannelHandler.channelInactive - windows环境下直接运行发布版的jar包，日志输出乱码 - 代理mysql时，使用未开启远程访问的账号走代理访问mysql，代理客户端出现断开现象 @@ -26,4 +26,4 @@ # 3.x规划 - [ ] 支持针对用户限速、限流 - [ ] 支持P2P穿透 -- [ ] 支持原生编译 \ No newline at end of file +- [ ] 支持原生编译