From 4b7ed3afe62ac7258816c381550743255fdeb43f Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期三, 15 七月 2020 11:54:12 +0800 Subject: [PATCH] update dbapi and add saveLinkRules ret --- go.sum | 4 ++-- go.mod | 2 +- controllers/cameraRule.go | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/controllers/cameraRule.go b/controllers/cameraRule.go index ba2fdc1..91dd16e 100644 --- a/controllers/cameraRule.go +++ b/controllers/cameraRule.go @@ -114,10 +114,11 @@ } param := util.Struct2Map(saveBody) var api dbapi.CameraRuleApi - if api.SaveLinkRulesByGroup(param) { - util.ResponseFormat(c,code.Success,saveBody) + b,d := api.SaveLinkRulesByGroup(param) + if b { + util.ResponseFormat(c,code.Success, d) } else { - util.ResponseFormat(c,code.ComError, "") + util.ResponseFormat(c,code.ComError, d) } } diff --git a/go.mod b/go.mod index 35195b0..d9d30ad 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ go 1.12 require ( - basic.com/dbapi.git v0.0.0-20200713073800-5e7865c0c5eb // indirect + basic.com/dbapi.git v0.0.0-20200715034924-efff0090a654 // 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 diff --git a/go.sum b/go.sum index 1e42a94..b29870f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -basic.com/dbapi.git v0.0.0-20200713073800-5e7865c0c5eb h1:jfnAwVU85zmkcbPjyJe3Qw9EqrHXBOPa/o8CJ9vP0hc= -basic.com/dbapi.git v0.0.0-20200713073800-5e7865c0c5eb/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q= +basic.com/dbapi.git v0.0.0-20200715034924-efff0090a654 h1:yrnv0xPsvIrliekTS7L6pLEoabmyaHkqP/mo6dJrVDc= +basic.com/dbapi.git v0.0.0-20200715034924-efff0090a654/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= -- Gitblit v1.8.0