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 |   23 +++++++++++++----------
 entites.go    |    6 ++++++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/entites.go b/entites.go
index 5406f40..0feb2ac 100644
--- a/entites.go
+++ b/entites.go
@@ -8,6 +8,12 @@
 	RtspServrPort  int    `json:"rtspservrport"`  //RTSP鏈嶅姟鐨勭鍙�
 	HTTPClientIP   string `json:"httpclientip"`   //HTTP瀹㈡埛绔殑ip锛堢敤浜庢姤璀﹂�氱煡锛屼竴鑸笉璁剧疆锛�
 	HTTPClientPort int    `json:"httpclientport"` //HTTP瀹㈡埛绔殑绔彛锛堢敤浜庢姤璀﹂�氱煡锛屼竴鑸笉璁剧疆锛�
+	RegisterAuth   bool   `json:"registerauth"`   //鏄惁鍚敤娉ㄥ唽閴存潈 榛樿鍚敤
+	Md5Auth        bool   `json:"md5auth"`        //鏄惁鍚敤MD5閴存潈  榛樿鍚敤
+	DbAuth         bool   `json:"dbauth"`         //鏄惁鍚敤鏁版嵁搴撻壌鏉�  榛樿涓嶅惎鐢�
+	GbUsername     string `json:"gbusername"`     //鍥芥爣閴存潈鐢ㄦ埛鍚�
+	GbPasswd       string `json:"gbpasswd"`       //鍥芥爣閴存潈瀵嗙爜
+	NatIP          string `json:"natip"`          //绌跨綉ip
 }
 
 //GbResult 杩斿洖鍊间俊鎭�
diff --git a/gb28181Api.go b/gb28181Api.go
index 8a5241c..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
 }
 

--
Gitblit v1.8.0