update protomsg and fix GetPollConfig

liuxiaolong

2019-12-04 9169334afe5385ad41286a99cfd68a6a8fe89e22

update protomsg and fix GetPollConfig

 controllers/pollConfig.go

@@ -78,9 +78,15 @@
// @Router /data/api-v/pollConfig/getPollConfig [get]
func (controller PollConfigController) GetPollConfig(c *gin.Context) {
    var api dbapi.SysSetApi
    b, data := api.GetPollConfig()
    b, d := api.GetPollConfig()
    if b {
        util.ResponseFormat(c, code.Success, data)
        util.ResponseFormat(c, code.Success, map[string]interface{}{
            "server_id": d.ServerId,
            "poll_period": d.PollPeriod,
            "delay": d.Delay,
            "enable": d.Enable,
            "pollChannelCount": d.PollChannelCount,
        })
    } else {
        util.ResponseFormat(c, code.ComError, "查询失败")
    }

 go.mod

@@ -8,7 +8,7 @@
    basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect
    basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
    basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae // indirect
    basic.com/pubsub/protomsg.git v0.0.0-20191203090006-ecdaf2f00a5d // indirect
    basic.com/pubsub/protomsg.git v0.0.0-20191204052447-abd6d2381b39 // indirect
    basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627 // indirect
    basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
    basic.com/valib/godraw.git v0.0.0-20191122082247-26e9987cd183 // indirect

 go.sum

@@ -8,8 +8,8 @@
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae h1:/j1dIDLxzEp51N+ZHZIq1xeYVK9zz8epWEAfw01uWe8=
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
basic.com/pubsub/protomsg.git v0.0.0-20191203090006-ecdaf2f00a5d h1:EnBuOjqgcOug/tnjAOgmtGLmA7kotxVt4ZMcaHkz1L0=
basic.com/pubsub/protomsg.git v0.0.0-20191203090006-ecdaf2f00a5d/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20191204052447-abd6d2381b39 h1:Oq28Qs2tijZOE4FY88+3zs+zPbGE/8pWf/KCPgc0dgk=
basic.com/pubsub/protomsg.git v0.0.0-20191204052447-abd6d2381b39/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627 h1:26J3wU05U/v72SvUvtFc6Ymgvlill9SXbRn/cMGE5k0=
basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=