1

business/jxutils/datares/datares.go

@@ -3,6 +3,8 @@ package datares
 import (
 	"bytes"
 	"fmt"
+	"git.rosy.net.cn/jx-callback/globals/api"
+	"github.com/qiniu/api.v7/storage"
 	"image"
 	"image/gif"
 	"image/jpeg"
@@ -49,26 +51,25 @@ func Binary2Image(binaryData []byte, mimeType string) (img image.Image, outMimeT
 	return img, mimeType, err
 }
 
-//
-//func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTokenInfo *UploadResTokenInfo, err error) {
-//	imgURL := ""
-//	if hashCode != "" {
-//		imgURL, _ = GetDataResource(ctx, hashCode)
-//	}
-//
-//	putPolicy := storage.PutPolicy{
-//		Scope:   globals.QiniuBucket,
-//		Expires: qiniuTokenExpires,
-//	}
-//	upTokenInfo = &UploadResTokenInfo{
-//		Token:    putPolicy.UploadToken(api.QiniuAPI),
-//		Expires:  putPolicy.Expires,
-//		FileName: jxutils.GenPicFileName(suffix),
-//		Hit:      imgURL != "",
-//		Img:      imgURL,
-//	}
-//	return upTokenInfo, err
-//}
+func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTokenInfo *UploadResTokenInfo, err error) {
+	imgURL := ""
+	if hashCode != "" {
+		imgURL, _ = GetDataResource(ctx, hashCode)
+	}
+
+	putPolicy := storage.PutPolicy{
+		Scope:   globals.QiniuBucket,
+		Expires: qiniuTokenExpires,
+	}
+	upTokenInfo = &UploadResTokenInfo{
+		Token:    putPolicy.UploadToken(api.QiniuAPI),
+		Expires:  putPolicy.Expires,
+		FileName: jxutils.GenPicFileName(suffix),
+		Hit:      imgURL != "",
+		Img:      imgURL,
+	}
+	return upTokenInfo, err
+}
 
 // 此函数要求resBinary不能空，mimeType与hashCode必须是正确的
 func RegisterDataResource(ctx *jxcontext.Context, name, resourceURL, mimeType, hashCode string, resBinary []byte, imgType int, isAsyncUpload2Vendor bool) (dataRes *model.DataResource, err error) {