~suntianyu/webserver.git

			@@ -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, "")
			}

			@@ -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

			@@ -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=

	controllers/ruleTemplate.go	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	go.mod	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	go.sum	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史