From 268c817798db124e257f7c8cb9e2dc15a525ff2e Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 28 Mar 2024 15:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/services/QrcodeService.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/crmeb/services/QrcodeService.php b/crmeb/services/QrcodeService.php
index 8a54d26..9165e6e 100644
--- a/crmeb/services/QrcodeService.php
+++ b/crmeb/services/QrcodeService.php
@@ -10,6 +10,7 @@ use app\common\repositories\system\attachment\AttachmentRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use Endroid\QrCode\QrCode;
+use Endroid\QrCode\Writer\PngWriter;
 use think\exception\ValidateException;
 use think\facade\Config;
 
@@ -34,6 +35,26 @@ class QrcodeService
             if (!$siteUrl) return '请前往后台设置->系统设置->网站域名 填写您的域名格式为：http://域名';
             $info = [];
             $outfile = Config::get('qrcode.cache_dir');
+
+
+
+            // 二维码生成 新版本2024-2-6
+            $qrCode = QrCode::create($url);
+            $writer = new PngWriter();
+            $result = $writer->write($qrCode);
+            // $result->getString();
+            $upload = UploadService::create($uploadType);
+            $res = $upload->to('/public/' . $outfile)->validate()->stream($result->getString(), $name);
+            if ($res === false) {
+                return $upload->getError();
+            }
+            $info = $upload->getUploadInfo();
+            $info['image_type'] = $uploadType;
+
+            return $info;
+
+
+
             $code = new QrCode($url);
             if ($uploadType === 1) {
                 if (!is_dir('./public/' . $outfile))