diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index b25a1a73c..75292a136 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -918,15 +918,22 @@ func PKCS5UnPadding(origData []byte) []byte { } //合成水印图 -func MixMatermarkImg(imgWatermark, img string) (imgMix string) { - baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark)) - 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 +func MixMatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) { + if exPrefixBegin != nil && exPrefixEnd != nil { + if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 { + baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark)) + 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 + } + } } } + if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixEnd) > 0 { + return imgMix + } } return imgMix }