From f6a1bf1d9b19dd8b3750034048f3876d086db1f1 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 14 八月 2024 17:11:49 +0800
Subject: [PATCH] 企业二维码添加

---
 project-common/src/main/java/com/project/common/utils/file/ImageUtils.java |   41 ++++++++++++++---------------------------
 1 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/project-common/src/main/java/com/project/common/utils/file/ImageUtils.java b/project-common/src/main/java/com/project/common/utils/file/ImageUtils.java
index 7a70cdf..ad21297 100644
--- a/project-common/src/main/java/com/project/common/utils/file/ImageUtils.java
+++ b/project-common/src/main/java/com/project/common/utils/file/ImageUtils.java
@@ -1,5 +1,17 @@
 package com.project.common.utils.file;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.google.zxing.WriterException;
+import com.project.common.config.ProjectConfig;
+import com.project.common.constant.Constants;
+import com.project.common.utils.StringUtils;
+import com.project.common.utils.WeChatUtils;
+import com.project.common.utils.qrcode.QRCodeUtil;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.*;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -8,23 +20,6 @@
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.project.common.config.ProjectConfig;
-import com.project.common.utils.WeChatUtils;
-import com.project.common.utils.qrcode.QRCodeUtil;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
-import org.apache.poi.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.project.common.constant.Constants;
-import com.project.common.utils.StringUtils;
-
-import javax.net.ssl.*;
 
 import static com.project.common.utils.file.FileUploadUtils.getPathFileName;
 
@@ -120,7 +115,7 @@
      * @throws WriterException
      * @throws IOException
      */
-    public static Object createQrcode(String content, String type)
+    public static String createQrcode(String content, String name, String type)
     {
         // 鏈湴璧勬簮璺緞
         String localPath = ProjectConfig.getQrcodePath();
@@ -192,15 +187,7 @@
                 }
             }
             else if ("2".equals(type)){
-                try {
-                    String destPath = localPath+"/logo.png";
-                    QRCodeUtil.encode(content,  destPath, file.getPath(),true);
-
-                } catch (IOException | WriterException e) {
-                    throw new RuntimeException(e);
-                } catch (ClassNotFoundException e) {
-                    throw new RuntimeException(e);
-                }
+                QRCodeUtil.contextLoads2(content,  name, file.getPath());
             }
 
         }

--
Gitblit v1.9.1