From 6057de8f11430c7834c2e816d2223d6ed0009e5e Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 28 八月 2020 21:02:58 +0800
Subject: [PATCH] add acpApi
---
areaApi.go | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/areaApi.go b/areaApi.go
index e1d10ca..e23ee39 100644
--- a/areaApi.go
+++ b/areaApi.go
@@ -2,10 +2,25 @@
import (
"encoding/json"
- "fmt"
+ "strconv"
)
type AreaApi struct {
+ Ip string
+ Port int
+}
+
+func (api AreaApi) getBasicUrl() string {
+ if api.Ip == "" {
+ return BASIC_URL
+ }
+ if api.Ip == "" {
+ api.Ip = DEFAULT_IP
+ }
+ if api.Port == 0 {
+ api.Port = DEFAULT_PORT
+ }
+ return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
}
//parentId 瑕佹煡瀵荤殑鐩綍鏍戠殑鏍硅妭鐐筰d
@@ -16,7 +31,7 @@
client := NewClient()
- url := BASIC_URL + DATA_URL_PREFIX + "/area/localmenu"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/localmenu"
params := make(map[string]string, 0)
params["parentId"] = parentId
params["searchType"] = searchType
@@ -47,7 +62,7 @@
client := NewClient()
- url := BASIC_URL + DATA_URL_PREFIX + "/area/gb28181Tree"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/gb28181Tree"
params := make(map[string]string, 0)
params["parentId"] = parentId
params["searchType"] = searchType
@@ -72,7 +87,7 @@
func (api AreaApi) Gb28181TreeRefresh(id string) bool {
flag := false
- url := BASIC_URL + DATA_URL_PREFIX + "/area/gb28181TreeRefresh"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/gb28181TreeRefresh"
client := NewClient()
paramBody := map[string]interface{}{
"id":id,
@@ -91,7 +106,7 @@
func (api AreaApi) Gb28181TreeDelete() bool {
flag := false
- url := BASIC_URL + DATA_URL_PREFIX + "/area/gb28181TreeDelete"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/gb28181TreeDelete"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, nil, nil, nil)
if err != nil {
@@ -108,7 +123,7 @@
//娣诲姞鐩綍鑺傜偣
func (api AreaApi) AreaAdd(paramBody map[string]interface{}) bool {
flag := false
- url := BASIC_URL + DATA_URL_PREFIX + "/area/add"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/add"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
@@ -125,7 +140,7 @@
//鐩綍鏇存柊
func (api AreaApi) AreaUpdate(paramBody map[string]interface{}) bool {
flag := false
- url := BASIC_URL + DATA_URL_PREFIX + "/area/update"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/update"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil, nil)
@@ -134,7 +149,7 @@
}
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return flag
}
flag = res.Success
@@ -147,7 +162,7 @@
if id == "" {
return flag
}
- url := BASIC_URL + DATA_URL_PREFIX + "/area/del"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/area/del"
client := NewClient()
paramBody := make(map[string]interface{}, 0)
paramBody["id"] = id
--
Gitblit v1.8.0