liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2026-01-28 16:56:36 +08:00
parent 9fec51d2b0
commit 5dd3c7344a
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/sku.go
View File

@@ -3060,6 +3060,10 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
if toTimeP.Before(fromTimeP) { if toTimeP.Before(fromTimeP) {
return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP) return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP)
} }
img := `https://image.jxc4.com/176958594000e2b7c111897ee53e13312c2bbdc29b132168.jpg`
if ImgMix := jxutils.MixWatermarkImg(imgWaterMark, img, &fromTimeP, &toTimeP); ImgMix != "" {
return img, err
}
task := tasksch.NewParallelTask("刷新商品前缀水印图", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, task := tasksch.NewParallelTask("刷新商品前缀水印图", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {

4
business/jxutils/jxutils.go
View File

@@ -1105,9 +1105,7 @@ func PKCS5UnPadding(origData []byte) []byte {
//合成水印图1111 //合成水印图1111
func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) { func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) {
if exPrefixBegin != nil && exPrefixEnd != nil { 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 { 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)) baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))
var imgUrl string var imgUrl string
if strings.Contains(img, "?") { if strings.Contains(img, "?") {
@@ -1115,8 +1113,8 @@ func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.
} else { } else {
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"
} }
globals.SugarLogger.Debugf("---imgUrl := %s", imgUrl)
if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil { if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil {
globals.SugarLogger.Debugf("--resBinary-err := %v", err)
downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)]) 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("---downloadURL := %s", downloadURL)
globals.SugarLogger.Debugf("---err := %v", err) globals.SugarLogger.Debugf("---err := %v", err)

8
business/jxutils/jxutils_test.go
View File

@@ -6,12 +6,12 @@ import (
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals/testinit" //"git.rosy.net.cn/jx-callback/globals/testinit"
) )
func init() { //func init() {
testinit.Init() // testinit.Init()
} //}
func TestEarthDistance(t *testing.T) { func TestEarthDistance(t *testing.T) {
lng1, lat1 := 118.796877, 32.060255 lng1, lat1 := 118.796877, 32.060255