From 7fd6fd5313228d05d104f6bc7d279b0768e5235b Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Wed, 15 Mar 2023 12:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=B1=A0=E8=B0=83=E6=95=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asgc/neutrino/proxy/client/config/ProxyConfig.java | 1 + .../neutrino/proxy/client/core/ProxyClientService.java | 2 +- neutrino-proxy-client/src/main/resources/app.yml | 1 + .../neutrino/proxy/server/base/proxy/ProxyConfig.java | 2 ++ .../proxy/server/base/proxy/ProxyConfiguration.java | 8 ++++---- neutrino-proxy-server/src/main/resources/app.yml | 2 ++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java index b5bf5b4d..7d30a0b9 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java +++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java @@ -38,5 +38,6 @@ public class ProxyConfig { private Boolean sslEnable; private Integer obtainLicenseInterval; private String licenseKey; + private Integer threadCount; } } diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java index 7a1ec2a6..0e28496c 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java +++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java @@ -66,7 +66,7 @@ public class ProxyClientService { public void init() { this.reconnectExecutor.scheduleWithFixedDelay(this::reconnect, 0, RECONNECT_INTERVAL_SECONDS, TimeUnit.SECONDS); - NioEventLoopGroup workerGroup = new NioEventLoopGroup(); + NioEventLoopGroup workerGroup = new NioEventLoopGroup(proxyConfig.getClient().getThreadCount()); realServerBootstrap.group(workerGroup); realServerBootstrap.channel(NioSocketChannel.class); realServerBootstrap.handler(new ChannelInitializer() { diff --git a/neutrino-proxy-client/src/main/resources/app.yml b/neutrino-proxy-client/src/main/resources/app.yml index 3ded7f75..d4eec9a5 100644 --- a/neutrino-proxy-client/src/main/resources/app.yml +++ b/neutrino-proxy-client/src/main/resources/app.yml @@ -13,6 +13,7 @@ neutrino: write-idle-time: 8 all-idle-time-seconds: 0 client: + thread-count: 50 key-store-password: 123456 jks-path: classpath:/test.jks server-ip: localhost diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfig.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfig.java index 4b18c1f4..cc336c4b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfig.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfig.java @@ -42,6 +42,8 @@ public class ProxyConfig { private String keyStorePassword; private String keyManagerPassword; private String jksPath; + private Integer bossThreadCount; + private Integer workThreadCount; } } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfiguration.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfiguration.java index 328de66c..30e9977a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfiguration.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfiguration.java @@ -35,13 +35,13 @@ public class ProxyConfiguration implements LifecycleBean { } @Bean("serverBossGroup") - public NioEventLoopGroup serverBossGroup() { - return new NioEventLoopGroup(); + public NioEventLoopGroup serverBossGroup(@Inject ProxyConfig proxyConfig) { + return new NioEventLoopGroup(proxyConfig.getServer().getBossThreadCount()); } @Bean("serverWorkerGroup") - public NioEventLoopGroup serverWorkerGroup() { - return new NioEventLoopGroup(); + public NioEventLoopGroup serverWorkerGroup(@Inject ProxyConfig proxyConfig) { + return new NioEventLoopGroup(proxyConfig.getServer().getWorkThreadCount()); } } diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml index 076fff32..4cca73c3 100644 --- a/neutrino-proxy-server/src/main/resources/app.yml +++ b/neutrino-proxy-server/src/main/resources/app.yml @@ -13,6 +13,8 @@ neutrino: write-idle-time: 10 all-idle-time-seconds: 0 server: + boss-thread-count: 10 + work-thread-count: 60 port: 9000 ssl-port: 9002 key-store-password: 123456