+ 添加数据资源操作相关的API

business/jxstore/cms/cms.go

@@ -103,10 +103,7 @@ func GetServiceInfo(ctx *jxcontext.Context) interface{} {
 func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTokenInfo map[string]interface{}, err error) {
 	imgURL := ""
 	if hashCode != "" {
-		db := dao.GetDB()
+		imgURL, _ = GetDataResource(ctx, hashCode)
-		if skuName, err := dao.GetSkuNameByHashCode(db, hashCode); err == nil {
-			imgURL = skuName.Img
-		}
 	}
 
 	putPolicy := storage.PutPolicy{
@@ -123,6 +120,51 @@ func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTok
 	return upTokenInfo, err
 }
 
+func RegisterDataResource(ctx *jxcontext.Context, name, resourceURL, mimeType, hashCode string) (dataRes *model.DataResource, err error) {
+	if model.ValideMimeTypes[mimeType] == 0 {
+		return nil, fmt.Errorf("MIME type:%s非法", mimeType)
+	}
+	dataRes = &model.DataResource{
+		Name:        name,
+		HashCode:    hashCode,
+		ResoureType: mimeType,
+		MainURL:     resourceURL,
+	}
+	vendorID := jxutils.GuessDataResourceVendor(resourceURL)
+	switch vendorID {
+	case model.VendorIDQiNiuCloud:
+		dataRes.QiniuURL = resourceURL
+	case model.VendorIDEBAI:
+		dataRes.EbaiURL = resourceURL
+	case model.VendorIDMTWM:
+		dataRes.MtwmURL = resourceURL
+	}
+
+	dao.WrapAddIDCULEntity(dataRes, ctx.GetUserName())
+	if err = dao.CreateEntity(dao.GetDB(), dataRes); err != nil {
+		dataRes = nil
+	}
+	return dataRes, err
+}
+
+func GetDataResource(ctx *jxcontext.Context, hashCode string) (resourceURL string, err error) {
+	db := dao.GetDB()
+	dataRes, err := dao.GetDataResource(db, hashCode, "")
+	if err != nil {
+		if dao.IsNoRowsError(err) {
+			skuName, err2 := dao.GetSkuNameByHashCode(db, hashCode)
+			if err = err2; err == nil {
+				resourceURL = skuName.Img
+			} else if dao.IsNoRowsError(err) {
+				err = nil
+			}
+		}
+	} else {
+		resourceURL = dataRes.MainURL
+	}
+	return resourceURL, err
+}
+
 func GetPlaces(ctx *jxcontext.Context, keyword string, includeDisabled bool, params map[string]interface{}) ([]*model.Place, error) {
 	sql := `
 	SELECT *

business/jxstore/cms/cms_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"testing"
 
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/globals/api2"
 	"git.rosy.net.cn/jx-callback/globals/testinit"
@@ -27,3 +28,11 @@ func TestGetQiniuUploadToken(t *testing.T) {
 	}
 	fmt.Print(token)
 }
+
+func TestGetDataResource(t *testing.T) {
+	dataRes, err := GetDataResource(jxcontext.AdminCtx, "1D3E4A8259F359FB4CF47D541843950D")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(utils.Format4Output(dataRes, false))
+}

business/jxutils/jxutils.go

@@ -27,6 +27,21 @@ import (
 var (
 	routinePool *routinepool.Pool
 	skuNamePat  *regexp.Regexp
+
+	resourceTypeMap = map[int][]string{
+		model.VendorIDQiNiuCloud: []string{
+			"image.jxc4.com",
+		},
+		model.VendorIDJD: []string{
+			"img30.360buyimg.com",
+		},
+		model.VendorIDMTWM: []string{
+			"",
+		},
+		model.VendorIDEBAI: []string{
+			"image-star.elemecdn.com",
+		},
+	}
 )
 
 type OrderSkuList []*model.OrderSku
@@ -692,3 +707,19 @@ func GetAuthType4Vendor(vendorID int) (authType string) {
 	}
 	return authType
 }
+
+func GuessDataResourceVendor(resourceURL string) (vendorID int) {
+	vendorID = -1
+	for tmpVendorID, urlList := range resourceTypeMap {
+		for _, v := range urlList {
+			if strings.Index(resourceURL, "//"+v) >= 0 {
+				vendorID = tmpVendorID
+				break
+			}
+		}
+		if vendorID >= 0 {
+			break
+		}
+	}
+	return vendorID
+}

business/model/api_config.go

@@ -72,6 +72,8 @@ var (
 		VendorIDXiaoWM:    "XiaoWM",
 		VendorIDYiLianYun: "Yilianyun",
 		VendorIDZhongWu:   "ZhongWu",
+
+		VendorIDQiNiuCloud: "Qiniu",
 	}
 
 	VendorTypeName = map[int]string{

business/model/common.go

@@ -13,19 +13,13 @@ var (
 type DataResource struct {
 	ModelIDCUL
 
-	HashCode    string `orm:"size(48);unique" json:"hash_code"`
+	HashCode string `orm:"size(48);unique" json:"hashCode"`
-	ResoureType string // 资料的mime type
 
-	Name string `orm:"size(48)" json:"name"`
+	ResoureType string `orm:"size(48)" json:"resoureType"` // 资料的mime type
+	Name        string `orm:"size(48);index" json:"name"`
 
-	MainURL  string
+	MainURL  string `orm:"size(1024);column(main_url);index" json:"mainURL"`
-	QiniuURL string
+	QiniuURL string `orm:"size(1024);column(qiniu_url);index" json:"qiniuURL"`
-	EbaiURL  string
+	EbaiURL  string `orm:"size(1024);column(ebai_url);index" json:"ebaiURL"`
-	MtwmURL  string
+	MtwmURL  string `orm:"size(1024);column(mtwm_url);index" json:"mtwmURL"`
-}
-
-func (*DataResource) TableUnique() [][]string {
-	return [][]string{
-		[]string{"HashCode", "ResoureType"},
-	}
 }

business/model/dao/common.go

@@ -0,0 +1,23 @@
+package dao
+
+import (
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+func GetDataResource(db *DaoDB, hashCode, fullURL string) (dataRes *model.DataResource, err error) {
+	sql := `
+	SELECT t1.*
+	FROM data_resource t1
+	WHERE 1 = 1`
+	sqlParams := []interface{}{}
+	if hashCode != "" {
+		sql += " AND t1.hash_code = ?"
+		sqlParams = append(sqlParams, hashCode)
+	}
+	if fullURL != "" {
+		sql += " AND (t1.main_url = ? OR t1.qiniu_url = ? OR t1.ebai_url = ? OR t1.mtwm_url = ?)"
+		sqlParams = append(sqlParams, fullURL, fullURL, fullURL, fullURL)
+	}
+	err = GetRow(db, &dataRes, sql, sqlParams...)
+	return dataRes, err
+}

controllers/cms.go

@@ -17,7 +17,7 @@ type CmsController struct {
 
 // @Title 得到地点（省，城市，区）信息
 // @Description 得到地点（省，城市，区）信息。
-// @Param	token			header		string	true	"认证token"// @Param	keyword			query		string	false	"查询关键字（可以为空，为空表示不限制）"
+// @Param	token			header		string	true	"认证token"
 // @Param	keyword			query		string	false	"查询关键字（可以为空，为空表示不限制）"
 // @Param	parentCode		query		int		false	"上级地点code，这个指的是国家标准CODE（中国为：100000，北京为：110000，北京市为：110100），不是数据库中的ID"
 // @Param	level			query		int		false	"地点级别：省为1，市为2，区为3，注意直辖市也要分省与市级"
@@ -104,6 +104,23 @@ func (c *CmsController) GetQiniuUploadToken() {
 	})
 }
 
+// @Title 注册数据资源
+// @Description 注册数据资源
+// @Param	token			header		string	true	"认证token"
+// @Param	hashCode		formData	string	true	"md5"
+// @Param	resourceURL		formData	string	true	"资源URL"
+// @Param	mimeType		formData	string	true	"资源MIME类型，当前只支持:image/jpeg,image/png,video/mpeg,video/mp4"
+// @Param	name			formData	string	faslse	"资源名"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /RegisterDataResource [post]
+func (c *CmsController) RegisterDataResource() {
+	c.callRegisterDataResource(func(params *tCmsRegisterDataResourceParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.RegisterDataResource(params.Ctx, params.Name, params.ResourceURL, params.MimeType, params.HashCode)
+		return retVal, "", err
+	})
+}
+
 // @Title 根据坐标得到区码
 // @Description 根据坐标得到区码，坐标都为火星坐标（有些市是没有区的，比如东莞，这种情况下返回的区码是一个假的区域，即市的编码加上9000000）
 // @Param	token			header		string	true	"认证token"
@@ -295,4 +312,4 @@ func (c *CmsController) CreateQrOrBarCode() {
 		retVal, err = jxutils.CreateQrOrBarCode(params.Width, params.Height, params.Codetype, params.SrcData)
 		return retVal, "", err
 	})
-}
+}

globals/beegodb/beegodb.go

@@ -56,6 +56,7 @@ func Init() {
 	orm.RegisterModel(&model.SensitiveWord{})
 	orm.RegisterModel(&model.StoreScore{})
 	orm.RegisterModel(&model.FoodRecipe{}, &model.FoodRecipeStep{}, &model.FoodRecipeItem{}, &model.FoodRecipeItemChoice{}, &model.FoodRecipeUser{})
+	orm.RegisterModel(&model.DataResource{})
 
 	// create table
 	orm.RunSyncdb("default", false, true)

routers/commentsRouter_controllers.go

@@ -385,6 +385,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"],
+        beego.ControllerComments{
+            Method: "RegisterDataResource",
+            Router: `/RegisterDataResource`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"],
         beego.ControllerComments{
             Method: "SendMsg2Somebody",