dsx 2 vuotta sitten
vanhempi
commit
1b1b541018

+ 4 - 3
src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.controller;
 
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,12 +22,12 @@ public class TestController {
 
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
+    @Autowired
+    private FYunFileServiceInterface fYunFileService;
 
     @GetMapping("/test")
     public ResultData test(){
-        for (int i = 0; i < 100; i++){
-            rabbitMqProducer.sendByWorkQueue("test_dsx", "{\"name\":123}");
-        }
+        fYunFileService.deleteFolder("testUp");
         return ResultData.ok();
     }
 

+ 3 - 3
src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -318,7 +318,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         //删除发布数据中的user目录
         String publicUserPath = String.format(UploadFilePath.USER_VIEW_PATH, num);
-        fYunFileService.deleteFile(bucket, publicUserPath);
+        fYunFileService.deleteFolder(bucket, publicUserPath);
 
         //复制编辑目录到发布目录
         String editPath = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum());
@@ -386,7 +386,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         fYunFileService.uploadFile(bucket, linkPanArr.toString().getBytes(), linkScenePath);
 
         //拷贝编辑目录到发布目录
-        fYunFileService.deleteFile(bucket,imgViewPath + "panorama");
+        fYunFileService.deleteFolder(bucket,imgViewPath + "panorama");
         fYunFileService.copyFileBetweenBucket(bucket, imgEditPath + "panorama", bucket, imgViewPath + "panorama");
 
     }
@@ -2120,7 +2120,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //删除oss文件
         String imgEditPath = String.format(UploadFilePath.IMG_EDIT_PATH, num);
         deleteSidList.stream().forEach(sid->{
-            fYunFileService.deleteFolder(bucket, imgEditPath + "panorama_edit/" + sid);
+            fYunFileService.deleteFolder(bucket, imgEditPath + "panorama/" + sid);
         });
 
     }