From 82f5683c4f8045947f574cc68a2ad960ac154797 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 23 十月 2019 16:29:37 +0800
Subject: [PATCH] 增加鉴权设置

---
 gb28181Api.go |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/gb28181Api.go b/gb28181Api.go
index e2f37a6..d385980 100644
--- a/gb28181Api.go
+++ b/gb28181Api.go
@@ -25,17 +25,18 @@
 
 //SetPlatformServerInfo 璁剧疆鏈嶅姟鍣ㄤ俊鎭�
 func (api Gb28181Api) SetPlatformServerInfo(serverInfo GbServerInfo) bool {
-	url := BASIC_URL + DATA_URL_PREFIX + "/set_platform_server"
+	serverInfo.GbUsername = serverInfo.PublicID   //閴存潈鍚嶅瓧涓嶇敓鏁堬紝鏈�濂藉拰璁惧id涓�鑷�
+	url := BASIC_URL + DATA_URL_PREFIX + "/set_platform_server?" +
+		"gbsvrname=" + serverInfo.Name +
+		"&gbsvrid=" + serverInfo.PublicID +
+		"&gbsvrport=" + strconv.Itoa(serverInfo.GbServerPort) +
+		"&registerauth=" + strconv.FormatBool(serverInfo.RegisterAuth) +
+		"&gbusername=" + serverInfo.GbUsername +
+		"&gbpasswd=" + serverInfo.GbPasswd
+	fmt.Println("url:", url)
+
 	client := NewClient()
-
-	paramBody := make(map[string]string, 0)
-	paramBody["gbsvrid"] = serverInfo.PublicID
-	paramBody["gbsvrport"] = strconv.Itoa(serverInfo.GbServerPort)
-	paramBody["gbsvrname"] = serverInfo.Name
-	paramBody["rtspsvrport"] = strconv.Itoa(serverInfo.RtspServrPort)
-
-	// fmt.Println("url:", url)
-	body, err := client.DoGetRequest(url, paramBody, nil)
+	body, err := client.DoGetRequest(url, nil, nil)
 	if err != nil {
 		return false
 	}
@@ -307,6 +308,7 @@
 		}
 	}
 
+	log.Println("dmUnits:", dmUnits)
 	return dmUnits, true
 }
 
@@ -348,6 +350,7 @@
 
 	api.getGroupsByGroupID(devID, &dmUnitAll)
 
+	log.Println("dmUnitAll:", dmUnitAll)
 	return dmUnitAll
 }
 
@@ -404,8 +407,8 @@
 	return cameraSlice, true
 }
 
-//UpdateResource 鏇存柊涓嬬骇骞冲彴璧勬簮
-func (api Gb28181Api) UpdateResource(devID string) bool {
+//updateResourceByID 鏇存柊涓嬬骇骞冲彴璧勬簮
+func (api Gb28181Api) updateResourceByID(devID string) bool {
 	url := BASIC_URL + "/vss/get_catalog/" + devID
 	client := NewClient()
 
@@ -428,6 +431,15 @@
 	return true
 }
 
+func (api Gb28181Api) UpdateAllResource() {
+	devices, b := api.GetAllDevices()
+	if b && len(devices) > 0 {
+		for _, device := range devices {
+			api.updateResourceByID(device.PublicID)
+		}
+	}
+}
+
 //SetCameraPtz 2.3 PTZ浜戝彴鎺у埗
 //"channelid":  (瀛楃涓�)   閫氶亾20浣嶇紪鍙�
 //"ptztype"锛�   (瀛楃涓�) 鎺у埗绫诲瀷锛氫笂"up",涓�"down",宸�"left",鍙�"right",宸︿笂"leftup",宸︿笅"leftdown",鍙充笂"rightup",鍙充笅"rightdown",闀滃ご杩�"zoomin",闀滃ご杩�"zoomout",

--
Gitblit v1.8.0