From f63bc298dda402e8acd6509d1e098354c680efb9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期日, 28 六月 2020 14:51:29 +0800
Subject: [PATCH] fix ruleTemplate findAll
---
go.sum | 4 ++--
go.mod | 2 +-
controllers/ruleTemplate.go | 18 +-----------------
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/controllers/ruleTemplate.go b/controllers/ruleTemplate.go
index fcb05f5..525b858 100644
--- a/controllers/ruleTemplate.go
+++ b/controllers/ruleTemplate.go
@@ -2,9 +2,6 @@
import (
"basic.com/dbapi.git"
- "basic.com/pubsub/protomsg.git"
- "bytes"
- "encoding/json"
"github.com/gin-gonic/gin"
"github.com/gogo/protobuf/jsonpb"
"webserver/extend/code"
@@ -108,20 +105,7 @@
var api dbapi.RuleTemplateApi
b, templates := api.FindAll()
if b {
- var result protomsg.RuleTemplateList
- for _,r := range templates {
- result.List = append(result.List, &r)
- }
-
- var _buffer bytes.Buffer
- err := jsonpbMarshaler.Marshal(&_buffer, &result)
- if err == nil {
- jsonB := _buffer.Bytes()
- var m map[string]interface{}
- json.Unmarshal(jsonB, &m)
- util.ResponseFormat(c,code.Success, m)
- return
- }
+ util.ResponseFormat(c,code.Success, templates)
} else {
util.ResponseFormat(c, code.ComError, "")
}
diff --git a/go.mod b/go.mod
index 19ed098..202cf40 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20200624110237-a6e8debca64b // indirect
+ basic.com/dbapi.git v0.0.0-20200628064907-2918646e770d // 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 05588f9..f5c9127 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20200624110237-a6e8debca64b h1:JspPr7IsNBBq9TrlfWZjFMWKobkhkvHC8d+MUJp8VaU=
-basic.com/dbapi.git v0.0.0-20200624110237-a6e8debca64b/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20200628064907-2918646e770d h1:wTtyNS+5Jkm06w+PqXDyvD6+k7BbdevpH5Gfx9obij8=
+basic.com/dbapi.git v0.0.0-20200628064907-2918646e770d/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