From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
index 939dc5e..3959fe9 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
@@ -11,8 +11,11 @@
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
 import java.util.Calendar;
+import java.util.Date;
 
 /**
  * @author jqs34
@@ -22,6 +25,8 @@
  * @date 2023 2023/5/1 15:40
  */
 public class OBSUploadUtils {
+
+
 
     public static void main(String[] args) throws Exception {
         String fileUrl = null;
@@ -64,9 +69,8 @@
         OSS ossClient = createOss();
         PutObjectResult result = null;
         try {
-
             String fileName = FileUploadUtils.extractFilename(file);
-            System.out.println(fileName + "开始上传");
+            System.out.println(fileName + "开始上传" + new Date());
             String prefix = fileName.substring(fileName.lastIndexOf("."));
             String objectName = filePath + uuid + prefix;
             InputStream inputStream = file.getInputStream();
@@ -77,7 +81,8 @@
             // 创建PutObject请求。
             result = ossClient.putObject(putObjectRequest);
             // 如果上传成功,则返回200。
-            System.out.println(fileName + "上传返回" + result.getResponse().getStatusCode());
+            System.out.println(fileName + "上传返回"+ new Date() + result.getResponse().getStatusCode());
+            inputStream.close();
             return result.getResponse().getUri();
         } catch (OSSException oe) {
             System.out.println("Caught an OSSException, which means your request made it to OSS, "
@@ -117,7 +122,7 @@
         PutObjectResult result = null;
         try {
 
-            System.out.println(fileName + "开始上传");
+            System.out.println(fileName + "开始上传"+ new Date());
             String objectName = filePath + fileName + ".jpg";
             // 创建PutObjectRequest对象。
             PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectName, inputStream);
@@ -126,7 +131,7 @@
             // 创建PutObject请求。
             result = ossClient.putObject(putObjectRequest);
             // 如果上传成功,则返回200。
-            System.out.println(fileName + "上传返回" + result.getResponse().getStatusCode());
+            System.out.println(fileName + "上传返回"+ new Date() + result.getResponse().getStatusCode());
             return result.getResponse().getUri();
         } catch (OSSException oe) {
             System.out.println("Caught an OSSException, which means your request made it to OSS, "

--
Gitblit v1.7.1