|
@@ -442,7 +442,7 @@ public class SceneDownloadHandlerServiceImpl {
|
|
|
if(!"notNeadCut".equals(resolution)){
|
|
|
if((filePath.contains(imageNumPath + "panorama/") && filePath.contains("tiles/" + resolution))
|
|
|
|| filePath.contains(imageNumPath + "tiles/" + resolution + "/")) {
|
|
|
- this.processImage(filePath, out, resolution, imagesVersion, cacheKeys);
|
|
|
+ this.processImage(num, filePath, out, resolution, imagesVersion, cacheKeys);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
@@ -558,7 +558,7 @@ public class SceneDownloadHandlerServiceImpl {
|
|
|
this.zipBytes(out, getInfoKey, getInfo.toString().getBytes());
|
|
|
}
|
|
|
|
|
|
- private void processImage(String key, ZipOutputStream out, String resolution, int imagesVersion, Set<String> imgKeys) throws Exception{
|
|
|
+ private void processImage(String sceneNum, String key, ZipOutputStream out, String resolution, int imagesVersion, Set<String> imgKeys) throws Exception{
|
|
|
|
|
|
if(key.contains("x-oss-process") || key.endsWith("/")){
|
|
|
return;
|
|
@@ -615,7 +615,7 @@ public class SceneDownloadHandlerServiceImpl {
|
|
|
continue;
|
|
|
}
|
|
|
imgKeys.add(fky);
|
|
|
- fYunFileService.downloadFile(fky, "/home/backend/downloads/scenes/" + num + "/" + fky);
|
|
|
+ fYunFileService.downloadFile(fky, "/home/backend/downloads/scenes/" + sceneNum + "/" + fky);
|
|
|
// this.zipBytes(out, wwwroot + fky, FileUtils.getBytesFromUrl(url));
|
|
|
}
|
|
|
|