|
@@ -271,14 +271,8 @@ public class SceneDownloadHandlerServiceImpl {
|
|
|
Callable<Boolean> call = new Callable() {
|
|
|
@Override
|
|
|
public Boolean call() throws Exception {
|
|
|
- try {
|
|
|
- zipOssFilesHandler(out, num, count, total, resolution,
|
|
|
- imagesVersion, cacheKeys,filePath, imageNumPath);
|
|
|
- }catch (Exception e){
|
|
|
- log.error("下载失败", e);
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
+ zipOssFilesHandler(out, num, count, total, resolution,
|
|
|
+ imagesVersion, cacheKeys,filePath, imageNumPath);
|
|
|
return true;
|
|
|
}
|
|
|
};
|
|
@@ -500,13 +494,7 @@ public class SceneDownloadHandlerServiceImpl {
|
|
|
|
|
|
zipBytes(out, prefix + key, content.getBytes());
|
|
|
}else{
|
|
|
- try {
|
|
|
- zipBytes(out, prefix + key, FileUtils.getBytesFromUrl(url));
|
|
|
- }catch (Exception e){
|
|
|
- log.error("获取字节数据出错,url:{}", url);
|
|
|
- }catch (OutOfMemoryError e){
|
|
|
- log.error("获取字节数据出错,url:{}", url);
|
|
|
- }
|
|
|
+ zipBytes(out, prefix + key, FileUtils.getBytesFromUrl(url));
|
|
|
}
|
|
|
}
|
|
|
|