From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化
---
ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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 6d3e490..e9fea7d 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
@@ -26,6 +26,9 @@
public class OssServiceImpl implements OssService {
@Override
public String uploadImages(MultipartFile file) {
+ if (file == null) {
+ return "涓婁紶鏂囦欢涓虹┖";
+ }
String endpoint = ConstantPropertiesUtils.END_POINT;
String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
@@ -47,7 +50,7 @@
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();
return url;
@@ -118,21 +121,21 @@
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);
- 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);
+ // 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);
return url;
} catch (Exception e) {
System.out.println("oss寮傚父锛�" + e.getMessage());
@@ -142,6 +145,9 @@
}
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