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
---
appApi.go | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/appApi.go b/appApi.go
index d004f2b..ff4069b 100644
--- a/appApi.go
+++ b/appApi.go
@@ -2,18 +2,17 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
-type AppApi struct{
-
+type AppApi struct {
}
type AppWithShop struct {
protomsg.App
- RemoteVersion string `json:"remoteVersion"` //鍟嗗煄浠撳簱鐗堟湰鍙�
- Installed bool `json:"installed"` //鏄惁宸插畨瑁�
- IsUpgrade bool `json:"isUpgrade"` //鏄惁闇�瑕佸崌绾�
- ProgressMsg string `json:"progressMsg"` //瀹夎鎴栧崌绾ц繘搴�
+ RemoteVersion string `json:"remoteVersion"` //鍟嗗煄浠撳簱鐗堟湰鍙�
+ Installed bool `json:"installed"` //鏄惁宸插畨瑁�
+ IsUpgrade bool `json:"isUpgrade"` //鏄惁闇�瑕佸崌绾�
+ ProgressMsg string `json:"progressMsg"` //瀹夎鎴栧崌绾ц繘搴�
}
func (api AppApi) FindAll(appName string) (list []protomsg.App) {
@@ -25,10 +24,11 @@
paramMap["appName"] = appName
respBody, err := client.DoGetRequest(url, paramMap, nil)
logPrint("DoGetRequest err:", err)
- if err !=nil {
+ if err != nil {
return nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
logPrint(err)
return nil
@@ -47,12 +47,13 @@
url := DATA_URL_PREFIX + "/app/save"
netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url))
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 res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false
}
@@ -63,34 +64,36 @@
url := DATA_URL_PREFIX + "/app/getAppInfo"
netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url))
client := NewClient(WithNodes(netNode))
- paramMap := map[string]string {
+ paramMap := map[string]string{
"id": id,
}
- body, err := client.DoGetRequest(url,paramMap,nil)
+ body, err := client.DoGetRequest(url, paramMap, nil)
if err != nil {
return false, err.Error()
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false, err.Error()
}
return res.Success, res.Data
}
-func (api AppApi) Delete(appId string) (bool,interface{}) {
+func (api AppApi) Delete(appId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/app/delete"
netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
+ paramBody := map[string]interface{}{
"appId": appId,
}
- 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, err.Error()
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false, err.Error()
}
@@ -102,15 +105,16 @@
url := DATA_URL_PREFIX + "/sdk/sdkDownload"
netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url))
client := NewClient(WithNodes(netNode))
- paramMap := map[string]string {
+ paramMap := map[string]string{
"path": id,
}
- body, err := client.DoGetRequest(url,paramMap,nil)
+ body, err := client.DoGetRequest(url, paramMap, nil)
if err != nil {
return false, err.Error()
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false, err.Error()
}
@@ -122,7 +126,7 @@
m := make(map[string]protomsg.App)
apps := api.FindAll("")
if apps != nil {
- for _,a := range apps {
+ for _, a := range apps {
m[a.Package] = a
}
}
@@ -140,10 +144,11 @@
paramMap["appName"] = appName
respBody, err := client.DoGetRequest(url, paramMap, nil)
logPrint("DoGetRequest err:", err)
- if err !=nil {
+ if err != nil {
return nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
logPrint(err)
return nil
@@ -156,4 +161,4 @@
logPrint("unmarshal err:", err)
return nil
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0