From 9e45bde6138d78013347da174ac1425ce52dec5e 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:48:47 +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/jxstore/cms/sync2.go | 1 + business/jxutils/jxutils.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 0cd2fc09b..a33c9722e 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -151,6 +151,7 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, skuVendorInfo.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuVendorInfo.Prefix, skuVendorInfo.Name, skuVendorInfo.Comment, skuVendorInfo.Unit, skuVendorInfo.SpecQuality, skuVendorInfo.SpecUnit, 0) if skuVendorInfo.ImgWatermark != "" { downLoad, _ := uploadImgStandard(skuVendorInfo.ImgWatermark) + fmt.Println("test downLoad", downLoad) skuVendorInfo.ImgMix = jxutils.MixMatermarkImg(downLoad, skuVendorInfo.Img) } skuVendorInfo.MergedStatus = jxutils.MergeSkuStatus(skuVendorInfo.Status, skuVendorInfo.NameStatus) diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index 11c7ed44d..cd849206f 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -921,8 +921,9 @@ 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" + fmt.Println("test imgUrl", imgUrl) if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil { - if downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+imgWatermark[strings.LastIndex(imgWatermark, "/")+1:len(imgWatermark)]); 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 }