lyhzzz преди 2 дни
родител
ревизия
b7df587166
променени са 2 файла, в които са добавени 20 реда и са изтрити 1 реда
  1. 17 0
      src/main/java/com/fdkankan/rmnas/common/UploadToOssUtil.java
  2. 3 1
      src/main/java/com/fdkankan/rmnas/task/TaskService.java

+ 17 - 0
src/main/java/com/fdkankan/rmnas/common/UploadToOssUtil.java

@@ -1,6 +1,7 @@
 package com.fdkankan.rmnas.common;
 
 import cn.hutool.core.collection.CollUtil;
+import com.aliyun.oss.HttpMethod;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.OSSClientBuilder;
@@ -14,7 +15,9 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.io.*;
+import java.net.URL;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -213,4 +216,18 @@ public class UploadToOssUtil {
 		}
 
 	}
+
+
+	public static  String getUrl(OSSClient ossClient,String objectName){
+		com.aliyun.oss.model.GeneratePresignedUrlRequest request = new com.aliyun.oss.model.GeneratePresignedUrlRequest("zfb-4dkankan", objectName);
+		Date expiration = new Date(new Date().getTime() + 3600 * 1000L);
+		request.setExpiration(expiration);
+		ResponseHeaderOverrides responseHeaders = new ResponseHeaderOverrides();
+		responseHeaders.setContentDisposition("attachment; filename=\"myimage.jpg\"");
+		request.setResponseHeaders(responseHeaders);  // ← 使用这个方法
+
+		URL url = ossClient.generatePresignedUrl(request);
+		return url.toString();
+	}
+
 }

+ 3 - 1
src/main/java/com/fdkankan/rmnas/task/TaskService.java

@@ -151,8 +151,10 @@ public class TaskService {
                     log.info("跳过删除:{}",tbScenePro.getDataSource());
                     continue;
                 }
-                fYunFileServiceInterface.uploadFolder(tbScenePro.getDataSource(),"build_result");
+                fYunFileServiceInterface.uploadFolder(tbScenePro.getDataSource(),"build_result/"+tbScenePro.getNum());
                 FileUtil.del(tbScenePro.getDataSource());
+                FileUtil.del(tbScenePro.getDataSource()+"_images");
+                FileUtil.del(tbScenePro.getDataSource()+"_obj2txt");
                 tbSceneProService.updateDelBuildResult(tbScenePro.getId(),2);
             }