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
---
controllers/ruleTemplate.go | 18 +-----------------
1 files changed, 1 insertions(+), 17 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, "")
}
--
Gitblit v1.8.0