From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 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 8fcbc61..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
@@ -1,6 +1,5 @@
package com.ruoyi.file.utils;
-import cn.hutool.core.img.ImgUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import com.aliyun.oss.ClientException;
import com.aliyun.oss.OSS;
@@ -12,9 +11,11 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.awt.*;
-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
@@ -25,29 +26,17 @@
*/
public class OBSUploadUtils {
+
+
public static void main(String[] args) throws Exception {
- String activityId = "123";
- String backImageUrl = "2023/8/3/6742e22f748349429e454c9c6ba168ee.jpg";
String fileUrl = null;
File qrCodeFile = new File("/home/image/qrcode.png");
// 二维码内容
- String text = "https://wxapp.hhhrt.cn/mini/activity?"+activityId;
+ String text = "https://wxapp.hhhrt.cn/mini/coupon";
// 生成二维码
QrCodeUtil.generate(text, 100, 100, qrCodeFile);
- ByteArrayOutputStream out = new ByteArrayOutputStream();
InputStream codeStream = new FileInputStream(qrCodeFile);
- InputStream backStream = OBSUploadUtils.getOSSInputStream(backImageUrl);
- // 将图片合成在一起
- ImgUtil.pressImage(
- backStream, // 主图片
- out, // 输出图片
- ImgUtil.read(codeStream).getScaledInstance(200, 200, Image.SCALE_DEFAULT), //水印图片
- 0, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
- 350, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
- 1.0f
- );
- InputStream inputStream = new ByteArrayInputStream(out.toByteArray());
- fileUrl = OBSUploadUtils.uploadInputStream(inputStream,activityId);
+ fileUrl = OBSUploadUtils.uploadInputStream(codeStream,"couponCode");
System.out.println(fileUrl);
}
@@ -80,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();
@@ -93,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, "
@@ -133,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);
@@ -142,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