From dccc4ad12f01ff31e58c803e6f25c130e240b6f1 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 14 五月 2021 10:46:21 +0800
Subject: [PATCH] fix
---
ruleTemplateApi.go | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/ruleTemplateApi.go b/ruleTemplateApi.go
index 37bcb91..a78dc8b 100644
--- a/ruleTemplateApi.go
+++ b/ruleTemplateApi.go
@@ -1,7 +1,6 @@
package dbapi
import (
- "basic.com/pubsub/protomsg.git"
"encoding/json"
"strconv"
)
@@ -57,7 +56,7 @@
func (api RuleTemplateApi) Delete(id string) bool {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/template/rule/"+id
client := NewClient()
- body, err := client.DoDeleteRequest(url,CONTENT_TYPE_JSON, nil,nil)
+ body, err := client.DoDeleteRequest(url,CONTENT_TYPE_JSON, nil,nil, nil)
if err != nil {
return false
}
@@ -69,7 +68,7 @@
return res.Success
}
-func (api RuleTemplateApi) FindAll() (b bool,templates []protomsg.RuleTemplate) {
+func (api RuleTemplateApi) FindAll() (b bool,d interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/template/rule"
client := NewClient()
body, err := client.DoGetRequest(url,nil,nil)
@@ -83,19 +82,5 @@
logPrint(err)
return false,nil
}
- if !res.Success {
- logPrint(err)
- return false,nil
- }
- bytes,err := json.Marshal(res.Data)
- if err != nil {
- logPrint(err)
- return false, nil
- }
- err = json.Unmarshal(bytes, &templates)
- if err != nil {
- logPrint(err)
- return false, nil
- }
- return true, templates
+ return res.Success, res.Data
}
\ No newline at end of file
--
Gitblit v1.8.0