取消读取mnt目录的配置类

src/main/java/com/fdkankan/scene/oss/OssUtil.java

@@ -13,6 +13,7 @@ import org.springframework.util.Base64Utils;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystemException;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
@@ -365,7 +366,7 @@ public class OssUtil {
     }
 
 
-    public void deleteObject(String keyName) {
+    public void deleteObject(String keyName) throws FileSystemException {
         if (FdkkLaserConfig.isBucket()) {
             if (FdkkLaserConfig.isLocalization()) {
                 minioOssTemplate.deleteObject(keyName);

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

@@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileSystemException;
 import java.util.*;
 
 /**
@@ -194,7 +195,11 @@ public class BoxModelServiceImpl implements IBoxModelService {
             //删除资源文件
             if(CollUtil.isNotEmpty(deleteFile))
                 deleteFile.stream().forEach(key -> {
-                    ossUtil.deleteObject(key);
+                    try{
+                        ossUtil.deleteObject(key);
+                    }catch (FileSystemException e){
+
+                    }
                 });
         }else{
             //更新

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

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.vo.SceneAsynOperLogParamVO;
 import com.fdkankan.web.response.ResultData;
 import java.io.IOException;
+import java.nio.file.FileSystemException;
 import java.util.Calendar;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -105,7 +106,11 @@ public class SceneAsynOperLogServiceImpl extends ServiceImpl<ISceneAsynOperLogMa
 
         deleteList.parallelStream().forEach(item -> {
             if(StrUtil.isNotEmpty(item.getUrl())){
-                ossUtil.deleteObject(item.getUrl());
+                try{
+                    ossUtil.deleteObject(item.getUrl());
+                }catch (FileSystemException e){
+
+                }
             }
         });
 

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

@@ -3,6 +3,7 @@ package com.fdkankan.scene.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -42,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystemException;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -210,7 +212,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
 
         //发布马赛克列表
-//        sceneJson.setMosaicList(this.getMosaicList(num));
+        sceneJson.setMosaicList(this.getMosaicList(num));
 
         //处理热点数据，生成hot.json
         this.publicHotData(num, sceneEditInfo, bucket);
@@ -237,7 +239,13 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         //删除发布数据中的user目录
         String publicUserPath = String.format(UploadFilePath.USER_VIEW_PATH, num);
-        ossUtil.deleteObject(publicUserPath);
+        try{
+            ossUtil.deleteObject(publicUserPath);
+        }catch (IORuntimeException e){
+            if (e.getMessage().contains("另一个程序正在使用此文件，进程无法访问")){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_5071);
+            }
+        }
 
         //复制编辑目录到发布目录
         String editPath = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum());
@@ -1918,7 +1926,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //删除oss文件
         String imgEditPath = String.format(UploadFilePath.IMG_EDIT_PATH, num);
         thumbNameList.stream().forEach(thumbName->{
-            ossUtil.deleteObject(imgEditPath + "panorama_edit/" + thumbName);
+            try{
+                ossUtil.deleteObject(imgEditPath + "panorama_edit/" + thumbName);
+            }catch (FileSystemException e){
+
+            }
         });
 
     }

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

@@ -305,6 +305,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         //生成编辑显示控制表
         SceneEditControls sceneEditControls = new SceneEditControls();
         sceneEditControls.setEditInfoId(sceneEditInfo.getId());
+        sceneEditControls.setShowMap(0);
         sceneEditControlsService.save(sceneEditControls);
         sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
 

src/main/resources/application-standAloneProd.yml

@@ -107,12 +107,12 @@ download:
     exe-name: start-browser.bat
     exe-content: | # | 表示不转义特殊字符
       taskkill /f /t /im http.exe
-      start http://127.0.0.1:9000/spg.html?m=%s
-      http.exe -nc -p 9000 -r wwwroot
+      start http://127.0.0.1:5001/spg.html?m=%s
+      http.exe -nc -p 5001 -r wwwroot
     exe-content-v3: | # | 表示不转义特殊字符
       taskkill /f /t /im http.exe
-      start http://127.0.0.1:9000/spc.html?m=%s
-      http.exe -nc -p 9000 -r wwwroot
+      start http://127.0.0.1:5001/spc.html?m=%s
+      http.exe -nc -p 5001 -r wwwroot
 url:
   v3:
     getInfo: