From 9fec51d2b09826224617d684a7ae8f17db051a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 28 Jan 2026 15:37:09 +0800
Subject: [PATCH] 1

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

diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 55050bc9f..0b1cf6402 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -1105,7 +1105,9 @@ func PKCS5UnPadding(origData []byte) []byte {
 //合成水印图1111
 func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) {
 	if exPrefixBegin != nil && exPrefixEnd != nil {
+		globals.SugarLogger.Debugf("---111111")
 		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 {
+			globals.SugarLogger.Debugf("---111111222222")
 			baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))
 			var imgUrl string
 			if strings.Contains(img, "?") {
@@ -1114,10 +1116,12 @@ func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.
 				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
-					}
+				globals.SugarLogger.Debugf("--resBinary-err := %v", err)
+				downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)])
+				globals.SugarLogger.Debugf("---downloadURL := %s", downloadURL)
+				globals.SugarLogger.Debugf("---err := %v", err)
+				if err == nil {
+					return downloadURL
 				}
 			}
 		}