提交 30027566 authored 作者: wangqiang's avatar wangqiang

客户端优化

上级 2f7cf16c
......@@ -109,8 +109,8 @@ public class ProgramController {
@GetMapping(value = "{type}/list")
public R<Page<Map<String, String>>> list(@PathVariable @Pattern(regexp = "install|upgrade") String type,
@RequestParam(required = false, defaultValue = "1") Integer current,
@RequestParam(required = false, defaultValue = "10") Integer size)
throws IOException {
@RequestParam(required = false, defaultValue = "10") Integer size) {
try {
String mac = MacAddrUtil.get();
if (StrUtil.isBlank(mac)) return R.error("未获取到MAC地址");
String url = gateway + StrUtil.format(type.equals("install") ? installUrl : upgradeUrl, mac, current, size);
......@@ -156,6 +156,10 @@ public class ProgramController {
})
.collect(Collectors.toList());
return R.success(page.setRecords(list));
} catch (IOException e) {
log.error("客户端系统异常", e);
return R.error("客户端正在初始化,请稍后再试!");
}
}
private static final Set<String> SET = new ConcurrentHashSet<>();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论