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

---
 dbtableApi.go |  212 +++++++++++++++++++++++-----------------------------
 1 files changed, 95 insertions(+), 117 deletions(-)

diff --git a/dbtableApi.go b/dbtableApi.go
index 9c41639..2e24edf 100644
--- a/dbtableApi.go
+++ b/dbtableApi.go
@@ -2,262 +2,240 @@
 
 import (
 	"basic.com/pubsub/protomsg.git"
-	"encoding/json"
 	"errors"
+	jsoniter "github.com/json-iterator/go"
 )
 
 type DbTableApi struct {
-
 }
 
-func (api DbTableApi) AddDbTableInfo(paramBody map[string]interface{}) (bool,interface{}) {
+func (api DbTableApi) AddDbTableInfo(paramBody map[string]interface{}) (bool, interface{}) {
 	url := DATA_URL_PREFIX + "/dbtable/addDbTableInfo"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return false,nil
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	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
 }
 
-func (api DbTableApi) QueryDbTables(isSync string) (bool,interface{}) {
+func (api DbTableApi) QueryDbTables(isSync string) (bool, interface{}) {
 	url := DATA_URL_PREFIX + "/dbtable/queryDbTables"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return false,nil
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	client := NewClient(WithNodes(netNode))
-	paramQuery:= map[string]string {
-		"isSync":isSync,
+	paramQuery := map[string]string{
+		"isSync": isSync,
 	}
-	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, nil,paramQuery,nil)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, nil, 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
 }
 
-func (api DbTableApi) UpdateDbTables(paramBody map[string]interface{}) (bool,interface{}) {
+func (api DbTableApi) UpdateDbTables(paramBody map[string]interface{}) (bool, interface{}) {
 	url := DATA_URL_PREFIX + "/dbtable/updateDbTables"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return false,nil
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_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,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 DbTableApi) UpdateDbTableStatus(id string,enable int) (bool,interface{}) {
+func (api DbTableApi) UpdateDbTableStatus(id string, enable int) (bool, interface{}) {
 	url := DATA_URL_PREFIX + "/dbtable/updateDbTableStatus"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return false,nil
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	client := NewClient(WithNodes(netNode))
 	paramBody := map[string]interface{}{
-		"id": id,
+		"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 {
-		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 DbTableApi) DeleteById(id string) (bool,interface{}) {
+func (api DbTableApi) DeleteById(id string) (bool, interface{}) {
 	url := DATA_URL_PREFIX + "/dbtable/deleteDBtablesById"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return false,nil
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	client := NewClient(WithNodes(netNode))
-	paramQuery := map[string]string {
+	paramQuery := map[string]string{
 		"id": id,
 	}
-	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, nil,paramQuery,nil)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, nil, 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
 }
 
 //鏍规嵁澶氫釜搴曞簱id鏌ヨ搴曞簱淇℃伅
-func (api DbTableApi) DbtablesById(ids []string) (dts []protomsg.Dbtable,err error) {
+func (api DbTableApi) DbtablesById(ids []string) (dts []protomsg.Dbtable, err error) {
 	url := DATA_URL_PREFIX + "/dbtable/dbtablesByIds"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return nil,errors.New("compTable-service proc not found")
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	client := NewClient(WithNodes(netNode))
 	paramBody := map[string]interface{}{
 		"ids": ids,
 	}
-	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 nil,err
+		return nil, err
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return nil,err
+		return nil, err
 	}
 	dataBytes, _ := json.Marshal(res.Data)
-	if err = json.Unmarshal(dataBytes, &dts);err !=nil {
-		return nil,err
+	if err = json.Unmarshal(dataBytes, &dts); err != nil {
+		return nil, err
 	}
-	return dts,nil
+	return dts, nil
 }
 
 // 鏍规嵁tableid 鏌ヨtablename
-func (api DbTableApi) Dbtablename(tableId string) (tableName string,err error) {
+func (api DbTableApi) Dbtablename(tableId string) (tableName string, err error) {
 	dts, e := api.DbtablesById([]string{tableId})
-	if e !=nil {
-		return "",e
+	if e != nil {
+		return "", e
 	}
-	if dts !=nil && len(dts) ==1 {
-		return dts[0].TableName,nil
+	if dts != nil && len(dts) == 1 {
+		return dts[0].TableName, nil
 	}
-	return "",errors.New("table not found")
+	return "", errors.New("table not found")
 }
 
-func (api DbTableApi) FindAllDbTables() (dts []protomsg.Dbtable,err error) {
+func (api DbTableApi) FindAllDbTables() (dts []protomsg.Dbtable, err error) {
 	url := DATA_URL_PREFIX + "/dbtable/findAllDbTables"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return nil,errors.New("compTable-service proc not found")
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	client := NewClient(WithNodes(netNode))
-	body,err := client.DoGetRequest(url, nil,nil)
+	body, err := client.DoGetRequest(url, nil, nil)
 	if err != nil {
-		return nil,err
+		return nil, err
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return nil,err
+		return nil, err
 	}
 	dataBytes, _ := json.Marshal(res.Data)
-	if err = json.Unmarshal(dataBytes, &dts);err !=nil {
-		return nil,err
+	if err = json.Unmarshal(dataBytes, &dts); err != nil {
+		return nil, err
 	}
-	return dts,nil
+	return dts, nil
 }
 
-func (api DbTableApi) FindAllDbTablesByCurServer(isDelete string) (dts []protomsg.Dbtable,err error){
+func (api DbTableApi) FindAllDbTablesByCurServer(isDelete string) (dts []protomsg.Dbtable, err error) {
 	url := DATA_URL_PREFIX + "/dbtable/findAllDbTablesByCurServer"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return nil,errors.New("compTable-service proc not found")
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	client := NewClient(WithNodes(netNode))
 	paramQuery := map[string]string{
-		"isDelete":isDelete,
+		"isDelete": isDelete,
 	}
-	body,err := client.DoGetRequest(url, paramQuery,nil)
+	body, err := client.DoGetRequest(url, paramQuery, nil)
 	if err != nil {
-		return nil,err
+		return nil, err
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return nil,err
+		return nil, err
 	}
 	dataBytes, _ := json.Marshal(res.Data)
-	if err = json.Unmarshal(dataBytes, &dts);err !=nil {
-		return nil,err
+	if err = json.Unmarshal(dataBytes, &dts); err != nil {
+		return nil, err
 	}
-	return dts,nil
+	return dts, nil
 }
 
-func (api DbTableApi) FindAllDbTablesByType(isDelete string, typ string) (dts []protomsg.Dbtable,err error){
+func (api DbTableApi) FindAllDbTablesByType(isDelete string, typ string) (dts []protomsg.Dbtable, err error) {
 	url := DATA_URL_PREFIX + "/dbtable/findAllDbTablesByCurServer"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return nil,errors.New("compTable-service proc not found")
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	client := NewClient(WithNodes(netNode))
 	paramQuery := map[string]string{
-		"isDelete":isDelete,
-		"type": typ,
+		"isDelete": isDelete,
+		"type":     typ,
 	}
-	body,err := client.DoGetRequest(url, paramQuery,nil)
+	body, err := client.DoGetRequest(url, paramQuery, nil)
 	if err != nil {
-		return nil,err
+		return nil, err
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return nil,err
+		return nil, err
 	}
 	dataBytes, _ := json.Marshal(res.Data)
-	if err = json.Unmarshal(dataBytes, &dts);err !=nil {
-		return nil,err
+	if err = json.Unmarshal(dataBytes, &dts); err != nil {
+		return nil, err
 	}
-	return dts,nil
+	return dts, nil
 }
 
-func (api DbTableApi) FindAllLocalDbTables(isDelete string) (dts []protomsg.Dbtable,err error){
+func (api DbTableApi) FindAllLocalDbTables(isDelete string) (dts []protomsg.Dbtable, err error) {
 	url := DATA_URL_PREFIX + "/dbtable/findAllLocalDbTables"
-	netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
-	if netNode == nil {
-		return nil,errors.New("compTable-service proc not found")
-	}
+	netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
 	client := NewClient(WithNodes(netNode))
 	paramQuery := map[string]string{
-		"isDelete":isDelete,
+		"isDelete": isDelete,
 	}
-	body,err := client.DoGetRequest(url, paramQuery,nil)
+	body, err := client.DoGetRequest(url, paramQuery, nil)
 	if err != nil {
-		return nil,err
+		return nil, err
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
-		return nil,err
+		return nil, err
 	}
 	dataBytes, _ := json.Marshal(res.Data)
-	if err = json.Unmarshal(dataBytes, &dts);err !=nil {
-		return nil,err
+	if err = json.Unmarshal(dataBytes, &dts); err != nil {
+		return nil, err
 	}
-	return dts,nil
+	return dts, nil
 }
-

--
Gitblit v1.8.0