From 2f8b1a9a31dbcdb8b79e0ffa127482dc38e96cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 17 Jun 2020 11:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=9D=E5=A4=96=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/jxutils.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 2ef8b8be9..b25a1a73c 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -920,16 +920,12 @@ func PKCS5UnPadding(origData []byte) []byte {
 //合成水印图
 func MixMatermarkImg(imgWatermark, img string) (imgMix string) {
 	baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))
-	imgUrl := "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0"
+	imgUrl := img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0"
 	if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil {
 		if downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)]); err == nil {
 			if err == nil {
 				return downloadURL
-			} else {
-				fmt.Println("err", err)
 			}
-		} else {
-			fmt.Println("err2", err)
 		}
 	}
 	return imgMix