From caacbd057c3c23ecef47f5809be20cab7795a733 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 02 三月 2020 17:25:31 +0800
Subject: [PATCH] update protomsg
---
go.sum | 8 ++++----
go.mod | 4 ++--
controllers/fileAnalysis.go | 3 ++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/controllers/fileAnalysis.go b/controllers/fileAnalysis.go
index b212ded..9f00c4b 100644
--- a/controllers/fileAnalysis.go
+++ b/controllers/fileAnalysis.go
@@ -166,6 +166,7 @@
typ,_ := strconv.Atoi(c.Query("type"))
page,_ := strconv.Atoi(c.Query("page"))
size,_ := strconv.Atoi(c.Query("size"))
+ name := c.Query("name")
if page <= 0 {
page = 1
}
@@ -173,7 +174,7 @@
size = 20
}
var api dbapi.FileAnalysisApi
- arr,err := api.FindByStackId(stackId, typ, page, size)
+ arr,err := api.FindByStackId(stackId, typ, name, page, size)
if err !=nil {
util.ResponseFormat(c,code.ComError, "")
} else {
diff --git a/go.mod b/go.mod
index 0825b15..2b74597 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,12 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20200228105958-9b16fecd94fa
+ basic.com/dbapi.git v0.0.0-20200302092237-0ce10d63b425 // indirect
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb
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-20200224091726-767497061096
+ basic.com/pubsub/protomsg.git v0.0.0-20200229094046-b917b48b905c // 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 // indirect
diff --git a/go.sum b/go.sum
index 9b7b269..b9de7c8 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20200228105958-9b16fecd94fa h1:AQFGsK4UOlRWrDdLugSPiBPgqd3+Eb25C9O91KFGn3k=
-basic.com/dbapi.git v0.0.0-20200228105958-9b16fecd94fa/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20200302092237-0ce10d63b425 h1:uSdKODTLCbZLUM90bFpTj1gkwchTeCWz+5AtbOMumjU=
+basic.com/dbapi.git v0.0.0-20200302092237-0ce10d63b425/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb h1:fM6DojeInFSCFO+wkba1jtyPiSDqw0jYKi4Tk+e+ka4=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb/go.mod h1:FTryK8BsVLfUplx8a3+l8hJWub6VbAWZCUH7sPRZaso=
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b h1:Qh7x2PY3HA9B404Llq+olY5/YlGYrM58bpOHa2CGcro=
@@ -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-20200224091726-767497061096 h1:GjxPmxqERVTVxOMgcZhd+N5VtFVB5fh7IKCrQUuhIIE=
-basic.com/pubsub/protomsg.git v0.0.0-20200224091726-767497061096/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20200229094046-b917b48b905c h1:82f2LQLEIqgQj33nxMSVbeW1azS215dfRoQ5RPhu3io=
+basic.com/pubsub/protomsg.git v0.0.0-20200229094046-b917b48b905c/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=
--
Gitblit v1.8.0