From 00fd0bab84c613f655bf9e17bc2ba3bc0f1a41cc Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Sat, 16 Dec 2023 16:07:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E9=80=9F=E7=9B=B8=E5=85=B3=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/base/proxy/ProxyConfiguration.java | 8 ++++---- .../neutrinoproxy/server/proxy/enhance/HttpProxy.java | 4 ++-- .../neutrinoproxy/server/proxy/enhance/HttpsProxy.java | 4 ++-- .../proxy/security/VisitorFlowLimiterChannelHandler.java | 4 +--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java index 9eb36f0a..9a903b0d 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java @@ -77,8 +77,8 @@ public class ProxyConfiguration implements LifecycleBean { } ch.pipeline().addFirst(new BytesMetricsHandler()); // ch.pipeline().addLast(new ChannelTrafficShapingHandler(1024 * 1024 * 20, 1024 * 1024 * 20, 100, 20000)); - ch.pipeline().addLast("security", new TcpVisitorSecurityChannelHandler()); - ch.pipeline().addLast(new VisitorFlowLimiterChannelHandler()); + ch.pipeline().addLast(new TcpVisitorSecurityChannelHandler()); + ch.pipeline().addLast("flowLimiter", new VisitorFlowLimiterChannelHandler()); ch.pipeline().addLast(new TcpVisitorChannelHandler()); } }); @@ -116,8 +116,8 @@ public class ProxyConfiguration implements LifecycleBean { if (null != proxyConfig.getServer().getUdp().getTransferLogEnable() && proxyConfig.getServer().getUdp().getTransferLogEnable()) { ch.pipeline().addFirst(new LoggingHandler(UdpVisitorChannelHandler.class)); } - pipeline.addLast(udpServerWorkerGroup, "security", new UdpVisitorSecurityChannelHandler()); - ch.pipeline().addLast(new VisitorFlowLimiterChannelHandler()); + pipeline.addLast(udpServerWorkerGroup, new UdpVisitorSecurityChannelHandler()); + ch.pipeline().addLast("flowLimiter", new VisitorFlowLimiterChannelHandler()); pipeline.addLast(udpServerWorkerGroup, new UdpVisitorChannelHandler()); } }); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java index 201c189c..ce1197db 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java @@ -48,8 +48,8 @@ public class HttpProxy implements EventListener { ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class)); } ch.pipeline().addFirst(new BytesMetricsHandler()); - ch.pipeline().addLast("security", new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName())); - ch.pipeline().addLast(new VisitorFlowLimiterChannelHandler()); + ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName())); + ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler()); ch.pipeline().addLast(new HttpVisitorChannelHandler()); } }); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java index 13c3cef0..aa5ff58e 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java @@ -57,8 +57,8 @@ public class HttpsProxy implements EventListener { } ch.pipeline().addLast(createSslHandler()); ch.pipeline().addFirst(new BytesMetricsHandler()); - ch.pipeline().addLast("security", new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName())); - ch.pipeline().addLast(new VisitorFlowLimiterChannelHandler()); + ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName())); + ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler()); ch.pipeline().addLast(new HttpVisitorChannelHandler()); } }); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/VisitorFlowLimiterChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/VisitorFlowLimiterChannelHandler.java index bfb93e71..d99fdfa3 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/VisitorFlowLimiterChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/VisitorFlowLimiterChannelHandler.java @@ -18,8 +18,6 @@ import org.noear.solon.Solon; */ @Slf4j public class VisitorFlowLimiterChannelHandler extends ChannelInboundHandlerAdapter { - - private final LicenseService licenseService = Solon.context().getBean(LicenseService.class); private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class); @Override @@ -38,7 +36,7 @@ public class VisitorFlowLimiterChannelHandler extends ChannelInboundHandlerAdapt } if (null != upLimitRate || null != downLimitRate) { // 如果不全为空，则需要做限速 - ctx.pipeline().addAfter("security", "trafficShaping", new ChannelTrafficShapingHandler(downLimitRate == null ? 0 : downLimitRate, upLimitRate == null ? 0 : upLimitRate, 100, 600000)); + ctx.pipeline().addAfter("flowLimiter", "trafficShaping", new ChannelTrafficShapingHandler(downLimitRate == null ? 0 : downLimitRate, upLimitRate == null ? 0 : upLimitRate, 100, 600000)); } // 每个连接第一次处理之后。无论是否限速，该连接后续都不在处理，避免频繁执行影响性能