From bbe76086f95dfb34e942d9f2801e17db38391c68 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 十一月 2023 21:34:05 +0800
Subject: [PATCH] 接口测试

---
 ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java |   84 ++++++++++++++++++++++++++++++------------
 1 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
index c6c001c..0ec8e5a 100644
--- a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
@@ -12,18 +12,21 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
-import java.util.UUID;
 
 @Service
 public class OssServiceImpl implements OssService {
     @Override
     public String uploadImages(MultipartFile file) {
+        DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        System.out.println("寮�濮嬩笂浼�--" + dtf2.format(LocalDateTime.now()));
+        if (file == null) {
+            return "涓婁紶鏂囦欢涓虹┖";
+        }
         String endpoint = ConstantPropertiesUtils.END_POINT;
         String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
         String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
@@ -45,9 +48,10 @@
             ossClient.shutdown();
             // 鎶婁笂浼犵殑鏂囦欢璺緞杩斿洖 锛堟墜鍔ㄦ嫾鎺ワ級
             // 杩欓噷璁剧疆鍥剧墖鏈夋晥鏃堕棿 鎴戣缃簡30骞�
-            Date expiration = new Date(System.currentTimeMillis() + 946080000 * 1000);
+            Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);
             String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
 
+            System.out.println("涓婁紶缁撴潫--" + dtf2.format(LocalDateTime.now()));
             return url;
         } catch (Exception e) {
             System.out.println("uploadImages涓婁紶鍥剧墖澶辫触锛�");
@@ -97,6 +101,9 @@
         String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
         String bucketName = ConstantPropertiesUtils.BUCKET_NAME;
 
+        DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        System.out.println("鍑嗗涓婁紶--" + dtf2.format(LocalDateTime.now()));
         // 鍒涘缓OSSClient瀹炰緥銆�
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
         // 涓婁紶鏂囦欢娴�
@@ -105,32 +112,21 @@
             LocalDate date = LocalDate.now();
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
             String fileName = "sczf/" + date.format(formatter) + RandomUtils.generateRandomInt(8) + "." + ext;
-            System.out.println("鏂囦欢鍦板潃锛�" + fileName);
+
             ObjectMetadata objectMetadata = new ObjectMetadata();
             objectMetadata.setContentType(getcontentType(ext));
-            // 璋冪敤oss鐨勬柟娉曞疄鐜伴暱浼�
-            // 绗竴涓弬鏁� bucketName
-            // 绗簩涓弬鏁� 涓婁紶鍒皁ss鐨勬枃浠惰矾寰勫拰鏂囦欢鍚嶇О
+
+            System.out.println("寮�濮嬩笂浼�--" + dtf2.format(LocalDateTime.now()));
+
             ossClient.putObject(bucketName, fileName, inputStream, objectMetadata);
-            // 鍏抽棴OSSClient銆�
             ossClient.shutdown();
-            // 鎶婁笂浼犵殑鏂囦欢璺緞杩斿洖 锛堟墜鍔ㄦ嫾鎺ワ級
-            // 杩欓噷璁剧疆鍥剧墖鏈夋晥鏃堕棿 鎴戣缃簡30骞�
-            Date expiration = new Date(System.currentTimeMillis() + 946080000 * 1000);
+
+            Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);
+
             String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
-            System.out.println("oss涓婁紶鎴愬姛锛�" + url);
+//            System.out.println("oss涓婁紶鎴愬姛锛�" + url);
 
-            URL urlO = new URL(url);
-            HttpURLConnection conn = (HttpURLConnection) urlO.openConnection();
-            conn.setRequestMethod("GET");
-            conn.setConnectTimeout(10 * 1000);
-            conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
-
-            InputStream inputStream2 = conn.getInputStream();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹�
-
-            byte[] data = readInputStream(inputStream2);
-
-            System.out.println("鑾峰彇鍥剧墖鎴愬姛:" + url);
+            System.out.println("涓婁紶瀹屾垚--" + dtf2.format(LocalDateTime.now()));
             return url;
         } catch (Exception e) {
             System.out.println("oss寮傚父锛�" + e.getMessage());
@@ -139,7 +135,47 @@
         }
     }
 
+    @Override
+    public String uploadVideo(MultipartFile file) {
+        if (file == null) {
+            return "涓婁紶瑙嗛涓虹┖";
+        }
+        String endpoint = ConstantPropertiesUtils.END_POINT;
+        String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
+        String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
+        String bucketName = ConstantPropertiesUtils.BUCKET_NAME;
+        // 鍒涘缓OSSClient瀹炰緥
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+        // 涓婁紶鏂囦欢娴�
+        try {
+            // 鑾峰彇鏂囦欢鐨勫悕绉�
+            String fileName = "sczf/" + file.getOriginalFilename();
+            ObjectMetadata objectMetadata = new ObjectMetadata();
+            objectMetadata.setContentType(getcontentType(fileName.substring(fileName.lastIndexOf("."))));
+            // 璋冪敤oss鐨勬柟娉曞疄鐜伴暱浼�
+            // 绗竴涓弬鏁� bucketName
+            // 绗簩涓弬鏁� 涓婁紶鍒皁ss鐨勬枃浠惰矾寰勫拰鏂囦欢鍚嶇О
+            ossClient.putObject(bucketName, fileName, new ByteArrayInputStream(file.getBytes()), objectMetadata);
+            // 鍏抽棴OSSClient銆�
+            ossClient.shutdown();
+            // 鎶婁笂浼犵殑鏂囦欢璺緞杩斿洖 锛堟墜鍔ㄦ嫾鎺ワ級
+            // 杩欓噷璁剧疆鍥剧墖鏈夋晥鏃堕棿 鎴戣缃簡30骞�
+            Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);
+            String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
+
+            return url;
+        } catch (Exception e) {
+            System.out.println("uploadImages涓婁紶瑙嗛澶辫触锛�");
+            // e.printStackTrace();
+            return null;
+        }
+    }
+
+
     public static String getcontentType(String FilenameExtension) {
+        if (FilenameExtension.equalsIgnoreCase(".mp4")||FilenameExtension.equalsIgnoreCase(".mov")) {
+            return "video/mp4";
+        }
         if (FilenameExtension.equalsIgnoreCase(".bmp")) {
             return "image/bmp";
         }

--
Gitblit v1.8.0