From 7c9dda6138ceea88a312583a3fcc9b2bb356fbc4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 05 八月 2023 09:37:54 +0800
Subject: [PATCH] bug和二维码

---
 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java |   20 ++------------------
 1 files changed, 2 insertions(+), 18 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..939dc5e 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,7 +11,6 @@
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.awt.*;
 import java.io.*;
 import java.util.Calendar;
 
@@ -26,28 +24,14 @@
 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);
     }
 

--
Gitblit v1.7.1