add ruleSo

liuxiaolong

2020-07-14 aaa7697d6ec77e03d96ce36ca66abcbbcf2bb7a3

add ruleSo

 go.mod

@@ -8,7 +8,7 @@
    basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b
    basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48
    basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777
    basic.com/pubsub/protomsg.git v0.0.0-20200713121914-e80c3299f321 // indirect
    basic.com/pubsub/protomsg.git v0.0.0-20200714032739-19aa932d8628 // indirect
    basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe
    basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
    basic.com/valib/godraw.git v0.0.0-20191122082247-26e9987cd183

 go.sum

@@ -10,8 +10,8 @@
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777 h1:gTeuhepfLgOchD6bqydsGGV6KCj/UaseQQgo4DFyhGQ=
basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
basic.com/pubsub/protomsg.git v0.0.0-20200713121914-e80c3299f321 h1:TQYJPJASAnRu11JxR9R0FYCsGrQlde1Yu02AG1frra8=
basic.com/pubsub/protomsg.git v0.0.0-20200713121914-e80c3299f321/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20200714032739-19aa932d8628 h1:f3pB0TavNjC5nmxg/FAIFBnVd373MoRhp7+l8yo3BT0=
basic.com/pubsub/protomsg.git v0.0.0-20200714032739-19aa932d8628/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe h1:uh3u7DuSOw6AwzvPC1EM19sw1Skks1EUJddcbHDKI9M=
basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=

 service/SdkDownLoad.go

@@ -142,21 +142,16 @@
            Installed: true,
        }
        sdk := Sdk{
            Id: ls.Id,
            IpcId: ls.IpcId,
            SdkType: ls.SdkType,
            SdkName: ls.SdkName,
            Icon: ls.Icon,
            Url: ls.Url,
            CreateTime: ls.CreateTime,
            CreateBy: ls.CreateBy,
            UpdateTime: ls.UpdateTime,
            Enable: ls.Enable,
            DelFlag: int(ls.DelFlag),
            IconBlob: ls.IconBlob,
            Version: ls.Version,
            ArgDef: ls.ArgDef,
        }
        var sc SdkCommon
        sc.copyFromProto(ls)
        sdk.SdkCommon = sc

        for _,arg := range ls.Args {
            sdk.Args = append(sdk.Args, SdkArg{
                Alias: arg.Alias,

 service/SdkInstall.go

@@ -2,6 +2,7 @@

import (
    "basic.com/dbapi.git"
    "basic.com/pubsub/protomsg.git"
    "basic.com/valib/licence.git"
    "basic.com/valib/logger.git"
    "encoding/json"
@@ -213,17 +214,8 @@
                                    soM[skd.Def.SdkType] = skd
                                }
                                if _,ok := aInsM[skd.Def.Id]; ok {
                                    srv := SdkRegisterVo{
                                        Id: skd.Def.Id,
                                        SdkType: skd.Def.SdkType,
                                        SdkName: skd.Def.SdkName,
                                        Icon: skd.Def.Icon,
                                        Url: skd.Def.Url,
                                        IconBlob: skd.Def.IconBlob,
                                        Version: skd.Def.Version,
                                        EnTrack: skd.Def.EnTrack,
                                        ArgDef: skd.Def.ArgDef,
                                    }
                                    srv := SdkRegisterVo{}
                                    srv.SdkCommon = skd.Def.SdkCommon
                                    for _,ag := range skd.Args {
                                        sra := SdkRegisterArgVo{
                                            Scope: ag.Scope,
@@ -374,23 +366,41 @@
}

type Sdk struct {
    Id                 string         `gorm:"column:id;primary_key;type:varchar(50);unique;not null;" json:"id"`
    IpcId           string         `gorm:"column:ipc_id" json:"ipc_id"`
    SdkType         string         `gorm:"column:sdk_type" json:"sdk_type"`
    SdkName         string         `gorm:"column:sdk_name" json:"sdk_name" example:"人脸检测"`
    Icon            string         `gorm:"column:icon" json:"icon,omitempty"`
    Url             string         `gorm:"column:url" json:"url,omitempty" example:"http://ip:port/govideo/sdk/1"`
    SdkCommon
    CreateTime         string         `gorm:"column:create_time" json:"create_time"`
    CreateBy         string         `gorm:"column:create_by" json:"create_by"`
    UpdateTime         string         `gorm:"column:update_time" json:"update_time"`
    Enable             bool         `gorm:"column:enable;default:1" json:"enable"`
    DelFlag         int         `gorm:"column:del_flag;default:0" json:"del_flag"`
    Env             string         `gorm:"column:env" json:"env"` //运行环境及结果说明，json格式，包含so_file_path,runtime,param,depends(cuda版本，opencv版本，tensorflow版本等)
    IconBlob         string         `gorm:"column:iconBlob;type:text;" json:"iconBlob"` //图片
    Version         string         `gorm:"column:version;type:varchar(50);default:'1.0';" json:"version"` //版本号

    Args             []SdkArg     `json:"args"`
    EnTrack         bool         `gorm:"column:enTrack" json:"enTrack"`
    ArgDef             string         `gorm:"column:argDef" json:"argDef"` //算法参数默认配置
}

func (sc *SdkCommon) copyFromProto(pSdk protomsg.Sdk) {
    sc.Id = pSdk.Id
    sc.IpcId = pSdk.IpcId
    sc.SdkType = pSdk.SdkType
    sc.SdkName = pSdk.SdkName
    sc.Icon = pSdk.Icon
    sc.Url = pSdk.Url
    sc.IconBlob = pSdk.IconBlob
    sc.Version = pSdk.Version
    sc.ArgDef = pSdk.ArgDef
    sc.RuleSo = pSdk.RuleSo
}

type SdkCommon struct {
    Id                 string                 `json:"id"`
    IpcId           string                 `json:"ipc_id"`
    SdkType         string                 `json:"sdk_type"`//人脸检测：FaceDetect,人脸提取：FaceExtract,人脸比对：FaceCompare,行为：Yolo
    SdkName         string                 `json:"sdk_name"`    //算法名称
    Icon            string                 `json:"icon"`       //算法图标
    Url             string                 `json:"url"`        //算法下载地址
    IconBlob         string                 `json:"iconBlob"` //图片
    Version         string                 `json:"version"` //版本号
    EnTrack         bool                 `json:"enTrack"`  //是否开启跟踪
    ArgDef             string                 `json:"argDef"`   //算法默认参数定义
    RuleSo             string                 `json:"rule_so"`
}

type SdkInsOrUpgrade struct {
@@ -422,16 +432,8 @@


type SdkRegisterVo struct {
    Id                 string                 `json:"id"`
    SdkType         string                 `json:"sdk_type"`//人脸检测：FaceDetect,人脸提取：FaceExtract,人脸比对：FaceCompare,行为：Yolo
    SdkName         string                 `json:"sdk_name"`    //算法名称
    SdkCommon
    Args            []SdkRegisterArgVo     `json:"args"` //算法参数
    Icon            string                 `json:"icon"`       //算法图标
    Url             string                 `json:"url"`        //算法下载地址
    IconBlob         string                 `json:"iconBlob"` //图片
    Version         string                 `json:"version"` //版本号
    EnTrack         bool                 `json:"enTrack"`  //是否开启跟踪
    ArgDef             string                 `json:"argDef"`   //算法默认参数定义
}

type SdkRegisterArgVo struct {