From 01dfd9dc8de7b19f9dfa4284722e01bbd5837801 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 19 一月 2024 09:10:30 +0800
Subject: [PATCH] replace json to json-iterator

---
 deviceCtlApi.go |  163 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 101 insertions(+), 62 deletions(-)

diff --git a/deviceCtlApi.go b/deviceCtlApi.go
index 0f9438a..a92ddfc 100644
--- a/deviceCtlApi.go
+++ b/deviceCtlApi.go
@@ -1,211 +1,250 @@
 package bhomedbapi
 
 import (
-	"basic.com/valib/bhshmq.git/proto/source/bhome_msg"
-	"encoding/json"
+	"basic.com/valib/c_bhomebus.git/proto/source/bhome_msg"
+	jsoniter "github.com/json-iterator/go"
 )
 
 type DeviceCtlApi struct {
-
 }
 
-func (api DeviceCtlApi) DevAuthApply(paramBody map[string]interface{}) (bool,interface{}) {
+func (api DeviceCtlApi) DevAuthApply(targetIp string, fromDevId string, fromIp string, key string) (bool, interface{}) {
 	url := DATA_URL_PREFIX + "/devAuth/apply"
-	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,
+	})
 
 	client := NewClient(WithNodes(netNode))
-	body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
+	paramBody := map[string]interface{}{
+		"key":       key,
+		"fromDevId": fromDevId,
+		"fromIp":    fromIp,
+	}
+	body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, paramBody, nil)
 	if err != nil {
-		return false,nil
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
 
-func (api DeviceCtlApi) DevDetail(paramBody map[string]interface{}) (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,
+	}
 	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
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
 
 //鎺у埗鍏朵粬鑺傜偣鍒涘缓闆嗙兢
 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))
 
-	body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
+	body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, paramBody, nil)
 	if err != nil {
-		return false,nil
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
 
 //鎺у埗鍏朵粬鑺傜偣鎼滅储闆嗙兢
 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))
 
-	body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
+	body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, paramBody, nil)
 	if err != nil {
-		return false,nil
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
 
 //鑾峰彇杩滅▼璁惧鎼滅储鍒伴泦缇よ妭鐐瑰垪琛�
 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))
 
-	body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
+	body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, paramBody, nil)
 	if err != nil {
-		return false,nil
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
 
 //鎺у埗鍏朵粬鑺傜偣璁惧鍔犲叆闆嗙兢
 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))
 
-	body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
+	body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, paramBody, nil)
 	if err != nil {
-		return false,nil
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
 
 //杩滅▼鎺у埗璁惧閲嶅惎
 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))
-	paramBody := map[string]interface{} {
-
-	}
-	body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
+	paramBody := map[string]interface{}{}
+	body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, paramBody, nil)
 	if err != nil {
-		return false,nil
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
 
 //杩滅▼鎺у埗绠楁硶鎴栧簲鐢ㄥ嵏杞�
 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))
-	paramBody := map[string]interface{} {
+	paramBody := map[string]interface{}{
 		"id": id,
 	}
-	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody, nil,nil)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
 	if err != nil {
-		return false,nil
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
 
 //杩滅▼鎺у埗璁惧绯荤粺鏇存柊
 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)
+	body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, nil, nil)
 	if err != nil {
-		return false,nil
+		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return false,nil
+		return false, nil
 	}
 
-	return res.Success,res.Data
+	return res.Success, res.Data
 }
-

--
Gitblit v1.8.0