From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OssUploadUtil.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OssUploadUtil.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OssUploadUtil.java
index 425ffd6..f62aeee 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OssUploadUtil.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OssUploadUtil.java
@@ -2,6 +2,7 @@
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.model.ObjectMetadata;
+import com.aliyun.oss.model.PutObjectResult;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -11,15 +12,15 @@
public class OssUploadUtil {
//OSS图片访问域名
- public static String oss_domain = "https://newok.oss-cn-shenzhen.aliyuncs.com/";
- public static String accessKeyId = "LTAI4G9Zez9H4B36vakPXGy4";
- public static String accessKeySecret = "BOVPUeZndKVbrPOq6Ef5j6oiydB3XZ";
- public static String bucketName="newok";
- public static String endpoint = "oss-cn-shenzhen.aliyuncs.com";
+ public static String oss_domain = "https://we-park-life.oss-cn-beijing.aliyuncs.com/";
+ public static String accessKeyId = "LTAI47eyqWWhBPXM";
+ public static String accessKeySecret = "orsYX78NvgXS9KbN7wCwRja1wkUwPc";
+ public static String bucketName="we-park-life";
+ public static String endpoint = "oss-cn-beijing.aliyuncs.com";
public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
- public static String ossUpload(HttpServletRequest request, MultipartFile file) throws IOException{
+ public static String ossUpload(String filePath, MultipartFile file) throws IOException{
//CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
String fileName = "";
if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
@@ -28,10 +29,10 @@
meta.setContentLength(file.getSize()); // 必须设置ContentLength
String originalFilename = file.getOriginalFilename();
fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
- ossClient.putObject(bucketName,"img/"+fileName,content,meta);// 上传Object.
+ ossClient.putObject(bucketName, filePath + fileName, content, meta);// 上传Object.
if(fileName != null && !"".equals(fileName)){
System.out.println(fileName);
- fileName = oss_domain+"img/"+fileName;
+ fileName = oss_domain+ filePath +fileName;
}
}
return fileName;
--
Gitblit v1.7.1