From 8d20bade33a12e409ca9c7128a9d33443f3460b4 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Fri, 28 Jul 2023 18:24:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=202.1.0=201.=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=92=8C=E9=87=8D=E8=AF=95=E6=89=A7=E8=A1=8C?=
=?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../actor/exec/ExecCallbackUnitActor.java | 13 ++++++++-----
.../dispatch/actor/exec/ExecUnitActor.java | 16 ++++++++++++----
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java
index 61f19767..472a51ff 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java
@@ -77,12 +77,15 @@ public class ExecCallbackUnitActor extends AbstractActor {
retryExecutor.call((Callable<Result<Void>>) () -> {
Result<Void> result = callClient(retryTask, serverNode);
- if (StatusEnum.YES.getStatus() != result.getStatus() && StringUtils.isNotBlank(result.getMessage())) {
- retryTaskLog.setMessage(result.getMessage());
- } else {
- retryTaskLog.setMessage("调度成功");
+ String message = "回调客户端成功";
+ if (StatusEnum.YES.getStatus() != result.getStatus()) {
+ if (StringUtils.isNotBlank(result.getMessage())) {
+ message = result.getMessage();
+ } else {
+ message = "回调客户端失败: 异常信息为空";
+ }
}
-
+ retryTaskLog.setMessage(message);
return result;
});
if (context.hasException()) {
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java
index 2cb96fa2..cd7e540c 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java
@@ -73,18 +73,26 @@ public class ExecUnitActor extends AbstractActor {
Result<DispatchRetryResultDTO> result = callClient(retryTask, serverNode);
// 回调接口请求成功，处理返回值
- if (StatusEnum.YES.getStatus() != result.getStatus() && StringUtils.isNotBlank(result.getMessage())) {
- retryTaskLog.setMessage(result.getMessage());
+ if (StatusEnum.YES.getStatus() != result.getStatus()) {
+ if (StringUtils.isNotBlank(result.getMessage())) {
+ retryTaskLog.setMessage(result.getMessage());
+ } else {
+ retryTaskLog.setMessage("客户端执行失败: 异常信息为空");
+ }
} else {
DispatchRetryResultDTO data = JsonUtil.parseObject(JsonUtil.toJsonString(result.getData()), DispatchRetryResultDTO.class);
result.setData(data);
if (Objects.nonNull(data)) {
if (RetryResultStatusEnum.FAILURE.getStatus().equals(data.getStatusCode())) {
- retryTaskLog.setMessage(String.valueOf(data.getExceptionMsg()));
+ if (StringUtils.isNotBlank(data.getExceptionMsg())) {
+ retryTaskLog.setMessage(data.getExceptionMsg());
+ } else {
+ retryTaskLog.setMessage("客户端重试失败: 异常信息为空");
+ }
} else if (RetryResultStatusEnum.STOP.getStatus().equals(data.getStatusCode())) {
retryTaskLog.setMessage("客户端主动停止任务");
} else {
- retryTaskLog.setMessage("调度成功");
+ retryTaskLog.setMessage("客户端执行成功");
}
}