From c4d46326ad7c8cf9bc74f43ee4c132a5f60d7276 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, 14 Apr 2021 14:54:51 +0800
Subject: [PATCH] aa

---
 business/jxutils/jxutils.go | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index d3ddf45bf..abddd8c07 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -826,26 +826,19 @@ func PKCS5UnPadding(origData []byte) []byte {
 }
 
 //合成水印图
-func MixWatermarkImg(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))
-			var imgUrl string
-			if strings.Contains(img, "?") {
-				imgUrl = img + "/imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0"
-			} else {
-				imgUrl = img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0"
+func MixWatermarkImg(imgWatermark, img string) (imgMix string) {
+	baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))
+	var imgUrl string
+	if strings.Contains(img, "?") {
+		imgUrl = img + "/imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/South/dx/0/dy/0"
+	} else {
+		imgUrl = img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/South/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 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