From 10451db5f30a823d3ce0a0eda3fbd689a1650238 Mon Sep 17 00:00:00 2001 From: srzou Date: Thu, 5 Dec 2024 20:59:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.3.0-beta1):=20=E8=B0=83=E6=95=B4grp?= =?UTF-8?q?c/netty=20server=E8=8E=B7=E5=8F=96port=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snailjob/client/common/rpc/server/SnailGrpcServer.java | 3 ++- .../client/common/rpc/server/SnailNettyHttpServer.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/server/SnailGrpcServer.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/server/SnailGrpcServer.java index 5d9349292..91ec387dc 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/server/SnailGrpcServer.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/server/SnailGrpcServer.java @@ -5,6 +5,7 @@ import com.aizuda.snailjob.client.common.config.SnailJobProperties; import com.aizuda.snailjob.client.common.config.SnailJobProperties.RpcServerProperties; import com.aizuda.snailjob.client.common.config.SnailJobProperties.ThreadPoolConfig; import com.aizuda.snailjob.client.common.exception.SnailJobClientException; +import com.aizuda.snailjob.client.common.rpc.client.GrpcChannel; import com.aizuda.snailjob.client.common.rpc.supports.handler.SnailDispatcherRequestHandler; import com.aizuda.snailjob.client.common.rpc.supports.handler.UnaryRequestHandler; import com.aizuda.snailjob.common.core.constant.GrpcServerConstants; @@ -63,7 +64,7 @@ public class SnailGrpcServer implements Lifecycle { final MutableHandlerRegistry handlerRegistry = new MutableHandlerRegistry(); addServices(handlerRegistry, new GrpcInterceptor()); - NettyServerBuilder builder = NettyServerBuilder.forPort(snailJobProperties.getPort()) + NettyServerBuilder builder = NettyServerBuilder.forPort(GrpcChannel.getClientPort()) .executor(createGrpcExecutor(grpc.getDispatcherTp())); Duration keepAliveTime = grpc.getKeepAliveTime(); diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/server/SnailNettyHttpServer.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/server/SnailNettyHttpServer.java index 155b66532..ae085a2b0 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/server/SnailNettyHttpServer.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/server/SnailNettyHttpServer.java @@ -4,6 +4,7 @@ import com.aizuda.snailjob.client.common.Lifecycle; import com.aizuda.snailjob.client.common.config.SnailJobProperties; import com.aizuda.snailjob.client.common.event.SnailServerStartFailedEvent; import com.aizuda.snailjob.client.common.exception.SnailJobClientException; +import com.aizuda.snailjob.client.common.rpc.client.NettyChannel; import com.aizuda.snailjob.client.common.rpc.supports.handler.NettyHttpServerHandler; import com.aizuda.snailjob.client.common.rpc.supports.handler.SnailDispatcherRequestHandler; import com.aizuda.snailjob.common.core.context.SnailSpringContext; @@ -32,7 +33,7 @@ import org.springframework.stereotype.Component; * @date : 2024-04-12 23:03 * @since 3.3.0 */ -//@Component +@Component @Order(Ordered.HIGHEST_PRECEDENCE) @RequiredArgsConstructor @Getter @@ -70,7 +71,7 @@ public class SnailNettyHttpServer implements Runnable, Lifecycle { }); // 在特定端口绑定并启动服务器 默认是1789 - ChannelFuture future = bootstrap.bind(snailJobProperties.getPort()).sync(); + ChannelFuture future = bootstrap.bind(NettyChannel.getClientPort()).sync(); SnailJobLog.LOCAL.info("------> snail-job client remoting server start success, nettype = {}, port = {}", SnailNettyHttpServer.class.getName(), snailJobProperties.getPort());