From ebfc3c3a9ab66d4617cb632cf2b19c158d96b50c Mon Sep 17 00:00:00 2001
From: Rosy-zhudan <donmicro@qq.com>
Date: Thu, 29 Aug 2019 14:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90Base64=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81/=E6=9D=A1=E5=BD=A2?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/jxutils_cms.go | 48 +++------------------------------
 1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go
index c6fd63b39..0a83482ed 100644
--- a/business/jxutils/jxutils_cms.go
+++ b/business/jxutils/jxutils_cms.go
@@ -13,7 +13,7 @@ import (
 	"time"
 	"errors"
 	"image/png"
-	"os"
+	"bytes"
 	"encoding/base64"
 	"git.rosy.net.cn/baseapi/platformapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -465,50 +465,10 @@ func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int)
 	return earningPrice
 }
 
-func File2BytesByFileName(filename string) ([]byte, error) {
-	file, err := os.Open(filename)
-	defer file.Close()
-    if err != nil {
-		return nil, err
-    }
-
-    return File2BytesByFile(file)
-}
-
-func File2BytesByFile(file *os.File) ([]byte, error) {
-    stats, err := file.Stat()
-    if err != nil {
-        return nil, err
-    }
-
-    data := make([]byte, stats.Size())
-    _, err = file.Read(data)
-    if err != nil {
-		return nil, err
-    }
-
-    return data, nil
-}
-
-func CreateCodeImage(qrCode barcode.Barcode) (fileName string, err error) {
-	fileName = "qrcode.png"
-	file, err := os.Create(fileName)
-	defer file.Close()
-	if err == nil {
-		err = png.Encode(file, qrCode)
-	}
-
-	return fileName, err
-}
-
 func GetImgBase64(qrCode barcode.Barcode) (imgBase64 string, err error) {
-	fileName, err := CreateCodeImage(qrCode)
-	if err == nil {
-		fileData, err := File2BytesByFileName(fileName)
-		if err == nil {
-			imgBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(fileData)
-		}
-	}
+	bufWriter := bytes.NewBuffer(nil)
+	png.Encode(bufWriter, qrCode)
+	imgBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(bufWriter.Bytes())
 
 	return imgBase64, err
 }