From 939489162c5e1e63e3c30e4fd41e76106ca634b5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 04 六月 2021 15:29:20 +0800
Subject: [PATCH] fix arg
---
deviceCtlApi.go | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/deviceCtlApi.go b/deviceCtlApi.go
index 0f9438a..5967550 100644
--- a/deviceCtlApi.go
+++ b/deviceCtlApi.go
@@ -9,11 +9,21 @@
}
-func (api DeviceCtlApi) DevAuthApply(paramBody map[string]interface{}) (bool,interface{}) {
+func (api DeviceCtlApi) DevAuthApply(devId string, ip string, key string) (bool,interface{}) {
url := DATA_URL_PREFIX + "/devAuth/apply"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ dest := &bhome_msg.BHAddress{
+ Ip: []byte(ip),
+ }
+ netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
+ Addr: dest,
+ })
client := NewClient(WithNodes(netNode))
+ paramBody := map[string]interface{} {
+ "key": key,
+ "fromDevId": devId,
+ "fromIp": ip,
+ }
body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
if err != nil {
return false,nil
@@ -27,12 +37,15 @@
return res.Success,res.Data
}
-func (api DeviceCtlApi) DevDetail(paramBody map[string]interface{}) (bool, interface{}) {
+func (api DeviceCtlApi) DevDetail(devId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/device/detail"
netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ paramQuery := map[string]string {
+ "devId": devId,
+ }
client := NewClient(WithNodes(netNode))
- body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
+ body,err := client.DoGetRequest(url,paramQuery,nil)
if err != nil {
return false,nil
}
@@ -48,9 +61,11 @@
//鎺у埗鍏朵粬鑺傜偣鍒涘缓闆嗙兢
func (api DeviceCtlApi) RemoteCreateCluster(devId string, ip string, paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/createCluster"
- netNode := append([]bhome_msg.BHAddress{}, bhome_msg.BHAddress{
+ dest := &bhome_msg.BHAddress{
Ip: []byte(ip),
-
+ }
+ netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
+ Addr: dest,
})
client := NewClient(WithNodes(netNode))
@@ -71,9 +86,11 @@
//鎺у埗鍏朵粬鑺傜偣鎼滅储闆嗙兢
func (api DeviceCtlApi) RemoteSearchCluster(devId string, ip string, paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/search"
- netNode := append([]bhome_msg.BHAddress{}, bhome_msg.BHAddress{
+ dest := &bhome_msg.BHAddress{
Ip: []byte(ip),
-
+ }
+ netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
+ Addr: dest,
})
client := NewClient(WithNodes(netNode))
@@ -94,9 +111,11 @@
//鑾峰彇杩滅▼璁惧鎼滅储鍒伴泦缇よ妭鐐瑰垪琛�
func (api DeviceCtlApi) RemoteGetSearchNodes(devId string, ip string, paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/getSearchNodes"
- netNode := append([]bhome_msg.BHAddress{}, bhome_msg.BHAddress{
+ dest := &bhome_msg.BHAddress{
Ip: []byte(ip),
-
+ }
+ netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
+ Addr: dest,
})
client := NewClient(WithNodes(netNode))
@@ -117,9 +136,11 @@
//鎺у埗鍏朵粬鑺傜偣璁惧鍔犲叆闆嗙兢
func (api DeviceCtlApi) RemoteJoinCluster(devId string, ip string, paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/joinCluster"
- netNode := append([]bhome_msg.BHAddress{}, bhome_msg.BHAddress{
+ dest := &bhome_msg.BHAddress{
Ip: []byte(ip),
-
+ }
+ netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
+ Addr: dest,
})
client := NewClient(WithNodes(netNode))
@@ -140,9 +161,11 @@
//杩滅▼鎺у埗璁惧閲嶅惎
func (api DeviceCtlApi) RemoteReboot(devId string, ip string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/reboot"
- netNode := append([]bhome_msg.BHAddress{}, bhome_msg.BHAddress{
+ dest := &bhome_msg.BHAddress{
Ip: []byte(ip),
-
+ }
+ netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
+ Addr: dest,
})
client := NewClient(WithNodes(netNode))
@@ -165,9 +188,11 @@
//杩滅▼鎺у埗绠楁硶鎴栧簲鐢ㄥ嵏杞�
func (api DeviceCtlApi) RemoteUninstall(devId string, ip string, id string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/sdk/remoteUninstall"
- netNode := append([]bhome_msg.BHAddress{}, bhome_msg.BHAddress{
+ dest := &bhome_msg.BHAddress{
Ip: []byte(ip),
-
+ }
+ netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
+ Addr: dest,
})
client := NewClient(WithNodes(netNode))
@@ -190,10 +215,13 @@
//杩滅▼鎺у埗璁惧绯荤粺鏇存柊
func (api DeviceCtlApi) RemoteSysUpdate(devId string, ip string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/remoteSysUpdate"
- netNode := append([]bhome_msg.BHAddress{}, bhome_msg.BHAddress{
+ dest := &bhome_msg.BHAddress{
Ip: []byte(ip),
-
+ }
+ netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
+ Addr: dest,
})
+
client := NewClient(WithNodes(netNode))
body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, nil,nil)
--
Gitblit v1.8.0