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