Merge branch 'release-热点切图竖向图切成横向图问题' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -183,9 +183,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             Map<String, String> uploadMap = new HashMap<>();
 
             //切图
-//            String fragmentCmd = "docker run --rm --security-opt seccomp=unconfined --pids-limit=4096 -v /mnt:/mnt vips:8.15.1 vips copy " + origFilePath + "[autorot] " +workPath;
-//            String fragmentCmd = "docker run --rm --security-opt seccomp=unconfined --pids-limit=4096 -v /mnt:/mnt vips:8.15.1 vips dzsave --tile-size "  + tileSize + " " + origFilePath + "[autorot] " +  workPath;
-//            String fragmentCmd = "vips dzsave " + origFilePath + "[autorot] " + workPath + " --tile-size " + tileSize + " --strip";
             String tempFilePath = workPath + "/temp_rotated.v";
             String autorotCmd = "docker run --rm --security-opt seccomp=unconfined --pids-limit=4096 -v /mnt:/mnt vips:8.15.1 vips autorot " + origFilePath + " " + tempFilePath;
             CmdUtils.callLine(autorotCmd);
@@ -229,9 +226,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             fYunFileService.uploadFile(origFilePath, ossPath + sid + "." + extName);
 
         }finally {
-//            FileUtil.del(workPath);
-//            FileUtil.del(dziPath);
-//            FileUtil.del(outFilesPath);
+            FileUtil.del(workPath);
+            FileUtil.del(dziPath);
+            FileUtil.del(outFilesPath);
         }
 
         Map<String, Object> hw = new HashMap<>();
@@ -914,9 +911,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 sceneEditInfoService.upgradeSceneJsonVersion(num, sceneEditInfo.getVersion() + 1, sceneEditInfo.getImgVersion() + 1, bucket);
 
                 sceneAsynOperLog.setState(CommonOperStatus.SUCCESS.code());
-
-//                FileUtil.del(path);
-
             } catch (Exception e) {
                 log.error("上传dam模型,num:" + num, e);
                 sceneAsynOperLog.setState(CommonOperStatus.FAILD.code());
@@ -1068,9 +1062,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 sceneEditInfoService.upgradeSceneJsonVersion(num, sceneEditInfo.getVersion() + 1, sceneEditInfo.getImgVersion() + 1, bucket);
 
                 sceneAsynOperLog.setState(CommonOperStatus.SUCCESS.code());
-
-                FileUtil.del(path);
-
             } catch (Exception e) {
                 log.error("上传全景图报错,num:" + num, e);
                 sceneAsynOperLog.setState(CommonOperStatus.FAILD.code());