From b371a092cf165a472878efeb57701b2e0fe23fea Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sat, 6 Jul 2024 23:27:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta2):=20=E5=8F=98=E6=9B=B4Net?= =?UTF-8?q?tyResult=E7=9A=84requestId->=20reqId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/common/log/report/ReportLogListener.java | 2 +- .../common/rpc/client/NettyHttpClientHandler.java | 4 ++-- .../handler/SnailDispatcherRequestHandler.java | 2 +- .../job/core/executor/JobExecutorFutureCallback.java | 3 +-- .../snailjob/client/core/report/ReportListener.java | 2 +- .../aizuda/snailjob/common/core/model/NettyResult.java | 10 +++++----- .../common/rpc/client/NettyHttpClientHandler.java | 2 +- .../task/support/dispatch/WorkflowExecutorActor.java | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/log/report/ReportLogListener.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/log/report/ReportLogListener.java index e747f092..944ee5ff 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/log/report/ReportLogListener.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/log/report/ReportLogListener.java @@ -22,7 +22,7 @@ public class ReportLogListener implements Listener { private static final NettyClient CLIENT = RequestBuilder.newBuilder() .client(NettyClient.class) - .callback(nettyResult -> SnailJobLog.LOCAL.info("Data report log successfully requestId:[{}]", nettyResult.getRequestId())).build(); + .callback(nettyResult -> SnailJobLog.LOCAL.info("Data report log successfully requestId:[{}]", nettyResult.getReqId())).build(); @Override public void handler(List list) { diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyHttpClientHandler.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyHttpClientHandler.java index 7e669102..51e92655 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyHttpClientHandler.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/NettyHttpClientHandler.java @@ -36,7 +36,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandlernewBuilder() .client(NettyClient.class) .callback( - nettyResult -> SnailJobLog.LOCAL.debug("heartbeat check requestId:[{}]", nettyResult.getRequestId())) + nettyResult -> SnailJobLog.LOCAL.debug("heartbeat check requestId:[{}]", nettyResult.getReqId())) .build(); this.nettyHttpConnectClient = nettyHttpConnectClient; @@ -51,7 +51,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler sendMessage(nettyResult.getMessage()); } SnailJobLog.LOCAL.debug("Job execute result report successfully requestId:[{}]", - nettyResult.getRequestId()); + nettyResult.getReqId()); }).build(); private final JobContext jobContext; diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java index bc0847ac..7dcdbe6c 100644 --- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java +++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java @@ -54,7 +54,7 @@ public class ReportListener implements Listener { private static final NettyClient CLIENT = RequestBuilder.newBuilder() .client(NettyClient.class) - .callback(nettyResult -> SnailJobLog.LOCAL.info("Data report successfully requestId:[{}]", nettyResult.getRequestId())).build(); + .callback(nettyResult -> SnailJobLog.LOCAL.info("Data report successfully requestId:[{}]", nettyResult.getReqId())).build(); @Override public void handler(List list) { diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/model/NettyResult.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/model/NettyResult.java index 46d6d166..5901624f 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/model/NettyResult.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/model/NettyResult.java @@ -13,18 +13,18 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class NettyResult extends Result { - private long requestId; + private long reqId; - public NettyResult(int status, String message, Object data, long requestId) { + public NettyResult(int status, String message, Object data, long reqId) { super(status, message, data); - this.requestId = requestId; + this.reqId = reqId; } public NettyResult() { } - public NettyResult(Object data, long requestId) { + public NettyResult(Object data, long reqId) { super(data); - this.requestId = requestId; + this.reqId = reqId; } } diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyHttpClientHandler.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyHttpClientHandler.java index 2e0110d8..ca83a406 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyHttpClientHandler.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyHttpClientHandler.java @@ -33,7 +33,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler