diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java index f118f27c..18a404bc 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java @@ -120,7 +120,10 @@ public interface SystemConstants { */ String RETRY_CALLBACK = "/retry/callback/v1"; - String GET_REG_NODES_AND_REFRESH = "/server/regAndRefresh/v1"; + /** + * 拉取注册的信息 + */ + String GET_REG_NODES_AND_REFRESH = "/pull/register/queue/v1"; /** * 获取重试幂等id diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/GrpcChannel.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/GrpcChannel.java index c8523480..4d1e7041 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/GrpcChannel.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/GrpcChannel.java @@ -42,7 +42,6 @@ import java.util.concurrent.TimeUnit; public class GrpcChannel { private GrpcChannel() { } - private static final String HOST_ID = IdUtil.getSnowflake().nextIdStr(); private static final ThreadPoolExecutor grpcExecutor = createGrpcExecutor(); private static ConcurrentHashMap, ManagedChannel> CHANNEL_MAP = new ConcurrentHashMap<>(16); @@ -79,7 +78,7 @@ public class GrpcChannel { return null; } } - headersMap.put(HeadersEnum.HOST_ID.getKey(), HOST_ID); + headersMap.put(HeadersEnum.HOST_ID.getKey(), ServerRegister.CURRENT_CID); headersMap.put(HeadersEnum.HOST_IP.getKey(), NetUtil.getLocalIpStr()); headersMap.put(HeadersEnum.GROUP_NAME.getKey(), ServerRegister.GROUP_NAME); headersMap.put(HeadersEnum.HOST_PORT.getKey(), getServerPort()); diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyChannel.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyChannel.java index eaecfc12..c0b47f91 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyChannel.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyChannel.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; @Slf4j public class NettyChannel { private static Bootstrap bootstrap; - private static final String HOST_ID = IdUtil.getSnowflake().nextIdStr(); private static ConcurrentHashMap, Channel> CHANNEL_MAP = new ConcurrentHashMap<>(16); private NettyChannel() { } @@ -85,7 +84,7 @@ public class NettyChannel { .set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE) // 设置传递请求内容的长度 .set(HttpHeaderNames.CONTENT_LENGTH, request.content().readableBytes()) - .set(HeadersEnum.HOST_ID.getKey(), HOST_ID) + .set(HeadersEnum.HOST_ID.getKey(), ServerRegister.CURRENT_CID) .set(HeadersEnum.HOST_IP.getKey(), NetUtil.getLocalIpStr()) .set(HeadersEnum.GROUP_NAME.getKey(), ServerRegister.GROUP_NAME) .set(HeadersEnum.HOST_PORT.getKey(), getServerPort()) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/server/ServerRpcClient.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/server/ServerRpcClient.java index 914c7b1e..1d20a396 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/server/ServerRpcClient.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/server/ServerRpcClient.java @@ -15,6 +15,6 @@ import static com.aizuda.snailjob.common.core.constant.SystemConstants.HTTP_PATH * @Filename:ServerRpcClient */ public interface ServerRpcClient { - @Mapping(path = GET_REG_NODES_AND_REFRESH, method = RequestMethod.GET) + @Mapping(path = GET_REG_NODES_AND_REFRESH, method = RequestMethod.POST) Result getRegNodesAndFlush(); } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/GetRegNodesPostHttpRequestHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/GetRegNodesPostHttpRequestHandler.java index 1ec4e5fe..86914ab7 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/GetRegNodesPostHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/GetRegNodesPostHttpRequestHandler.java @@ -36,7 +36,7 @@ public class GetRegNodesPostHttpRequestHandler extends GetHttpRequestHandler { @Override public HttpMethod method() { - return HttpMethod.GET; + return HttpMethod.POST; } @Override