From 7db7f83d932248ced43fdc558ef52c84cf950188 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Thu, 27 Jun 2024 18:37:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta2):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=AE=BF=E9=97=AE=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E6=88=90post?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snailjob/client/common/NettyClient.java | 16 +++++++++-- .../client/common/client/NettyClient.java | 28 ------------------- .../common/log/report/ReportLogListener.java | 2 +- .../client/job/core/dto/ShardingJobArgs.java | 1 - .../client/core/report/ReportListener.java | 2 +- .../client/core/report/SyncReport.java | 2 +- .../handler/BeatHttpRequestHandler.java | 2 +- .../handler/ConfigHttpRequestHandler.java | 2 +- 8 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/client/NettyClient.java diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/NettyClient.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/NettyClient.java index 70a1ab8b..afc5a28a 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/NettyClient.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/NettyClient.java @@ -3,7 +3,12 @@ package com.aizuda.snailjob.client.common; import com.aizuda.snailjob.client.common.annotation.Mapping; import com.aizuda.snailjob.client.common.rpc.client.RequestMethod; import com.aizuda.snailjob.common.core.constant.SystemConstants.HTTP_PATH; +import com.aizuda.snailjob.common.core.model.NettyResult; import com.aizuda.snailjob.common.core.model.Result; +import com.aizuda.snailjob.server.model.dto.LogTaskDTO; +import com.aizuda.snailjob.server.model.dto.RetryTaskDTO; + +import java.util.List; /** @@ -15,11 +20,16 @@ import com.aizuda.snailjob.common.core.model.Result; */ public interface NettyClient { - @Mapping(method = RequestMethod.GET, path = HTTP_PATH.SYNC_CONFIG) + @Mapping(method = RequestMethod.POST, path = HTTP_PATH.BATCH_REPORT) + NettyResult reportRetryInfo(List list); + + @Mapping(method = RequestMethod.POST, path = HTTP_PATH.BATCH_LOG_REPORT) + NettyResult reportLogTask(List list); + + @Mapping(method = RequestMethod.POST, path = HTTP_PATH.SYNC_CONFIG) Result syncRemoteConfig(); - @Mapping(method = RequestMethod.GET, path = HTTP_PATH.BEAT) + @Mapping(method = RequestMethod.POST, path = HTTP_PATH.BEAT) Result beat(String mark); - } diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/client/NettyClient.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/client/NettyClient.java deleted file mode 100644 index db1ba954..00000000 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/client/NettyClient.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.aizuda.snailjob.client.common.client; - -import com.aizuda.snailjob.client.common.annotation.Mapping; -import com.aizuda.snailjob.client.common.rpc.client.RequestMethod; -import com.aizuda.snailjob.common.core.constant.SystemConstants.HTTP_PATH; -import com.aizuda.snailjob.common.core.model.NettyResult; -import com.aizuda.snailjob.server.model.dto.LogTaskDTO; -import com.aizuda.snailjob.server.model.dto.RetryTaskDTO; - -import java.util.List; - - -/** - * netty 客户端请求类 - * - * @author: opensnail - * @date : 2023-05-11 21:28 - * @since 1.3.0 - */ -public interface NettyClient { - - @Mapping(method = RequestMethod.POST, path = HTTP_PATH.BATCH_REPORT) - NettyResult reportRetryInfo(List list); - - @Mapping(method = RequestMethod.POST, path = HTTP_PATH.BATCH_LOG_REPORT) - NettyResult reportLogTask(List list); - -} 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 37870363..e747f092 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 @@ -1,6 +1,6 @@ package com.aizuda.snailjob.client.common.log.report; -import com.aizuda.snailjob.client.common.client.NettyClient; +import com.aizuda.snailjob.client.common.NettyClient; import com.aizuda.snailjob.client.common.rpc.client.RequestBuilder; import com.aizuda.snailjob.common.core.model.NettyResult; import com.aizuda.snailjob.common.core.window.Listener; diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/ShardingJobArgs.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/ShardingJobArgs.java index 4413f001..cbd27159 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/ShardingJobArgs.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/ShardingJobArgs.java @@ -16,5 +16,4 @@ public class ShardingJobArgs extends JobArgs { private Integer shardingIndex; - } 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 8658957e..bc0847ac 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 @@ -1,7 +1,7 @@ package com.aizuda.snailjob.client.core.report; +import com.aizuda.snailjob.client.common.NettyClient; import com.aizuda.snailjob.client.common.cache.GroupVersionCache; -import com.aizuda.snailjob.client.common.client.NettyClient; import com.aizuda.snailjob.client.common.config.SnailJobProperties; import com.aizuda.snailjob.client.common.rpc.client.RequestBuilder; import com.aizuda.snailjob.client.core.RetryExecutor; diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/SyncReport.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/SyncReport.java index a9a6c7f3..e1fc0f09 100644 --- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/SyncReport.java +++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/SyncReport.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.client.core.report; +import com.aizuda.snailjob.client.common.NettyClient; import com.aizuda.snailjob.client.common.cache.GroupVersionCache; -import com.aizuda.snailjob.client.common.client.NettyClient; import com.aizuda.snailjob.client.common.config.SnailJobProperties; import com.aizuda.snailjob.client.common.rpc.client.RequestBuilder; import com.aizuda.snailjob.client.core.retryer.RetryerInfo; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/BeatHttpRequestHandler.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/BeatHttpRequestHandler.java index d8804d80..7929e712 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/BeatHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/BeatHttpRequestHandler.java @@ -30,7 +30,7 @@ public class BeatHttpRequestHandler extends GetHttpRequestHandler { @Override public HttpMethod method() { - return HttpMethod.GET; + return HttpMethod.POST; } @Override diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ConfigHttpRequestHandler.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ConfigHttpRequestHandler.java index da83a474..f49e843d 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ConfigHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ConfigHttpRequestHandler.java @@ -31,7 +31,7 @@ public class ConfigHttpRequestHandler extends GetHttpRequestHandler { @Override public HttpMethod method() { - return HttpMethod.GET; + return HttpMethod.POST; } @Override