From 05d024bf117ea98fef8205de7a131f1a376e60c3 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Sun, 21 Jan 2024 18:29:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=202.6.0=201.=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=94=AF=E6=8C=81=E9=87=8D=E8=AF=95=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../retry/server/common/client/RpcClientInvokeHandler.java    | 4 ++--
 .../job/task/support/executor/job/RequestClientActor.java     | 4 +++-
 frontend/src/views/job/form/JobForm.vue                       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/client/RpcClientInvokeHandler.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/client/RpcClientInvokeHandler.java
index a2755cb1..2022be7e 100644
--- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/client/RpcClientInvokeHandler.java
+++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/client/RpcClientInvokeHandler.java
@@ -214,8 +214,8 @@ public class RpcClientInvokeHandler implements InvocationHandler {
     private Retryer<Result> buildResultRetryer() {
         Retryer<Result> retryer = RetryerBuilder.<Result>newBuilder()
             .retryIfException(throwable -> failRetry)
-            .withStopStrategy(StopStrategies.stopAfterAttempt(retryTimes))
-            .withWaitStrategy(WaitStrategies.fixedWait(retryInterval, TimeUnit.SECONDS))
+            .withStopStrategy(StopStrategies.stopAfterAttempt(retryTimes <= 0 ? 1 : retryTimes))
+            .withWaitStrategy(WaitStrategies.fixedWait(Math.max(retryInterval, 0), TimeUnit.SECONDS))
             .withRetryListener(retryListener)
             .build();
         return retryer;
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/RequestClientActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/RequestClientActor.java
index 24fcc1ba..ff4c2fea 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/RequestClientActor.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/job/RequestClientActor.java
@@ -124,10 +124,12 @@ public class RequestClientActor extends AbstractActor {
     }
 
     private JobRpcClient buildRpcClient(RegisterNodeInfo registerNodeInfo, RealJobExecutorDTO realJobExecutorDTO) {
+
+       int maxRetryTimes = realJobExecutorDTO.getMaxRetryTimes();
         return RequestBuilder.<JobRpcClient, Result>newBuilder()
                 .nodeInfo(registerNodeInfo)
                 .namespaceId(registerNodeInfo.getNamespaceId())
-                .failRetry(Boolean.TRUE)
+                .failRetry(maxRetryTimes > 0)
                 .retryTimes(realJobExecutorDTO.getMaxRetryTimes())
                 .retryInterval(realJobExecutorDTO.getRetryInterval())
                 .retryListener(new JobExecutorRetryListener(realJobExecutorDTO))
diff --git a/frontend/src/views/job/form/JobForm.vue b/frontend/src/views/job/form/JobForm.vue
index fed66469..a65fbb7c 100644
--- a/frontend/src/views/job/form/JobForm.vue
+++ b/frontend/src/views/job/form/JobForm.vue
@@ -210,7 +210,7 @@
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item label="最大重试次数">
               <a-input-number
-                :min="1"
+                :min="0"
                 v-decorator="[
                   'maxRetryTimes',
                   {