From 2eaceff07c9569db264d36559ad478e1d135304b Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Fri, 27 May 2022 14:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tall/src/main/resources/application.yml       |  4 +--
 .../main/java/com/ccsens/util/QrCodeUtil.java | 26 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index ebc544af..b5408a3a 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common
 
diff --git a/util/src/main/java/com/ccsens/util/QrCodeUtil.java b/util/src/main/java/com/ccsens/util/QrCodeUtil.java
index 80a67e7f..15c7e4f3 100644
--- a/util/src/main/java/com/ccsens/util/QrCodeUtil.java
+++ b/util/src/main/java/com/ccsens/util/QrCodeUtil.java
@@ -96,7 +96,6 @@ public class QrCodeUtil {
      * @return 返回文件位置（不带前缀）
      */
     public static String getQrCodeWithUtf8(String value, String filePath) throws Exception {
-
         //文件地址
         String fileName = "qrCode/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".png";
 
@@ -115,4 +114,29 @@ public class QrCodeUtil {
         return fileName;
     }
 
+    /**
+     * 生成二位吗（utf-8）
+     * @return 返回文件位置（不带前缀）
+     */
+    public static String getQrCodeWithUtf8(String value, String filePath, Integer width, Integer height) throws Exception {
+        width = width == null ? 200 : width;
+        height = height == null ? 200 : height;
+        //文件地址
+        String fileName = "qrCode/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".png";
+
+        QRCodeWriter qrCodeWriter = new QRCodeWriter();
+        HashMap<EncodeHintType, Object> hints = new HashMap<>();
+        hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+        BitMatrix bitMatrix =qrCodeWriter.encode(value, BarcodeFormat.QR_CODE, width, height,hints);
+        File file = new File(filePath, fileName);
+        if (!file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
+        Path path = FileSystems.getDefault().getPath(filePath + fileName);
+
+        MatrixToImageWriter.writeToPath(bitMatrix, "PNG", path);
+
+        return fileName;
+    }
+
 }