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
---
sbusClient.go | 72 +++++++++++++++++++----------------
1 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/sbusClient.go b/sbusClient.go
index 7639035..bf9c140 100644
--- a/sbusClient.go
+++ b/sbusClient.go
@@ -3,8 +3,8 @@
import (
"basic.com/valib/c_bhomebus.git/api/bhsgo"
"basic.com/valib/c_bhomebus.git/proto/source/bhome_msg"
- json "github.com/json-iterator/go"
"errors"
+ jsoniter "github.com/json-iterator/go"
"strconv"
)
@@ -13,26 +13,26 @@
}
type ProcInfo struct {
- Name string `json:"name"` // 杩涚▼鍚嶇О
- ID string `json:"id"` // 杩涚▼鍞竴鏍囪瘑
- Info string `json:"info"` // 杩涚▼鐨勬弿杩颁俊鎭紝鐢ㄤ簬鍖哄垎鍚屼竴杩涚▼鍚嶇О涓嬪涓繘绋�
+ Name string `json:"name"` // 杩涚▼鍚嶇О
+ ID string `json:"id"` // 杩涚▼鍞竴鏍囪瘑
+ Info string `json:"info"` // 杩涚▼鐨勬弿杩颁俊鎭紝鐢ㄤ簬鍖哄垎鍚屼竴杩涚▼鍚嶇О涓嬪涓繘绋�
}
type Request struct {
- Path string `json:"path"`
- Method string `json:"method"`
- ContentType string `json:"contentType"`
- HeaderMap map[string][]string `json:"headerMap"`
- QueryMap map[string][]string `json:"queryMap"`
- FormMap map[string][]string `json:"formMap"`
- PostFormMap map[string][]string `json:"postFormMap"`
- Body []byte `json:"body"`
+ Path string `json:"path"`
+ Method string `json:"method"`
+ ContentType string `json:"contentType"`
+ HeaderMap map[string][]string `json:"headerMap"`
+ QueryMap map[string][]string `json:"queryMap"`
+ FormMap map[string][]string `json:"formMap"`
+ PostFormMap map[string][]string `json:"postFormMap"`
+ Body []byte `json:"body"`
}
type reply struct {
- Success bool `json:"success"`
- Msg string `json:"msg"`
- Data interface{} `json:"data"`
+ Success bool `json:"success"`
+ Msg string `json:"msg"`
+ Data interface{} `json:"data"`
}
func (sc SBusClient) DoGetRequest(url string, params map[string]string, headers map[string]string) ([]byte, error) {
@@ -44,13 +44,14 @@
}
fillParam(&req, headers, params, nil)
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
rb, err := json.Marshal(req)
- if err !=nil {
- return nil,err
+ if err != nil {
+ return nil, err
}
rMsg := bhome_msg.MsgRequestTopic{
Topic: []byte(req.Path),
- Data: rb,
+ Data: rb,
}
return busReq(&rMsg, sc.nodes)
@@ -69,7 +70,7 @@
if body != nil {
req.PostFormMap = make(map[string][]string)
req.FormMap = map[string][]string{}
- for k,v := range body {
+ for k, v := range body {
switch v.(type) {
case string:
req.FormMap[k] = []string{v.(string)}
@@ -87,6 +88,7 @@
}
}
} else if contentType == CONTENT_TYPE_JSON {
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
bs, err := json.Marshal(body)
if err != nil {
logPrint("fill json body err:", err)
@@ -95,13 +97,14 @@
}
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
rb, err := json.Marshal(req)
- if err !=nil {
- return nil,err
+ if err != nil {
+ return nil, err
}
rMsg := bhome_msg.MsgRequestTopic{
Topic: []byte(req.Path),
- Data: rb,
+ Data: rb,
}
return busReq(&rMsg, sc.nodes)
@@ -116,13 +119,14 @@
}
fillParam(&req, headers, nil, body)
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
rb, err := json.Marshal(req)
- if err !=nil {
- return nil,err
+ if err != nil {
+ return nil, err
}
rMsg := bhome_msg.MsgRequestTopic{
Topic: []byte(req.Path),
- Data: rb,
+ Data: rb,
}
return busReq(&rMsg, sc.nodes)
@@ -137,33 +141,35 @@
}
fillParam(&req, headers, nil, body)
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
rb, err := json.Marshal(req)
- if err !=nil {
- return nil,err
+ if err != nil {
+ return nil, err
}
rMsg := bhome_msg.MsgRequestTopic{
Topic: []byte(req.Path),
- Data: rb,
+ Data: rb,
}
return busReq(&rMsg, sc.nodes)
}
-func fillParam(req *Request,headers map[string]string, params map[string]string, body map[string]interface{}) {
+func fillParam(req *Request, headers map[string]string, params map[string]string, body map[string]interface{}) {
headerMap := make(map[string][]string)
queryMap := make(map[string][]string)
if headers != nil {
- for k,v := range headers {
+ for k, v := range headers {
headerMap[k] = []string{v}
}
}
if params != nil {
- for k,v := range params {
+ for k, v := range params {
queryMap[k] = []string{v}
}
}
req.HeaderMap = headerMap
req.QueryMap = queryMap
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
b, err := json.Marshal(body)
if err != nil {
logPrint("marshal body err:", err)
@@ -174,7 +180,7 @@
/**
* 鏂扮増bhs鐩存帴鍙戣捣璇锋眰锛屼笉浼氫骇鐢熷叡浜唴瀛樻硠婕忕殑闂锛�
-*/
+ */
func doReq(req *bhome_msg.MsgRequestTopic, destArr []bhome_msg.BHAddress) ([]byte, error) {
dest := bhome_msg.BHAddress{}
if destArr != nil && len(destArr) > 0 {
@@ -188,4 +194,4 @@
logPrint("bhsgo.Request request err:", r.Errmsg)
return nil, errors.New("bhsgo.Request return false")
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0