diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/HeaderAspect.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/HeaderAspect.java index d6492aed..455ac257 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/HeaderAspect.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/HeaderAspect.java @@ -33,7 +33,7 @@ public class HeaderAspect { // 标记进入方法的时间 RetrySiteSnapshot.setEntryMethodTime(System.currentTimeMillis()); - LogUtils.info(log, "easy-retry 拦截器 xRetry:[{}]", xRetry); + LogUtils.info(log, "easy-retry 拦截器 easy-retry:[{}]", xRetry); RetrySiteSnapshot.setRetryHeader(JsonUtil.parseObject(xRetry, EasyRetryHeaders.class)); } } 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 b39ce30f..19d69c39 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 @@ -121,14 +121,7 @@ public class ExecCallbackUnitActor extends AbstractActor { retryCallbackDTO.setExecutorName(retryTask.getExecutorName()); retryCallbackDTO.setUniqueId(retryTask.getUniqueId()); - // 设置header - HttpHeaders requestHeaders = new HttpHeaders(); - EasyRetryHeaders easyRetryHeaders = new EasyRetryHeaders(); - easyRetryHeaders.setEasyRetry(Boolean.TRUE); - easyRetryHeaders.setEasyRetryId(retryTask.getUniqueId()); - requestHeaders.add(SystemConstants.EASY_RETRY_HEAD_KEY, JsonUtil.toJsonString(easyRetryHeaders)); - - HttpEntity requestEntity = new HttpEntity<>(retryCallbackDTO, requestHeaders); + HttpEntity requestEntity = new HttpEntity<>(retryCallbackDTO); String format = MessageFormat.format(URL, serverNode.getHostIp(), serverNode.getHostPort().toString(), serverNode.getContextPath()); Result result = restTemplate.postForObject(format, requestEntity, Result.class); 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 6ed30ae5..112af28b 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 @@ -142,7 +142,7 @@ public class ExecUnitActor extends AbstractActor { String format = MessageFormat.format(URL, serverNode.getHostIp(), serverNode.getHostPort().toString(), serverNode.getContextPath()); Result result = restTemplate.postForObject(format, requestEntity, Result.class); - LogUtils.info(log, "请求客户端 response:[{}}] ", JsonUtil.toJsonString(result)); + LogUtils.info(log, "请求客户端 format:[{}] response:[{}}] ", format, JsonUtil.toJsonString(result)); return result; }