From 846eb8693fc7c096fae6e8f40690041faf3f8186 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Wed, 14 Jun 2023 16:10:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=202.0.0=201.=20=E4=BF=AE=E5=A4=8D=E5=9B=9E?=
 =?UTF-8?q?=E6=BB=9A=E4=B8=BB=E9=94=AE=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/RetryDeadLetterServiceImpl.java     | 1 +
 .../retry/server/support/handler/ServerNodeBalance.java     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryDeadLetterServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryDeadLetterServiceImpl.java
index e456ef4b0..c929452b6 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryDeadLetterServiceImpl.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryDeadLetterServiceImpl.java
@@ -89,6 +89,7 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
         retryTask.setNextTriggerAt(WaitStrategies.randomWait(1, TimeUnit.SECONDS, 60, TimeUnit.SECONDS).computeRetryTime(null));
         retryTask.setCreateDt(LocalDateTime.now());
         retryTask.setUpdateDt(LocalDateTime.now());
+        retryTask.setId(null);
         RequestDataHelper.setPartition(groupName);
         Assert.isTrue(1 == retryTaskMapper.insert(retryTask), () -> new EasyRetryServerException("新增重试任务失败"));
 
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ServerNodeBalance.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ServerNodeBalance.java
index acbc62f59..a53eead10 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ServerNodeBalance.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ServerNodeBalance.java
@@ -164,7 +164,7 @@ public class ServerNodeBalance implements Lifecycle, Runnable {
         try {
             TimeUnit.SECONDS.sleep(INITIAL_DELAY);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            Thread.currentThread().interrupt();
         }
 
         while (!Thread.currentThread().isInterrupted()) {
@@ -234,13 +234,15 @@ public class ServerNodeBalance implements Lifecycle, Runnable {
 
             } catch (InterruptedException e) {
                 LogUtils.error(log, "check balance interrupt");
+                Thread.currentThread().interrupt();
             } catch (Exception e) {
                 LogUtils.error(log, "check balance error", e);
             } finally {
                 try {
                     TimeUnit.SECONDS.sleep(1);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    LogUtils.error(log, "check balance interrupt");
+                    Thread.currentThread().interrupt();
                 }
             }
         }