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

feat: 3.1.0

Browse Source 
1. 修复版本和获取bucket网络请求异常
This commit is contained in:
byteblogs168 2024-03-08 10:14:20 +08:00
parent 6f36541714
commit 3607e29c4c
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/handler/ConfigVersionSyncHandler.java
View File

@ -38,6 +38,7 @@ public class ConfigVersionSyncHandler implements Lifecycle, Runnable {
private RestTemplate restTemplate; private RestTemplate restTemplate;
@Autowired @Autowired
protected AccessTemplate accessTemplate; 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(), String url = NetUtil.getUrl(registerNodeInfo.getHostIp(), registerNodeInfo.getHostPort(),
registerNodeInfo.getContextPath()); 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); EasyRetryLog.LOCAL.info("同步结果 [{}]", result);
} }
} catch (Exception e) { } catch (Exception e) {

21
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
View File

@ -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.Page;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -56,19 +57,13 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
@Slf4j @Slf4j
@RequiredArgsConstructor
public class DashBoardServiceImpl implements DashBoardService { public class DashBoardServiceImpl implements DashBoardService {
private final ServerNodeMapper serverNodeMapper;
@Autowired private final RestTemplate restTemplate;
private ServerNodeMapper serverNodeMapper; private final JobSummaryMapper jobSummaryMapper;
private final RetrySummaryMapper retrySummaryMapper;
@Autowired private static final String DASHBOARD_CONSUMER_BUCKET = "/dashboard/consumer/bucket";
private RestTemplate restTemplate;
@Autowired
private JobSummaryMapper jobSummaryMapper;
@Autowired
private RetrySummaryMapper retrySummaryMapper;
@Override @Override
public DashboardCardResponseVO taskRetryJob() { public DashboardCardResponseVO taskRetryJob() {
@ -207,7 +202,7 @@ public class DashBoardServiceImpl implements DashBoardService {
try { try {
// 从远程节点取 // 从远程节点取
String url = NetUtil.getUrl(serverNodeResponseVO.getHostIp(), serverNodeExtAttrs.getWebPort(), serverNodeResponseVO.getContextPath()); String url = NetUtil.getUrl(serverNodeResponseVO.getHostIp(), serverNodeExtAttrs.getWebPort(), serverNodeResponseVO.getContextPath());
Result<List<Integer>> result = restTemplate.getForObject(url, Result.class); Result<List<Integer>> result = restTemplate.getForObject(url.concat(DASHBOARD_CONSUMER_BUCKET), Result.class);
List<Integer> data = result.getData(); List<Integer> data = result.getData();
if (!CollectionUtils.isEmpty(data)) { if (!CollectionUtils.isEmpty(data)) {
serverNodeResponseVO.setConsumerBuckets(data.stream() serverNodeResponseVO.setConsumerBuckets(data.stream()