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
---
fileStack.go | 127 ++++++++++++++++++-----------------------
1 files changed, 56 insertions(+), 71 deletions(-)
diff --git a/fileStack.go b/fileStack.go
index bb81a88..e3c8e20 100644
--- a/fileStack.go
+++ b/fileStack.go
@@ -2,59 +2,54 @@
import (
"basic.com/pubsub/protomsg.git"
- "encoding/json"
+ jsoniter "github.com/json-iterator/go"
"strconv"
)
-type FileStackApi struct{
-
+type FileStackApi struct {
}
func (api FileStackApi) Save(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/fileStack/save"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
- 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
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- logPrint("unmarshal err:",err)
+ logPrint("unmarshal err:", err)
return false
}
return res.Success
}
-func (api FileStackApi) Show(id string) (b bool,sck protomsg.FileStack) {
+func (api FileStackApi) Show(id string) (b bool, sck protomsg.FileStack) {
url := DATA_URL_PREFIX + "/fileStack/show"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false,sck
- }
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"id": id,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return false, sck
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- logPrint("unmarshal err:",err)
+ logPrint("unmarshal err:", err)
return false, sck
}
if res.Success {
sb, err := json.Marshal(res.Data)
if err == nil {
- if err = json.Unmarshal(sb, &sck);err ==nil {
+ if err = json.Unmarshal(sb, &sck); err == nil {
return true, sck
} else {
logPrint("unmarshal sck err:", err)
@@ -67,14 +62,11 @@
return false, sck
}
-func (api FileStackApi) FindAllByPage(name string,fType int, page int, size int) (bool,interface{}){
+func (api FileStackApi) FindAllByPage(name string, fType int, page int, size int) (bool, interface{}) {
url := DATA_URL_PREFIX + "/fileStack/findAllByPage"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"name": name,
"type": strconv.Itoa(fType),
"page": strconv.Itoa(page),
@@ -85,21 +77,19 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- logPrint("unmarshal err:",err)
+ logPrint("unmarshal err:", err)
return false, nil
}
return res.Success, res.Data
}
-func (api FileStackApi) FindAllDoingStacks() (flag bool,stacks []protomsg.FileStack){
+func (api FileStackApi) FindAllDoingStacks() (flag bool, stacks []protomsg.FileStack) {
url := DATA_URL_PREFIX + "/fileStack/findAllDoingStacks"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
@@ -107,44 +97,47 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- b, err := json.Marshal(res.Data)
- if err !=nil {
- logPrint("unmarshal FileStackApi FindAll.result err")
- return false,nil
+ if !res.Success {
+ logPrint("FindAllDoingStacks ret false,res:", res)
+ return false, nil
}
- if err = json.Unmarshal(b, &stacks);err !=nil {
- logPrint("unmarshal err:",err)
- return false,nil
+ b, err := json.Marshal(res.Data)
+ if err != nil {
+ logPrint("unmarshal FileStackApi FindAll.result err")
+ return false, nil
+ }
+ if err = json.Unmarshal(b, &stacks); err != nil {
+ logPrint("unmarshal err:", err)
+ return false, nil
} else {
- return true,stacks
+ return true, stacks
}
}
-func (api FileStackApi) ChangeEnable(id string,enable bool) bool {
+func (api FileStackApi) ChangeEnable(id string, enable bool) bool {
url := DATA_URL_PREFIX + "/fileStack/changeEnable"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "id": id,
- "enable":enable,
+ paramBody := map[string]interface{}{
+ "id": id,
+ "enable": enable,
}
- 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 {
logPrint("FileStackApi ChangeEnable doPost err:", err)
return false
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- logPrint("unmarshal err:",err)
+ logPrint("unmarshal err:", err)
return false
}
@@ -155,21 +148,19 @@
func (api FileStackApi) Delete(id string) bool {
url := DATA_URL_PREFIX + "/fileStack/delete"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
+ paramBody := map[string]interface{}{
"id": id,
}
- body,err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM, paramBody,nil)
+ body, err := client.DoDeleteRequest(url, CONTENT_TYPE_FORM, paramBody, nil)
if err != nil {
return false
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- logPrint("unmarshal err:",err)
+ logPrint("unmarshal err:", err)
return false
}
@@ -179,19 +170,17 @@
func (api FileStackApi) UpdateStatus(idArr []string, status int) bool {
url := DATA_URL_PREFIX + "/fileStack/updateStatus"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "ids":idArr,
+ paramBody := map[string]interface{}{
+ "ids": idArr,
"status": status,
}
- 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
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
@@ -204,18 +193,16 @@
func (api FileStackApi) UpdateChannelCount(count int) bool {
url := DATA_URL_PREFIX + "/fileSetting/updateChannelCount"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false
- }
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "channelCount":count,
+ paramBody := map[string]interface{}{
+ "channelCount": count,
}
- body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
return false
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
@@ -225,12 +212,9 @@
return res.Success
}
-func (api FileStackApi) FindAll() (flag bool,stacks []protomsg.FileStack) {
+func (api FileStackApi) FindAll() (flag bool, stacks []protomsg.FileStack) {
url := DATA_URL_PREFIX + "/fileStack/findAll"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
- if netNode == nil {
- return false,nil
- }
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
@@ -238,20 +222,21 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
b, err := json.Marshal(res.Data)
- if err !=nil {
+ if err != nil {
logPrint("unmarshal FileStackApi FindAll.result err")
- return false,nil
+ return false, nil
}
- if err = json.Unmarshal(b, &stacks);err !=nil {
- logPrint("unmarshal err:",err)
- return false,nil
+ if err = json.Unmarshal(b, &stacks); err != nil {
+ logPrint("unmarshal err:", err)
+ return false, nil
} else {
- return true,stacks
+ return true, stacks
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0