From 774158ff1644cacc279d84115cc8aaeb40589ce3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 12 一月 2021 11:30:35 +0800
Subject: [PATCH] 调整DoDelete的参数问题
---
fileStack.go | 2 +-
cameraApi.go | 2 +-
ruleTemplateApi.go | 2 +-
client.go | 2 +-
cameraRuleApi.go | 2 +-
httpClient.go | 10 +++++++++-
voiceApi.go | 10 +++++-----
7 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 5321e00..cdd02b7 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -79,7 +79,7 @@
client := NewClient()
paramMap := make(map[string]string,0)
paramMap["cid"] = cid
- body, err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM,nil,paramMap)
+ body, err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM,nil, paramMap, nil)
if err != nil {
return false
}
diff --git a/cameraRuleApi.go b/cameraRuleApi.go
index e0f08a7..767e322 100644
--- a/cameraRuleApi.go
+++ b/cameraRuleApi.go
@@ -132,7 +132,7 @@
func (api CameraRuleApi) DeleteByGroup(groupId string) bool {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/rule/deleteGroup/"+groupId
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 {
logPrint(err)
return false
diff --git a/client.go b/client.go
index d3539b0..21ed3cc 100644
--- a/client.go
+++ b/client.go
@@ -13,7 +13,7 @@
//PUT
DoPutRequest(url string, contentType string, body map[string]interface{}, headers map[string]string) ([]byte, error)
//DELETE
- DoDeleteRequest(url string, contentType string, body map[string]interface{}, headers map[string]string) ([]byte, error)
+ DoDeleteRequest(url string, contentType string, body map[string]interface{}, params map[string]string, headers map[string]string) ([]byte, error)
}
var BASIC_URL = "http://127.0.0.1:8001"
diff --git a/fileStack.go b/fileStack.go
index 178c850..d94432b 100644
--- a/fileStack.go
+++ b/fileStack.go
@@ -134,7 +134,7 @@
func (api FileStackApi) Delete(id string) bool {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileStack/delete/"+id
client := NewClient()
- body,err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM, nil,nil)
+ body,err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM, nil,nil, nil)
if err != nil {
return false
}
diff --git a/httpClient.go b/httpClient.go
index 2cdca21..b4a21c7 100644
--- a/httpClient.go
+++ b/httpClient.go
@@ -140,7 +140,7 @@
}
//鏋勯�燿elete璇锋眰
-func (httpApi HttpClient) DoDeleteRequest(url string, contentType string, body map[string]interface{}, headers map[string]string) ([]byte, error) {
+func (httpApi HttpClient) DoDeleteRequest(url string, contentType string, body map[string]interface{}, params map[string]string, headers map[string]string) ([]byte, error) {
var resultBytes []byte
var bodyJson []byte
if body != nil {
@@ -156,6 +156,14 @@
return resultBytes, err
}
request.Header.Set("Content-type", contentType)
+ //add params
+ q := request.URL.Query()
+ if params != nil {
+ for key, val := range params {
+ q.Add(key, val)
+ }
+ request.URL.RawQuery = q.Encode()
+ }
// add headers
if headers != nil {
for key, val := range headers {
diff --git a/ruleTemplateApi.go b/ruleTemplateApi.go
index f4e1dc7..a78dc8b 100644
--- a/ruleTemplateApi.go
+++ b/ruleTemplateApi.go
@@ -56,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
}
diff --git a/voiceApi.go b/voiceApi.go
index b5bcc11..8297558 100644
--- a/voiceApi.go
+++ b/voiceApi.go
@@ -46,13 +46,13 @@
func (api VoiceApi) Add(id,name,mp3File,g711aFile string) (bool, interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/voice/add"
client := NewClient()
- paramBody := map[string]string{
+ paramBody := map[string]interface{}{
"id": id,
"name": name,
"mp3File": mp3File,
"g711aFile": g711aFile,
}
- respBody, err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody, nil, nil, nil)
+ respBody, err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody, nil, nil)
if err !=nil {
return false, nil
}
@@ -65,12 +65,12 @@
}
func (api VoiceApi) Del(id string) (bool, interface{}) {
- url := api.getBasicUrl() + DATA_URL_PREFIX + "/voice/add"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/voice/del"
client := NewClient()
- paramQuery := map[string]string{
+ paramQuery := map[string]string {
"id": id,
}
- respBody, err := client.DoDeleteRequest(url,paramQuery, nil, nil)
+ respBody, err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM, nil, paramQuery, nil)
if err !=nil {
return false, nil
}
--
Gitblit v1.8.0