heyujie
2021-11-26 e904a0672267d8f1b25fe92d0b08282f8b5b8d18
deviceCtlApi.go
@@ -1,7 +1,7 @@
package bhomedbapi
import (
   "basic.com/valib/bhshmq.git/proto/source/bhome_msg"
   "basic.com/valib/c_bhomebus.git/proto/source/bhome_msg"
   "encoding/json"
)
@@ -9,10 +9,10 @@
}
func (api DeviceCtlApi) DevAuthApply(devId string, ip string, key string) (bool,interface{}) {
func (api DeviceCtlApi) DevAuthApply(targetIp string, fromDevId string, fromIp string, key string) (bool,interface{}) {
   url := DATA_URL_PREFIX + "/devAuth/apply"
   dest := &bhome_msg.BHAddress{
      Ip: []byte(ip),
      Ip: []byte(targetIp),
   }
   netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
      Addr: dest,
@@ -20,9 +20,9 @@
   client := NewClient(WithNodes(netNode))
   paramBody := map[string]interface{} {
      "key": key,
      "fromDevId": devId,
      "fromIp": ip,
      "key":       key,
      "fromDevId": fromDevId,
      "fromIp":    fromIp,
   }
   body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
   if err != nil {
@@ -37,9 +37,15 @@
   return res.Success,res.Data
}
func (api DeviceCtlApi) DevDetail(devId string) (bool, interface{}) {
func (api DeviceCtlApi) DevDetail(targetIp string, devId string) (bool, interface{}) {
   url := DATA_URL_PREFIX + "/device/detail"
   netNode := getNetNode(url2Topic(Topic_System_Service,url))
   dest := &bhome_msg.BHAddress{
      Ip: []byte(targetIp),
   }
   netNode := append([]*bhome_msg.MsgQueryTopicReply_BHNodeAddress{}, &bhome_msg.MsgQueryTopicReply_BHNodeAddress{
      Addr: dest,
   })
   paramQuery := map[string]string {
      "devId": devId,