Forráskód Böngészése

1.资源转换加一些输出提示,以及修复bug

honorfire 6 hónapja
szülő
commit
104617e8d1

+ 19 - 7
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/util/PdfUtils.java

@@ -3,11 +3,15 @@ package vip.xiaonuo.disk.util;
 import io.minio.DownloadObjectArgs;
 import io.minio.MinioClient;
 import io.minio.UploadObjectArgs;
+import io.minio.errors.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
@@ -88,14 +92,22 @@ public class PdfUtils {
         String fileName = new File(objectName).getName();
         // 生成唯一临时文件名
         String uniqueName = UUID.randomUUID() + "_" + fileName;
-        File tempFile = new File(tempDir, uniqueName);
 
-        minioClient.downloadObject(
-                DownloadObjectArgs.builder()
-                        .bucket(bucketName)
-                        .object(objectName)
-                        .filename(tempFile.getAbsolutePath())
-                        .build());
+        System.out.println("下载路径:" + tempDir);
+        System.out.println("下载名称:" + uniqueName);
+        File tempFile = new File(tempDir, uniqueName);
+        System.out.println("下载文件:" + tempFile);
+        try {
+            minioClient.downloadObject(
+                    DownloadObjectArgs.builder()
+                            .bucket(bucketName)
+                            .object(objectName)
+                            .filename(tempFile.getAbsolutePath())
+                            .build());
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("下载失败原因=============================》" + e.getMessage());
+        }
         return tempFile;
     }
 

+ 26 - 12
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/util/VideoConverter.java

@@ -1,16 +1,17 @@
 package vip.xiaonuo.disk.util;
 
 import io.minio.*;
-import io.minio.errors.ErrorResponseException;
-import io.minio.errors.InvalidResponseException;
-import io.minio.errors.XmlParserException;
+import io.minio.errors.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.io.*;
+import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -49,7 +50,9 @@ public class VideoConverter {
         String uniqueName = UUID.randomUUID() + "_" + fileName;
         File tempFile = new File(tempDir, uniqueName);
         try {
-
+            System.out.println("下载路径:" + tempDir);
+            System.out.println("下载名称:" + uniqueName);
+            System.out.println("下载文件:" + tempFile);
             downloadFromMinio(minioClient, BUCKET_NAME, inputKey, tempFile);
             filesToDelete.add(tempFile); // 添加到删除列表
             // 执行格式转换
@@ -137,20 +140,25 @@ public class VideoConverter {
         if (!client.bucketExists(BucketExistsArgs.builder().bucket(bucket).build())) {
             client.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
         }
-        client.downloadObject(
-                DownloadObjectArgs.builder()
-                        .bucket(bucket)
-                        .object(object)
-                        .filename(dest.getAbsolutePath())
-                        .build()
-        );
+        try {
+            client.downloadObject(
+                    DownloadObjectArgs.builder()
+                            .bucket(bucket)
+                            .object(object)
+                            .filename(dest.getAbsolutePath())
+                            .build()
+            );
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("下载失败原因=============================》" + e.getMessage());
+        }
     }
 
     private static void uploadToMinio(MinioClient client, String bucket, String object, File file) throws Exception {
         client.uploadObject(
                 UploadObjectArgs.builder()
                         .bucket(bucket)
-                        .object("converted/" + object)
+                        .object("converted/"+ getCurrentDate()+"/" + object)
                         .filename(file.getAbsolutePath())
                         .contentType(getMimeType(object))
                         .build()
@@ -325,4 +333,10 @@ public class VideoConverter {
 //        }
 //    }
 
+    public static String getCurrentDate() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String currentDate = sdf.format(new Date());
+        return currentDate;
+    }
+
 }