GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 2.0.0

Browse Source 
1. 去除回调重试流量标识
2. 优化日志信息
This commit is contained in:
byteblogs168 2023-06-16 18:09:06 +08:00
parent 3e52fcf5a8
commit 947e419299
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/HeaderAspect.java
View File

@ -33,7 +33,7 @@ public class HeaderAspect {
// 标记进入方法的时间 // 标记进入方法的时间
RetrySiteSnapshot.setEntryMethodTime(System.currentTimeMillis()); 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)); RetrySiteSnapshot.setRetryHeader(JsonUtil.parseObject(xRetry, EasyRetryHeaders.class));
} }
} }

9
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java
View File

@ -121,14 +121,7 @@ public class ExecCallbackUnitActor extends AbstractActor {
retryCallbackDTO.setExecutorName(retryTask.getExecutorName()); retryCallbackDTO.setExecutorName(retryTask.getExecutorName());
retryCallbackDTO.setUniqueId(retryTask.getUniqueId()); retryCallbackDTO.setUniqueId(retryTask.getUniqueId());
// 设置header HttpEntity<RetryCallbackDTO> requestEntity = new HttpEntity<>(retryCallbackDTO);
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<RetryCallbackDTO> requestEntity = new HttpEntity<>(retryCallbackDTO, requestHeaders);
String format = MessageFormat.format(URL, serverNode.getHostIp(), serverNode.getHostPort().toString(), serverNode.getContextPath()); String format = MessageFormat.format(URL, serverNode.getHostIp(), serverNode.getHostPort().toString(), serverNode.getContextPath());
Result result = restTemplate.postForObject(format, requestEntity, Result.class); Result result = restTemplate.postForObject(format, requestEntity, Result.class);

2
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java
View File

@ -142,7 +142,7 @@ public class ExecUnitActor extends AbstractActor {
String format = MessageFormat.format(URL, serverNode.getHostIp(), serverNode.getHostPort().toString(), serverNode.getContextPath()); String format = MessageFormat.format(URL, serverNode.getHostIp(), serverNode.getHostPort().toString(), serverNode.getContextPath());
Result<DispatchRetryResultDTO> result = restTemplate.postForObject(format, requestEntity, Result.class); Result<DispatchRetryResultDTO> 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; return result;
} }