From 909c5463c1b238b9a77e159d40bf768b5f993696 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Mon, 29 Aug 2022 21:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proxy/server/{ => proxy}/core/BytesMetricsHandler.java | 5 +++-- .../proxy/server/{ => proxy}/core/ProxyServerRunner.java | 2 +- .../proxy/server/{ => proxy}/core/ServerChannelHandler.java | 2 +- .../proxy/server/{ => proxy}/core/UserChannelHandler.java | 2 +- .../server/{ => proxy}/handler/ProxyMessageAuthHandler.java | 6 +++--- .../{ => proxy}/handler/ProxyMessageConnectHandler.java | 2 +- .../{ => proxy}/handler/ProxyMessageDisconnectHandler.java | 2 +- .../{ => proxy}/handler/ProxyMessageHeartbeatHandler.java | 2 +- .../{ => proxy}/handler/ProxyMessageTransferHandler.java | 2 +- .../neutrino/proxy/server/{ => proxy}/monitor/Metrics.java | 2 +- .../proxy/server/{ => proxy}/monitor/MetricsCollector.java | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/core/BytesMetricsHandler.java (93%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/core/ProxyServerRunner.java (99%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/core/ServerChannelHandler.java (98%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/core/UserChannelHandler.java (99%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/handler/ProxyMessageAuthHandler.java (96%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/handler/ProxyMessageConnectHandler.java (98%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/handler/ProxyMessageDisconnectHandler.java (98%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/handler/ProxyMessageHeartbeatHandler.java (97%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/handler/ProxyMessageTransferHandler.java (97%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/monitor/Metrics.java (96%) rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/{ => proxy}/monitor/MetricsCollector.java (98%) diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/BytesMetricsHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/BytesMetricsHandler.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java index 619e03dd..f27da75d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/BytesMetricsHandler.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java @@ -20,9 +20,9 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.core; +package fun.asgc.neutrino.proxy.server.proxy.core; -import fun.asgc.neutrino.proxy.server.monitor.MetricsCollector; +import fun.asgc.neutrino.proxy.server.proxy.monitor.MetricsCollector; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; @@ -43,6 +43,7 @@ public class BytesMetricsHandler extends ChannelDuplexHandler { MetricsCollector metricsCollector = MetricsCollector.getCollector(sa.getPort()); metricsCollector.incrementReadBytes(((ByteBuf) msg).readableBytes()); metricsCollector.incrementReadMsgs(1); + System.out.println("字节数:" + metricsCollector.getMetrics().getReadBytes()); ctx.fireChannelRead(msg); } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ProxyServerRunner.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ProxyServerRunner.java similarity index 99% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ProxyServerRunner.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ProxyServerRunner.java index 2ab0d28d..708d91c3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ProxyServerRunner.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ProxyServerRunner.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.core; +package fun.asgc.neutrino.proxy.server.proxy.core; import fun.asgc.neutrino.core.annotation.Autowired; import fun.asgc.neutrino.core.annotation.Bean; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ServerChannelHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java similarity index 98% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ServerChannelHandler.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java index 1ec67068..8858a309 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/ServerChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.core; +package fun.asgc.neutrino.proxy.server.proxy.core; import fun.asgc.neutrino.core.base.DefaultDispatcher; import fun.asgc.neutrino.core.base.Dispatcher; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/UserChannelHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/UserChannelHandler.java similarity index 99% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/UserChannelHandler.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/UserChannelHandler.java index fb4c1f00..6758ba11 100755 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/core/UserChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/UserChannelHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.core; +package fun.asgc.neutrino.proxy.server.proxy.core; import fun.asgc.neutrino.proxy.core.Constants; import fun.asgc.neutrino.proxy.core.ProxyMessage; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageAuthHandler.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java index 9c89f303..d9a5854b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageAuthHandler.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.handler; +package fun.asgc.neutrino.proxy.server.proxy.handler; import fun.asgc.neutrino.core.annotation.Autowired; import fun.asgc.neutrino.core.annotation.Component; @@ -32,8 +32,8 @@ import fun.asgc.neutrino.proxy.core.*; import fun.asgc.neutrino.proxy.server.base.proxy.ProxyConfig; import fun.asgc.neutrino.proxy.server.base.proxy.ProxyServerConfig; import fun.asgc.neutrino.proxy.server.base.rest.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.core.BytesMetricsHandler; -import fun.asgc.neutrino.proxy.server.core.UserChannelHandler; +import fun.asgc.neutrino.proxy.server.proxy.core.BytesMetricsHandler; +import fun.asgc.neutrino.proxy.server.proxy.core.UserChannelHandler; import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageConnectHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java similarity index 98% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageConnectHandler.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java index f9179e43..5fd83fc1 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageConnectHandler.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.handler; +package fun.asgc.neutrino.proxy.server.proxy.handler; import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.Match; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageDisconnectHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageDisconnectHandler.java similarity index 98% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageDisconnectHandler.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageDisconnectHandler.java index 34f5ebb9..5b28ba5c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageDisconnectHandler.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageDisconnectHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.handler; +package fun.asgc.neutrino.proxy.server.proxy.handler; import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.Match; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageHeartbeatHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageHeartbeatHandler.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java index 5eddf811..c214988f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageHeartbeatHandler.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.handler; +package fun.asgc.neutrino.proxy.server.proxy.handler; import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.Match; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageTransferHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageTransferHandler.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java index daabcacf..299f6213 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/handler/ProxyMessageTransferHandler.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.handler; +package fun.asgc.neutrino.proxy.server.proxy.handler; import fun.asgc.neutrino.core.annotation.Component; import fun.asgc.neutrino.core.annotation.Match; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/monitor/Metrics.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/monitor/Metrics.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/monitor/Metrics.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/monitor/Metrics.java index c9bf15cb..a0dd05ac 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/monitor/Metrics.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/monitor/Metrics.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.monitor; +package fun.asgc.neutrino.proxy.server.proxy.monitor; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/monitor/MetricsCollector.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/monitor/MetricsCollector.java similarity index 98% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/monitor/MetricsCollector.java rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/monitor/MetricsCollector.java index f4be1ab5..87f8fe47 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/monitor/MetricsCollector.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/monitor/MetricsCollector.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.monitor; +package fun.asgc.neutrino.proxy.server.proxy.monitor; import java.util.ArrayList; import java.util.Iterator;