|
|
|
@ -66,8 +66,12 @@ public class SysOssServiceImpl implements ISysOssService {
|
|
|
|
|
for (Long id : ossIds) {
|
|
|
|
|
SysOssVo vo = getById(id);
|
|
|
|
|
if (ObjectUtil.isNotNull(vo)) {
|
|
|
|
|
try {
|
|
|
|
|
list.add(this.matchingUrl(vo));
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception ignored) {
|
|
|
|
|
// 如果oss异常无法连接则将数据直接返回
|
|
|
|
|
list.add(vo);
|
|
|
|
|
} }
|
|
|
|
|
}
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
@ -79,6 +83,12 @@ public class SysOssServiceImpl implements ISysOssService {
|
|
|
|
|
SysOssVo vo = SpringUtils.getAopProxy(this).getById(id);
|
|
|
|
|
if (ObjectUtil.isNotNull(vo)) {
|
|
|
|
|
list.add(this.matchingUrl(vo).getUrl());
|
|
|
|
|
try {
|
|
|
|
|
list.add(this.matchingUrl(vo).getUrl());
|
|
|
|
|
} catch (Exception ignored) {
|
|
|
|
|
// 如果oss异常无法连接则将数据直接返回
|
|
|
|
|
list.add(vo.getUrl());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return String.join(StringUtils.SEPARATOR, list);
|
|
|
|
|