From 69883c0944f7af3f9c2728ec7c59f712274b212a Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 10 Aug 2021 09:40:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=93=BE=E6=8E=A5=E7=9A=84?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=A4=B1=E6=95=88=E4=BA=86=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/job.go | 8 ++++++--
 business/jxutils/jxutils.go | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 66aa684e9..f2132a603 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -2050,15 +2050,19 @@ func ShareUnionLink(ctx *jxcontext.Context, jobID, shareType, linkType, resource
 		if isImg {
 			bindImg, _ = dao.GetUserUnionBindImg(db, userBind.UnionID, job.UnionActID)
 			if bindImg != nil {
+				//图片失效了？
 				if bindImg.UnionImg != "" {
-					return bindImg.UnionImg, err
+					checkData, _, err := jxutils.DownloadFileByURL(bindImg.UnionImg)
+					if err == nil && checkData != nil {
+						return bindImg.UnionImg, err
+					}
 				}
 			}
 		}
 		if link, err = handler.ShareUnionLink(ctx, linkType, utils.Str2Int(job.UnionActID), sid, userID, resourceType, goodsID); err == nil {
 			if isImg {
 				if resBinary, _, err := jxutils.DownloadFileByURL(link); err == nil {
-					if downloadURL, err := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+link[strings.LastIndex(link, "/")+1:len(link)]); err == nil {
+					if downloadURL, err := jxutils.UploadExportContent(resBinary, "image/"+utils.Int64ToStr(time.Now().Unix())+link[strings.LastIndex(link, "/")+1:len(link)]); err == nil {
 						if err == nil {
 							link = jxutils.MixWatermarkImg(downloadURL+"?imageView2/1/w/120/h/120/q/75", job.UnionImg, job.UnionQrcodePosition)
 							link += "?imageslim"
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 60da45c70..9b3e70cf7 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -833,7 +833,7 @@ func MixWatermarkImg(imgWatermark, img, positon string) (imgMix string) {
 		imgUrl = img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/" + positon + "/dx/10/dy/10"
 	}
 	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 downloadURL, err := UploadExportContent(resBinary, "image/"+utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)]); err == nil {
 			if err == nil {
 				return downloadURL
 			}