diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 1830cc398..668ee9b16 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -1,6 +1,10 @@ package cms import ( + "crypto/md5" + "fmt" + + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/basesch" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" @@ -47,7 +51,7 @@ func GetServiceInfo() interface{} { return serviceInfo } -func GetQiniuUploadToken() (upTokenInfo map[string]interface{}, err error) { +func GetQiniuUploadToken(suffix string) (upTokenInfo map[string]interface{}, err error) { putPolicy := storage.PutPolicy{ Scope: globals.QiniuBucket, Expires: qiniuTokenExpires, @@ -55,5 +59,11 @@ func GetQiniuUploadToken() (upTokenInfo map[string]interface{}, err error) { upTokenInfo = make(map[string]interface{}) upTokenInfo["token"] = putPolicy.UploadToken(api.QiniuAPI) upTokenInfo["expires"] = putPolicy.Expires + upTokenInfo["fileName"] = genPicFileName(suffix) return upTokenInfo, err } + +///// +func genPicFileName(suffix string) string { + return fmt.Sprintf("%x%s", md5.Sum([]byte(utils.GetUUID()+suffix)), suffix) +} diff --git a/controllers/cms.go b/controllers/cms.go index 38d77c65a..aef3e8f47 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -25,12 +25,13 @@ func (c *CmsController) GetServiceInfo() { // @Title 得到七牛上传服务临时token // @Description 得到七牛上传服务临时token,当前设置为5分钟内有效。正常使用场景为每次上传资源前实时获取,而不是保存下来一直使用 // @Param token header string true "认证token" +// @Param suffix query string true "门店所属的厂商ID" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /GetQiniuUploadToken [get] func (c *CmsController) GetQiniuUploadToken() { c.callGetQiniuUploadToken(func(params *tCmsGetQiniuUploadTokenParams) (retVal interface{}, errCode string, err error) { - retVal, err = cms.GetQiniuUploadToken() + retVal, err = cms.GetQiniuUploadToken(params.Suffix) return retVal, "", err }) } diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index c10ae9f56..679ba8751 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -367,6 +367,14 @@ func init() { MethodParams: param.Make(), Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], + beego.ControllerComments{ + Method: "UpdateStoreSku", + Router: `/UpdateStoreSku`, + AllowHTTPMethods: []string{"put"}, + MethodParams: param.Make(), + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:UserController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:UserController"], beego.ControllerComments{ Method: "TmpAddMobile2Mobile",