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 --- sdkApi.go | 144 +++++++++++++++++++++++++---------------------- 1 files changed, 76 insertions(+), 68 deletions(-) diff --git a/sdkApi.go b/sdkApi.go index 0086562..607aeca 100644 --- a/sdkApi.go +++ b/sdkApi.go @@ -2,33 +2,33 @@ import ( "basic.com/pubsub/protomsg.git" - json "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" ) -type SdkApi struct{ - +type SdkApi struct { } //淇濆瓨绠楁硶锛屾柊澧�(绠楁硶id涓虹┖)锛屾洿鏂帮紙绠楁硶id涓嶄负绌猴級 -func (api SdkApi)Register(paramBody map[string]interface{}) (bool,interface{}) { +func (api SdkApi) Register(paramBody map[string]interface{}) (bool, interface{}) { url := DATA_URL_PREFIX + "/sdk/register" netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url)) flag := false client := NewClient(WithNodes(netNode)) respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil) if err != nil { - return flag,nil + return flag, nil } var res Result + var json = jsoniter.ConfigCompatibleWithStandardLibrary if err = json.Unmarshal(respBody, &res); err != nil { logPrint(err) - return flag,nil + return flag, nil } - return res.Success,res.Data + return res.Success, res.Data } //鏌ユ壘鎵�鏈夌畻娉� -func (api SdkApi) FindAll(sdkName string)[]protomsg.Sdk{ +func (api SdkApi) FindAll(sdkName string) []protomsg.Sdk { url := DATA_URL_PREFIX + "/sdk/findAllSdk" netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url)) var sdkArr []protomsg.Sdk @@ -36,9 +36,10 @@ paramMap := make(map[string]string, 0) paramMap["sdkName"] = sdkName respBody, err := client.DoGetRequest(url, paramMap, nil) - if err !=nil { + if err != nil { return sdkArr } + var json = jsoniter.ConfigCompatibleWithStandardLibrary var res Result if err = json.Unmarshal(respBody, &res); err != nil { logPrint(err) @@ -53,7 +54,7 @@ m := make(map[string]protomsg.Sdk) allSdks := api.FindAll("") if allSdks != nil && len(allSdks) > 0 { - for _,s := range allSdks { + for _, s := range allSdks { m[s.Id] = s } } @@ -61,19 +62,19 @@ return m } -func (api SdkApi) FindAllSdkRun()(sdkRuns []protomsg.SdkRun){ +func (api SdkApi) FindAllSdkRun() (sdkRuns []protomsg.SdkRun) { sdkArr := api.FindAll("") if len(sdkArr) == 0 { return nil } - idMap :=make(map[string]string,0) - for _,sdk := range sdkArr{ - if sdk.IpcId !=""{ - if _,ok :=idMap[sdk.IpcId];!ok{ + idMap := make(map[string]string, 0) + for _, sdk := range sdkArr { + if sdk.IpcId != "" { + if _, ok := idMap[sdk.IpcId]; !ok { idMap[sdk.IpcId] = sdk.IpcId - sdkRuns = append(sdkRuns,protomsg.SdkRun{ - IpcId:sdk.IpcId, - SdkType:sdk.SdkType, + sdkRuns = append(sdkRuns, protomsg.SdkRun{ + IpcId: sdk.IpcId, + SdkType: sdk.SdkType, }) } } @@ -82,17 +83,17 @@ } //鏌ユ壘绠楁硶id鐨剆lice -func (api SdkApi) GetAllSdkIds() (ipcIds []string){ +func (api SdkApi) GetAllSdkIds() (ipcIds []string) { sdkArr := api.FindAll("") if len(sdkArr) == 0 { return nil } - idMap :=make(map[string]string,0) - for _,sdk := range sdkArr{ - if sdk.IpcId !=""{ - if _,ok :=idMap[sdk.IpcId];!ok{ + idMap := make(map[string]string, 0) + for _, sdk := range sdkArr { + if sdk.IpcId != "" { + if _, ok := idMap[sdk.IpcId]; !ok { idMap[sdk.IpcId] = sdk.IpcId - ipcIds = append(ipcIds,sdk.IpcId) + ipcIds = append(ipcIds, sdk.IpcId) } } } @@ -100,45 +101,47 @@ } //閫氳繃id鑾峰彇绠楁硶淇℃伅 -func (api SdkApi) GetById(id string) (bool,interface{}){ +func (api SdkApi) GetById(id string) (bool, interface{}) { url := DATA_URL_PREFIX + "/sdk/getById" netNode := getNetNode(Topic_AppCenter_Service) client := NewClient(WithNodes(netNode)) paramMap := make(map[string]string) paramMap["id"] = id respBody, err := client.DoGetRequest(url, paramMap, nil) - if err !=nil { - return false,nil + if err != nil { + return false, nil } + var json = jsoniter.ConfigCompatibleWithStandardLibrary var res Result if err = json.Unmarshal(respBody, &res); err != nil { logPrint(err) - return false,nil + return false, nil } - return res.Success,res.Data + return res.Success, res.Data } -func (api SdkApi) FindByTaskId(taskId string) (flag bool,sdks []protomsg.Sdk) { +func (api SdkApi) FindByTaskId(taskId string) (flag bool, sdks []protomsg.Sdk) { url := DATA_URL_PREFIX + "/sdk/findByTaskId" netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url)) client := NewClient(WithNodes(netNode)) paramMap := make(map[string]string) paramMap["taskId"] = taskId respBody, err := client.DoGetRequest(url, paramMap, nil) - if err !=nil { - return false,nil + if err != nil { + return false, nil } + var json = jsoniter.ConfigCompatibleWithStandardLibrary var res Result if err = json.Unmarshal(respBody, &res); err != nil { logPrint(err) - return false,nil + return false, nil } bytes, _ := json.Marshal(res.Data) err = json.Unmarshal(bytes, &sdks) - return true,sdks + return true, sdks } -func (api SdkApi) GetSdkArgs(sdkId string, scope string) (b bool,args []protomsg.SdkArg) { +func (api SdkApi) GetSdkArgs(sdkId string, scope string) (b bool, args []protomsg.SdkArg) { url := DATA_URL_PREFIX + "/sdkArg/getSdkArgs" netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url)) client := NewClient(WithNodes(netNode)) @@ -146,52 +149,56 @@ paramMap["sdkId"] = sdkId paramMap["scope"] = scope respBody, err := client.DoGetRequest(url, paramMap, nil) - if err !=nil { - return false,nil + if err != nil { + return false, nil } + var json = jsoniter.ConfigCompatibleWithStandardLibrary var res Result if err = json.Unmarshal(respBody, &res); err != nil { logPrint(err) - return false,nil + return false, nil } bytes, _ := json.Marshal(res.Data) err = json.Unmarshal(bytes, &args) - return true,args + return true, args } func (api SdkApi) GetAllSdkChanSet() (b bool, list []protomsg.SdkChanSet) { url := DATA_URL_PREFIX + "/sdk/getAllSdkChanSet" netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url)) - client := NewClient(WithNodes(netNode)) - respBody,err := client.DoGetRequest(url, nil, nil) - if err !=nil { - return false,nil - } - var res Result - if err = json.Unmarshal(respBody, &res);err !=nil { - return false,nil - } - bytes,_ := json.Marshal(res.Data) - err = json.Unmarshal(bytes, &list) - if err !=nil { - return false, nil - } - return true, list + client := NewClient(WithNodes(netNode)) + respBody, err := client.DoGetRequest(url, nil, nil) + if err != nil { + return false, nil + } + var json = jsoniter.ConfigCompatibleWithStandardLibrary + var res Result + if err = json.Unmarshal(respBody, &res); err != nil { + return false, nil + } + bytes, _ := json.Marshal(res.Data) + err = json.Unmarshal(bytes, &list) + if err != nil { + return false, nil + } + return true, list } func (api SdkApi) UpdateSdkChanSet(paramBody map[string]interface{}) bool { url := DATA_URL_PREFIX + "/sdk/updateSdkChanSet" netNode := getNetNode(url2Topic(Topic_AppCenter_Service, url)) - client := NewClient(WithNodes(netNode)) - respBody,err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil) - if err !=nil { - return false - } - var res Result - if err = json.Unmarshal(respBody, &res);err !=nil { - return false - } - return res.Success + client := NewClient(WithNodes(netNode)) + respBody, 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(respBody, &res); err != nil { + return false + } + return res.Success } func (api SdkApi) Delete(sdkId string) (bool, interface{}) { @@ -201,13 +208,14 @@ paramBody := map[string]interface{}{ "sdkId": sdkId, } - respBody,err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil) - if err !=nil { + respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil) + if err != nil { return false, err.Error() } + var json = jsoniter.ConfigCompatibleWithStandardLibrary var res Result - if err = json.Unmarshal(respBody, &res);err !=nil { + if err = json.Unmarshal(respBody, &res); err != nil { return false, err.Error() } return res.Success, res.Data -} \ No newline at end of file +} -- Gitblit v1.8.0