From 8580866e175ad0050ee9c5ea3f757856fc242c39 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 09 五月 2025 10:50:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
index 84cddf2..7e716c8 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
@@ -11,15 +11,16 @@
 
 public class OssUploadUtil {
 	//OSS图片访问域名
-	public static String oss_domain = "https://jiayixing-bucket.oss-cn-beijing.aliyuncs.com/";
-	public static String accessKeyId = "LTAI5tE2Z7nA1rbtzZYMSPqR";
-	public static String accessKeySecret = "HOGUqx1t4UWh8KepXJf69dlKj4tTBs";
-	public static String bucketName="jiayixing-bucket";
-	public static String endpoint = "oss-cn-beijing.aliyuncs.com";
+	public static String oss_domain = "https://xv95128.oss-cn-wuhan-lr.aliyuncs.com/";
+	public static String oss_domain_cdn = "https://cdn.xn95128.cn/";
+	public static String accessKeyId = "LTAI5tEQarpMqRDNnSuj2mCE";
+	public static String accessKeySecret = "6lBQHFh4XRaIytR5mQ6wDjAbIWmDok";
+	public static String bucketName="xv95128";
+	public static String endpoint = "oss-cn-wuhan-lr.aliyuncs.com";
 	
 	public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
 
-	public static String ossUpload( MultipartFile file) throws IOException{
+	public static String ossUpload(HttpServletRequest request, MultipartFile file) throws IOException{
 		//CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
 		String fileName = "";
 		if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
@@ -31,7 +32,24 @@
 			ossClient.putObject(bucketName,"img/"+fileName,content,meta);// 上传Object.
 			if(fileName != null && !"".equals(fileName)){
 				System.out.println(fileName);
-				fileName = oss_domain+"img/"+fileName;
+				fileName = oss_domain_cdn+"img/"+fileName;
+			}
+		}
+		return fileName;
+	}
+	public static String ossUploadCode( MultipartFile file) throws IOException{
+		//CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
+		String fileName = "";
+		if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
+			InputStream content = file.getInputStream();//获得指定文件的输入流
+			ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
+			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.
+			if(fileName != null && !"".equals(fileName)){
+				System.out.println(fileName);
+				fileName = oss_domain_cdn+"img/"+fileName;
 			}
 		}
 		return fileName;

--
Gitblit v1.7.1