update protomsg,sdk active add sdkId arg and fix camera show

liuxiaolong

2020-07-21 5bc1834adc6d6fe1b49f6cf54e2383d69311b113

update protomsg,sdk active add sdkId arg and fix camera show

 controllers/camera.go

@@ -165,6 +165,8 @@
    //2019-11-02新增需求，显示每个摄像机的处理服务器信息,归属的节点服务器名称
    m := util.Struct2Map(camera)
    m["runServerName"] = ""
    m["voiceEnable"] = camera.VoiceEnable
    m["voiceId"] = camera.VoiceId
    m["resolution_width"] = camera.ResolutionWidth
    m["resolution_height"] = camera.ResolutionHeight
    //摄像机分辨率

 controllers/sdk.go

@@ -327,19 +327,21 @@
// @Produce json
// @Tags 算法
// @Param code query string true "激活码"
// @Param sdkId query string true "算法id"
// @Success 200 {string} json "{"code":200, msg:"", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
// @Router /data/api-v/sdk/active [get]
func (sc SdkController) Active(c *gin.Context) {
    cod := c.GetString("code")
    if cod == "" {
        util.ResponseFormat(c, code.RequestParamError, "激活码不能为空")
    sdkId := c.GetString("sdkId")
    if cod == "" || sdkId == "" {
        util.ResponseFormat(c, code.RequestParamError, "激活码和算法id不能为空")
        return
    }
    var sv service.SdkInstallService
    err := sv.Active(cod)
    d, err := sv.Active(cod, sdkId)
    if err == nil {
        util.ResponseFormat(c,code.Success,  "激活成功")
        util.ResponseFormat(c,code.Success,  d)
    } else {
        util.ResponseFormat(c,code.ComError, err.Error())
    }

 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-20200714032739-19aa932d8628 // indirect
    basic.com/pubsub/protomsg.git v0.0.0-20200717053920-8abba8d57185 // 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-20200714032739-19aa932d8628 h1:f3pB0TavNjC5nmxg/FAIFBnVd373MoRhp7+l8yo3BT0=
basic.com/pubsub/protomsg.git v0.0.0-20200714032739-19aa932d8628/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20200717053920-8abba8d57185 h1:+VNHJFYU7Y3fYP7nWC3r/1FOGZIo/rVG+RmClqbAW1k=
basic.com/pubsub/protomsg.git v0.0.0-20200717053920-8abba8d57185/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/SdkInstall.go

@@ -22,16 +22,17 @@

}

func (sv SdkInstallService) Active(cod string) error {
func (sv SdkInstallService) Active(cod string, sdkId string) (interface{},error) {
    //使用激活码激活算法
    url := "http://"+config.ShopConf.Url+"/data/api-s/sdk/activeByAINode"
    machineCode := licence.GetMachineCode()
    if machineCode == "" {
        logger.Debug("获取机器码失败")
        return errors.New("获取机器码失败")
        return nil, errors.New("获取机器码失败")
    }
    paramBody := map[string]interface{}{
        "code": cod,
        "sdkId": sdkId,
        "machineCode": machineCode,
    }
    header := map[string]string {
@@ -40,19 +41,19 @@
    respBody, err := reqUtil.DoPostRequest(url, reqUtil.CONTENT_TYPE_JSON, paramBody, nil, header)
    if err != nil {
        logger.Debug("DoPostRequest err:", err)
        return err
        return nil, err
    }
    var res dbapi.Result
    if err = json.Unmarshal(respBody, &res); err != nil {
        logger.Debug("unmarshal err:", err)
        return err
        return nil, err
    }
    if !res.Success {
        logger.Debug("res.Data:", res.Data)
        return errors.New("请求商城失败")
        return nil, errors.New("请求商城失败")
    }

    return nil
    return res.Data, nil
}

//算法安装包安装
@@ -281,26 +282,26 @@
                            }
                        } else {
                            logger.Debug("反序列化算法定义信息失败")
                            return false, errors.New("不是正确的安装包文件")
                            return false, errors.New("错误的安装包")
                        }
                    } else {
                        logger.Debug("读取算法定义信息失败")
                        return false, errors.New("不是正确的安装包文件")
                        return false, errors.New("错误的安装包")
                    }
                } else {
                    logger.Debug("算法定义信息丢失")
                    return false, errors.New("不是正确的算法安装包文件")
                    return false, errors.New("错误的安装包")
                }
            } else {
                logger.Debug("反序列化授权信息失败")
                return false, errors.New("不是正确的算法安装包文件")
                return false, errors.New("错误的安装包")
            }
        } else {
            logger.Debug("读取授权文件失败")
            return false, errors.New("不是正确的算法安装包文件")
            return false, errors.New("错误的安装包")
        }
    } else {
        return false, errors.New("不是正确的算法安装包文件")
        return false, errors.New("错误的安装包")
    }

    return true, nil