BUGFIX: 隐藏加载不出minio的相关数据;
This commit is contained in:
@@ -40,4 +40,6 @@ public class CollectionElementVO {
|
|||||||
|
|
||||||
private String urlWithWhiteSide;
|
private String urlWithWhiteSide;
|
||||||
|
|
||||||
|
private String originalUrl;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -126,12 +126,13 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
|
|||||||
List<CollectionElementVO> moodBoards = CopyUtil.copyList(v, CollectionElementVO.class, (o, d) -> {
|
List<CollectionElementVO> moodBoards = CopyUtil.copyList(v, CollectionElementVO.class, (o, d) -> {
|
||||||
d.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
|
d.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
|
||||||
String url = o.getUrl();
|
String url = o.getUrl();
|
||||||
|
d.setOriginalUrl(url);
|
||||||
if (minioUtil.doesObjectExist(url)) {
|
if (minioUtil.doesObjectExist(url)) {
|
||||||
d.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
|
d.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
response.setMoodBoards(moodBoards.stream()
|
response.setMoodBoards(moodBoards.stream()
|
||||||
.filter(d -> minioUtil.doesObjectExist(d.getUrl()))
|
.filter(d -> minioUtil.doesObjectExist(d.getOriginalUrl()))
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -140,12 +141,13 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
|
|||||||
d.setIsPin(o.getHasPin());
|
d.setIsPin(o.getHasPin());
|
||||||
d.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
|
d.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
|
||||||
String url = o.getUrl();
|
String url = o.getUrl();
|
||||||
|
d.setOriginalUrl(url);
|
||||||
if (minioUtil.doesObjectExist(url)) {
|
if (minioUtil.doesObjectExist(url)) {
|
||||||
d.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
|
d.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
response.setPrintBoards(printBoards.stream()
|
response.setPrintBoards(printBoards.stream()
|
||||||
.filter(d -> minioUtil.doesObjectExist(d.getUrl()))
|
.filter(d -> minioUtil.doesObjectExist(d.getOriginalUrl()))
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -154,6 +156,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
|
|||||||
d.setIsPin(o.getHasPin());
|
d.setIsPin(o.getHasPin());
|
||||||
d.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
|
d.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
|
||||||
String url = o.getUrl();
|
String url = o.getUrl();
|
||||||
|
d.setOriginalUrl(url);
|
||||||
if (minioUtil.doesObjectExist(url)) {
|
if (minioUtil.doesObjectExist(url)) {
|
||||||
d.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
|
d.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
|
||||||
if (url.contains(".")) {
|
if (url.contains(".")) {
|
||||||
@@ -165,7 +168,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
response.setSketchBoards(sketchBoards.stream()
|
response.setSketchBoards(sketchBoards.stream()
|
||||||
.filter(d -> minioUtil.doesObjectExist(d.getUrl()))
|
.filter(d -> minioUtil.doesObjectExist(d.getOriginalUrl()))
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user