1
This commit is contained in:
@@ -1135,15 +1135,13 @@ func MixWatermarkImg2(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time
|
||||
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"
|
||||
imgUrl = img + "/imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0/ws/1/wst/2"
|
||||
} else {
|
||||
imgUrl = img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0/ws/1/wst/2"
|
||||
}
|
||||
globals.SugarLogger.Debugf("---imgUrl := %s", imgUrl)
|
||||
if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil {
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user