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 | 117 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 53 deletions(-)
diff --git a/deviceCtlApi.go b/deviceCtlApi.go
index 5967550..a92ddfc 100644
--- a/deviceCtlApi.go
+++ b/deviceCtlApi.go
@@ -1,61 +1,68 @@
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(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,
})
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "key": key,
- "fromDevId": devId,
- "fromIp": ip,
+ paramBody := map[string]interface{}{
+ "key": key,
+ "fromDevId": fromDevId,
+ "fromIp": fromIp,
}
- 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) 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))
- paramQuery := map[string]string {
+ 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.DoGetRequest(url,paramQuery,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
}
//鎺у埗鍏朵粬鑺傜偣鍒涘缓闆嗙兢
@@ -70,17 +77,18 @@
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
}
//鎺у埗鍏朵粬鑺傜偣鎼滅储闆嗙兢
@@ -95,17 +103,18 @@
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
}
//鑾峰彇杩滅▼璁惧鎼滅储鍒伴泦缇よ妭鐐瑰垪琛�
@@ -120,17 +129,18 @@
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
}
//鎺у埗鍏朵粬鑺傜偣璁惧鍔犲叆闆嗙兢
@@ -145,17 +155,18 @@
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
}
//杩滅▼鎺у埗璁惧閲嶅惎
@@ -169,20 +180,19 @@
})
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
}
//杩滅▼鎺у埗绠楁硶鎴栧簲鐢ㄥ嵏杞�
@@ -196,20 +206,21 @@
})
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
}
//杩滅▼鎺у埗璁惧绯荤粺鏇存柊
@@ -224,16 +235,16 @@
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