From b95715d5cdc806cbb15cc7f49c538e61f5ab5dc6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:31:46 +0800
Subject: [PATCH] bug和二维码

---
 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ActivityCodeServiceImpl.java |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ActivityCodeServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ActivityCodeServiceImpl.java
index 009a019..270076f 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ActivityCodeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ActivityCodeServiceImpl.java
@@ -5,7 +5,6 @@
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import com.ruoyi.file.utils.OBSUploadUtils;
-import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -27,6 +26,22 @@
 
 
     /**
+     * @description  生成二维码
+     * @author  jqs
+     * @date    2023/8/3 12:44
+     * @param url
+     * @return  String
+     */
+    @Override
+    public String createActivityCode(String url, String fileName) throws Exception {
+        File qrCodeFile = new File("/home/image/qrcode.png");// 生成二维码
+        QrCodeUtil.generate(url, 100, 100, qrCodeFile);
+        InputStream codeStream = new FileInputStream(qrCodeFile);
+        String fileUrl =  OBSUploadUtils.uploadInputStream(codeStream,fileName);
+        return fileUrl;
+    }
+
+    /**
      * @description  生成活动二维码
      * @author  jqs
      * @date    2023/7/26 19:09
@@ -34,7 +49,7 @@
      * @return  void
      */
     @Override
-    public String createActivityCode(String activityId){
+    public String createActivityWxCode(String activityId){
 
         WxMaQrcodeService wxMaQrcodeService = wxMaService.getQrcodeService();
         String scene = activityId;
@@ -57,29 +72,28 @@
      * @return  void
      */
     @Override
-    public String createActivityCode(String activityId,String backImageUrl) throws WxErrorException, FileNotFoundException {
-
-
+    public String createActivityPoster(String activityId,String backImageUrl) throws Exception {
         String fileUrl = null;
         File qrCodeFile = new File("/home/image/qrcode.png");
         // 二维码内容
-        String text = ""+activityId;
+        String text = "https://wxapp.hhhrt.cn/mini/activity?"+activityId;
         // 生成二维码
-        QrCodeUtil.generate(text, 100, 100, qrCodeFile);
-        File backFile ;
+        QrCodeUtil.generate(text, 200, 200, qrCodeFile);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         InputStream codeStream = new FileInputStream(qrCodeFile);
-        InputStream backStream = new FileInputStream(qrCodeFile);
+        backImageUrl = backImageUrl.replace("https://hongruitang.oss-cn-beijing.aliyuncs.com/","");
+        InputStream backStream = OBSUploadUtils.getOSSInputStream(backImageUrl);
         // 将图片合成在一起
         ImgUtil.pressImage(
                 backStream, // 主图片
                 out, // 输出图片
-                ImgUtil.read(codeStream).getScaledInstance(516, 516, Image.SCALE_DEFAULT), //水印图片
+                ImgUtil.read(codeStream).getScaledInstance(200, 200, Image.SCALE_DEFAULT), //水印图片
                 0, //x坐标修正值。 默认在中间,偏移量相对于中间偏移
-                0, //y坐标修正值。 默认在中间,偏移量相对于中间偏移
+                350, //y坐标修正值。 默认在中间,偏移量相对于中间偏移
                 1.0f
         );
         InputStream inputStream = new ByteArrayInputStream(out.toByteArray());
+        fileUrl =  OBSUploadUtils.uploadInputStream(inputStream,activityId);
         return fileUrl;
     }
 }

--
Gitblit v1.7.1