From 3607e29c4c63dc47be67f8eed6a333b6ba03a704 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Fri, 8 Mar 2024 10:14:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=203.1.0=201.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=92=8C=E8=8E=B7=E5=8F=96bucket=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E8=AF=B7=E6=B1=82=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/ConfigVersionSyncHandler.java | 3 ++- .../service/impl/DashBoardServiceImpl.java | 21 +++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/handler/ConfigVersionSyncHandler.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/handler/ConfigVersionSyncHandler.java index 6af9f1a8..bee36ceb 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/handler/ConfigVersionSyncHandler.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/handler/ConfigVersionSyncHandler.java @@ -38,6 +38,7 @@ public class ConfigVersionSyncHandler implements Lifecycle, Runnable { private RestTemplate restTemplate; @Autowired protected AccessTemplate accessTemplate; + private static final String SYNC_VERSION_V1 = "/retry/sync/version/v1"; /** * 添加任务 @@ -71,7 +72,7 @@ public class ConfigVersionSyncHandler implements Lifecycle, Runnable { String url = NetUtil.getUrl(registerNodeInfo.getHostIp(), registerNodeInfo.getHostPort(), registerNodeInfo.getContextPath()); - Result result = restTemplate.postForObject(url, configDTO, Result.class); + Result result = restTemplate.postForObject(url.concat(SYNC_VERSION_V1), configDTO, Result.class); EasyRetryLog.LOCAL.info("同步结果 [{}]", result); } } catch (Exception e) { diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java index 4ad112cd..eaf85b37 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java @@ -35,6 +35,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.google.common.collect.Lists; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -56,19 +57,13 @@ import java.util.stream.Collectors; */ @Service @Slf4j +@RequiredArgsConstructor public class DashBoardServiceImpl implements DashBoardService { - - @Autowired - private ServerNodeMapper serverNodeMapper; - - @Autowired - private RestTemplate restTemplate; - - @Autowired - private JobSummaryMapper jobSummaryMapper; - - @Autowired - private RetrySummaryMapper retrySummaryMapper; + private final ServerNodeMapper serverNodeMapper; + private final RestTemplate restTemplate; + private final JobSummaryMapper jobSummaryMapper; + private final RetrySummaryMapper retrySummaryMapper; + private static final String DASHBOARD_CONSUMER_BUCKET = "/dashboard/consumer/bucket"; @Override public DashboardCardResponseVO taskRetryJob() { @@ -207,7 +202,7 @@ public class DashBoardServiceImpl implements DashBoardService { try { // 从远程节点取 String url = NetUtil.getUrl(serverNodeResponseVO.getHostIp(), serverNodeExtAttrs.getWebPort(), serverNodeResponseVO.getContextPath()); - Result> result = restTemplate.getForObject(url, Result.class); + Result> result = restTemplate.getForObject(url.concat(DASHBOARD_CONSUMER_BUCKET), Result.class); List data = result.getData(); if (!CollectionUtils.isEmpty(data)) { serverNodeResponseVO.setConsumerBuckets(data.stream()