- support upload img pre check.

This commit is contained in:
gazebo
2018-12-11 18:09:11 +08:00
parent 694be7f86d
commit 21ac6458a4
6 changed files with 99 additions and 4 deletions

View File

@@ -55,7 +55,15 @@ func GetServiceInfo(ctx *jxcontext.Context) interface{} {
return serviceInfo
}
func GetQiniuUploadToken(ctx *jxcontext.Context, suffix string) (upTokenInfo map[string]interface{}, err error) {
func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTokenInfo map[string]interface{}, err error) {
imgURL := ""
if hashCode != "" {
db := dao.GetDB()
if skuName, err := dao.GetSkuNameByHashCode(db, hashCode); err == nil {
imgURL = skuName.Img
}
}
putPolicy := storage.PutPolicy{
Scope: globals.QiniuBucket,
Expires: qiniuTokenExpires,
@@ -64,6 +72,8 @@ func GetQiniuUploadToken(ctx *jxcontext.Context, suffix string) (upTokenInfo map
"token": putPolicy.UploadToken(api.QiniuAPI),
"expires": putPolicy.Expires,
"fileName": genPicFileName(suffix),
"hit": imgURL != "",
"img": imgURL,
}
return upTokenInfo, err
}

View File

@@ -1,9 +1,15 @@
package initdata
import (
"crypto/md5"
"fmt"
"io/ioutil"
"net/http"
"git.rosy.net.cn/baseapi/platformapi/autonavi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals/api"
@@ -118,3 +124,41 @@ func InitPlace(ctx *jxcontext.Context) (err error) {
}
return err
}
func InitSkuName(ctx *jxcontext.Context, isForce, isAsync, isContinueWhenError bool) (hint string, err error) {
db := dao.GetDB()
var skuNameList []*model.SkuName
if err = dao.GetRows(db, &skuNameList, `
SELECT *
FROM sku_name
WHERE deleted_at = ? AND img <> ''
ORDER BY id
`, utils.DefaultTimeValue); err != nil {
return "", err
}
task := tasksch.NewParallelTask("InitSkuName calculate md5", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx.GetUserName(), func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
skuName := batchItemList[0].(*model.SkuName)
if skuName.ImgHashCode == "" || isForce {
response, err := http.Get(skuName.Img)
if err == nil {
defer response.Body.Close()
data, err2 := ioutil.ReadAll(response.Body)
if err = err2; err == nil {
skuName.ImgHashCode = fmt.Sprintf("%X", md5.Sum(data))
db := dao.GetDB()
_, err = dao.UpdateEntity(db, skuName, "ImgHashCode")
}
}
}
return nil, err
}, skuNameList)
task.Run()
if !isAsync {
_, err = task.GetResult(0)
} else {
hint = task.ID
}
return hint, err
}

View File

@@ -34,3 +34,19 @@ func DeleteSkuNamePlace(db *DaoDB, nameID int, placeCodes []int) (num int64, err
}
return ExecuteSQL(db, sql, sqlParams...)
}
func GetSkuNameByHashCode(db *DaoDB, hashCode string) (skuName *model.SkuName, err error) {
sql := `
SELECT *
FROM sku_name
WHERE img_hash_code = ?
`
sqlParams := []interface{}{
hashCode,
}
skuName = &model.SkuName{}
if err = GetRow(db, skuName, sql, sqlParams...); err == nil {
return skuName, nil
}
return nil, err
}