From 3cb849ad816adae964486f7760bbf387e3a66ba0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 17 五月 2019 18:36:58 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/dbapi
---
cameraApi.go | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 2b3d484..03b85c6 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -9,9 +9,10 @@
//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
func (api CameraApi) GetCameraById(cameraId string) (result Camera, err error) {
- url := BASIC_URL + "/data/api-v/camera/show/" + cameraId
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/show/" + cameraId
+ client := NewClient()
- body, err := DoGetRequest(url, nil, nil)
+ body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
return result, err
}
@@ -19,6 +20,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
fmt.Println(err)
+ return result,err
}
bytes, _ := json.Marshal(res.Data)
--
Gitblit v1.8.0