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
---
syssetApi.go | 134 +-
sysInitApi.go | 8
fileAnalysis.go | 125 +-
eventPush.go | 88 +-
cameraRuleApi.go | 84 +
appApi.go | 43
chanmanageApi.go | 56
cluster.go | 129 +-
voiceApi.go | 11
sysMenuApi.go | 12
areaApi.go | 14
userApi.go | 77 +
dbtableApi.go | 182 ++--
cameraPolygonRelationApi.go | 35
versionCtrlApi.go | 18
timePgnApi.go | 103 +-
gb28181Api.go | 220 +++--
sysRoleApi.go | 12
fileStack.go | 94 +-
licenseApi.go | 37
sdkApi.go | 144 +-
cameraApi.go | 227 +++--
dbpersonApi.go | 226 +++--
sbusClient.go | 72 +
httpClient.go | 19
cameraGroupApi.go | 21
deviceCtlApi.go | 97 +-
dicApi.go | 41
28 files changed, 1,251 insertions(+), 1,078 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
+}
diff --git a/areaApi.go b/areaApi.go
index cad3cd7..9c7c043 100644
--- a/areaApi.go
+++ b/areaApi.go
@@ -1,11 +1,10 @@
package bhomedbapi
import (
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type AreaApi struct {
-
}
//parentId 瑕佹煡瀵荤殑鐩綍鏍戠殑鏍硅妭鐐筰d
@@ -29,17 +28,17 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
return nil
}
bytes, _ := json.Marshal(res.Data)
- if err = json.Unmarshal(bytes, &result);err !=nil{
+ if err = json.Unmarshal(bytes, &result); err != nil {
return nil
}
return result
}
-
//娣诲姞鐩綍鑺傜偣
func (api AreaApi) AreaAdd(paramBody map[string]interface{}) bool {
@@ -52,6 +51,7 @@
return flag
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
return flag
}
@@ -66,11 +66,12 @@
flag := false
client := NewClient(WithNodes(netNode))
- respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil, nil)
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
return flag
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
logPrint(err)
return flag
@@ -90,11 +91,12 @@
client := NewClient(WithNodes(netNode))
paramBody := make(map[string]interface{}, 0)
paramBody["id"] = id
- respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil, nil)
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
return flag
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
return flag
}
diff --git a/cameraApi.go b/cameraApi.go
index daf2c02..e0b3e5c 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -2,40 +2,41 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
"strconv"
)
-type CameraApi struct{
-
+type CameraApi struct {
}
-func (api CameraApi) CameraAdd(paramBody map[string]interface{}) (bool,interface{}) {
+func (api CameraApi) CameraAdd(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/add"
netNode := getNetNode(url2Topic(Topic_Camera_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 CameraApi) CameraUpdate(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/camera/update"
netNode := getNetNode(url2Topic(Topic_Camera_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
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false
}
@@ -46,15 +47,16 @@
url := DATA_URL_PREFIX + "/camera/updateSnapshot"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["snapshot"] = snapshot
paramBody["cameraId"] = cameraId
- 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 res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -67,14 +69,15 @@
url := DATA_URL_PREFIX + "/camera/del"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramMap := make(map[string]string,0)
+ paramMap := make(map[string]string, 0)
paramMap["id"] = cid
- body, err := client.DoGetRequest(url,paramMap,nil)
+ body, err := client.DoGetRequest(url, paramMap, nil)
if err != nil {
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false
}
@@ -86,7 +89,7 @@
url := DATA_URL_PREFIX + "/camera/show"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"id": cameraId,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
@@ -95,8 +98,9 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return camera,err
+ return camera, err
}
bytes, _ := json.Marshal(res.Data)
@@ -108,33 +112,34 @@
func (api CameraApi) UpdateCameraArea(cameraId string, areaId string) bool {
url := DATA_URL_PREFIX + "/camera/updateCameraArea"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
- client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "cameraId": cameraId,
- "areaId": areaId,
- }
- body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil,nil)
- if err !=nil {
- return false
- }
+ client := NewClient(WithNodes(netNode))
+ paramBody := map[string]interface{}{
+ "cameraId": cameraId,
+ "areaId": areaId,
+ }
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
+ if err != nil {
+ return false
+ }
- var res Result
- if err = json.Unmarshal(body, &res);err != nil {
- return false
- }
+ var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false
+ }
- return res.Success
+ return res.Success
}
func (api CameraApi) FindAll(cameraName string, runType string, cameraId string, areaId string) (cameras []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/showAll"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cameraName": cameraName,
- "runType": runType,
- "cameraId": cameraId,
- "areaId": areaId,
+ "runType": runType,
+ "cameraId": cameraId,
+ "areaId": areaId,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
@@ -143,6 +148,7 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return nil
@@ -154,27 +160,28 @@
return cameras
}
-func (api CameraApi) GetAllCamerasByServer(serverId string,cameraName string) (b bool,cams []protomsg.Camera) {
+func (api CameraApi) GetAllCamerasByServer(serverId string, cameraName string) (b bool, cams []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/getAllCamerasByServer"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["serverId"] = serverId
paramQuery["cameraName"] = cameraName
body, err := client.DoGetRequest(url, 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
}
dataBytes, _ := json.Marshal(res.Data)
- if err := json.Unmarshal(dataBytes, &cams);err !=nil {
- return false,nil
+ if err := json.Unmarshal(dataBytes, &cams); err != nil {
+ return false, nil
}
- return res.Success,cams
+ return res.Success, cams
}
////鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
@@ -188,7 +195,8 @@
// }
//
// var res Result
-// if err = json.Unmarshal(body, &res); err != nil {
+// var json = jsoniter.ConfigCompatibleWithStandardLibrary
+// if err = json.Unmarshal(body, &res); err != nil {
// logPrint(err)
// return nil
// }
@@ -201,196 +209,205 @@
//鏍规嵁杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
//runType(0:鑾峰彇杞鍒楄〃锛�1锛氳幏鍙栧疄鏃跺垪琛�)
-func (api CameraApi) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
+func (api CameraApi) GetCamerasByRunType(runType int, cameraName string) (flag bool, cameras []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/getCamerasByRunType"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,2)
- paramQuery["runType"]=strconv.Itoa(runType)
+ paramQuery := make(map[string]string, 2)
+ paramQuery["runType"] = strconv.Itoa(runType)
paramQuery["cameraName"] = cameraName
body, err := client.DoGetRequest(url, 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
}
b, err := json.Marshal(res.Data)
- if err !=nil {
+ if err != nil {
logPrint("unmarshal GetCamerasByRunType.result err")
- return false,nil
+ return false, nil
}
- if err = json.Unmarshal(b, &cameras);err !=nil {
- return false,nil
+ if err = json.Unmarshal(b, &cameras); err != nil {
+ return false, nil
} else {
- return true,cameras
+ return true, cameras
}
}
-func (api CameraApi) UpdateRunEnable(cameraId string,runEnable bool) (bool,interface{}){
+func (api CameraApi) UpdateRunEnable(cameraId string, runEnable bool) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/updateRunEnable"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraId"] = cameraId
paramBody["runEnable"] = runEnable
- 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,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api CameraApi) UpdateIsRunningState(cameraId string,isRunning bool) (bool,interface{}){
+func (api CameraApi) UpdateIsRunningState(cameraId string, isRunning bool) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/updateIsRunningState"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraId"] = cameraId
paramBody["isRunning"] = isRunning
- 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,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api CameraApi) UpdateIsRunningAll(cameraIds []string) (bool,interface{}){
+func (api CameraApi) UpdateIsRunningAll(cameraIds []string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/updateIsRunningAll"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraIds"] = cameraIds
- 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 {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
//鎵归噺鍒囨崲鎽勫儚鏈鸿疆璇㈡垨瀹炴椂鐘舵��
-func (api CameraApi) ChangeRunType(paramBody map[string]interface{}) (bool,interface{}){
+func (api CameraApi) ChangeRunType(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/changeRunType"
netNode := getNetNode(url2Topic(Topic_Camera_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 {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api CameraApi) StatisticRunInfo() (bool,interface{}){
+func (api CameraApi) StatisticRunInfo() (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/statisticRunInfo"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, 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 true,res.Data
+ return true, res.Data
}
-func (api CameraApi) FindAllCameraLink() (b bool,list []protomsg.CameraLink){
+func (api CameraApi) FindAllCameraLink() (b bool, list []protomsg.CameraLink) {
url := DATA_URL_PREFIX + "/camera/findAllCameraLink"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, 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
}
dataBytes, _ := json.Marshal(res.Data)
- if err := json.Unmarshal(dataBytes, &list);err !=nil {
- return false,nil
+ if err := json.Unmarshal(dataBytes, &list); err != nil {
+ return false, nil
}
- return true,list
+ return true, list
}
func (api CameraApi) FindOnMap(isOnMap bool, floor int, cameraName string) (b bool, cams []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/findOnMap"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody:= map[string]interface{}{
+ paramBody := map[string]interface{}{
"isOnMap": isOnMap,
"floor": floor,
"cameraName": cameraName,
}
- 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 {
logPrint(err)
- return false,nil
+ return false, nil
}
if res.Success {
- if bts, e := json.Marshal(res.Data);e == nil {
- if e = json.Unmarshal(bts, &cams);e ==nil {
+ if bts, e := json.Marshal(res.Data); e == nil {
+ if e = json.Unmarshal(bts, &cams); e == nil {
return true, cams
}
}
}
- return false,nil
+ return false, nil
}
func (api CameraApi) UpdatePos(id string, floor int, longitude float32, latitude float32) bool {
url := DATA_URL_PREFIX + "/camera/updatePos"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody:= map[string]interface{}{
- "id": id,
- "floor": floor,
+ paramBody := map[string]interface{}{
+ "id": id,
+ "floor": floor,
"longitude": longitude,
- "latitude": latitude,
+ "latitude": latitude,
}
- 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 {
logPrint(err)
return false
@@ -405,12 +422,13 @@
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, 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
}
@@ -419,17 +437,18 @@
url := DATA_URL_PREFIX + "/camera/coord"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cameraId": cameraId,
}
body, err := client.DoGetRequest(url, 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
}
@@ -438,12 +457,13 @@
url := DATA_URL_PREFIX + "/camera/updateCoord"
netNode := getNetNode(url2Topic(Topic_Camera_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 {
logPrint(err)
return false
@@ -456,12 +476,13 @@
url := DATA_URL_PREFIX + "/camera/saveNotExistOrUpdate"
netNode := getNetNode(url2Topic(Topic_Camera_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 {
logPrint(err)
return false
diff --git a/cameraGroupApi.go b/cameraGroupApi.go
index 4ee8094..3c13c57 100644
--- a/cameraGroupApi.go
+++ b/cameraGroupApi.go
@@ -1,12 +1,11 @@
package bhomedbapi
-import json "github.com/json-iterator/go"
+import jsoniter "github.com/json-iterator/go"
type CameraGroupApi struct {
-
}
-func (api CameraGroupApi) FindAll() (flag bool,list interface{}) {
+func (api CameraGroupApi) FindAll() (flag bool, list interface{}) {
url := DATA_URL_PREFIX + "/camera/group/findAll"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
@@ -17,26 +16,28 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint("relations unmarshal err:", err)
- return false,nil
+ return false, nil
}
return res.Success, res.Data
}
-func (api CameraGroupApi) Save(paramBody map[string]interface{}) (bool,interface{}) {
+func (api CameraGroupApi) Save(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/group/save"
netNode := getNetNode(url2Topic(Topic_Scene_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
-}
\ No newline at end of file
+ return res.Success, res.Data
+}
diff --git a/cameraPolygonRelationApi.go b/cameraPolygonRelationApi.go
index 63e8a65..1879cfc 100644
--- a/cameraPolygonRelationApi.go
+++ b/cameraPolygonRelationApi.go
@@ -2,14 +2,13 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type CameraPolygonRelationApi struct {
-
}
-func (api CameraPolygonRelationApi) FindAll() (flag bool,list []protomsg.CameraPolygonRelation) {
+func (api CameraPolygonRelationApi) FindAll() (flag bool, list []protomsg.CameraPolygonRelation) {
url := DATA_URL_PREFIX + "/polygon/relation/findAll"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
@@ -20,9 +19,10 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint("relations unmarshal err:", err)
- return false,nil
+ return false, nil
}
bts, _ := json.Marshal(res.Data)
@@ -34,52 +34,55 @@
return true, list
}
-func (api CameraPolygonRelationApi) Relations(paramBody map[string]interface{}) (bool,interface{}) {
+func (api CameraPolygonRelationApi) Relations(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/polygon/relations"
netNode := getNetNode(url2Topic(Topic_Scene_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
}
-func (api CameraPolygonRelationApi) SaveRelation(paramBody map[string]interface{}) (bool,interface{}) {
+func (api CameraPolygonRelationApi) SaveRelation(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/polygon/relation/save"
netNode := getNetNode(url2Topic(Topic_Scene_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 CameraPolygonRelationApi) DelRelation(id string) bool {
url := DATA_URL_PREFIX + "/polygon/relation/del"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- paramMap := make(map[string]string,0)
+ paramMap := make(map[string]string, 0)
paramMap["id"] = id
- body, err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM,nil,paramMap)
+ body, err := client.DoDeleteRequest(url, CONTENT_TYPE_FORM, nil, paramMap)
if err != nil {
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false
}
return res.Success
-}
\ No newline at end of file
+}
diff --git a/cameraRuleApi.go b/cameraRuleApi.go
index 2bf302e..ead5089 100644
--- a/cameraRuleApi.go
+++ b/cameraRuleApi.go
@@ -2,45 +2,46 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
-type CameraRuleApi struct{
-
+type CameraRuleApi struct {
}
-func (api CameraRuleApi) FindByCameraId(cameraId string) (bool,interface{}) {
+func (api CameraRuleApi) FindByCameraId(cameraId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/rule/findByCameraId"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- param := map[string]string {
+ param := map[string]string{
"cameraId": cameraId,
}
- body, err := client.DoGetRequest(url,param,nil)
+ body, err := client.DoGetRequest(url, param, nil)
if err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
return res.Success, res.Data
}
-func (api CameraRuleApi) Save(reqBody map[string]interface{}) (bool,interface{}) {
+func (api CameraRuleApi) Save(reqBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/rule/save"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
if err != nil {
logPrint(err)
return false, err.Error()
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint("result:", res, "err:", err, "body:", string(body))
return false, err.Error()
@@ -52,13 +53,14 @@
url := DATA_URL_PREFIX + "/camera/pasteRules"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
if err != nil {
logPrint(err)
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -70,13 +72,14 @@
url := DATA_URL_PREFIX + "/camera/rule/saveLinkRulesByGroup"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
if err != nil {
logPrint(err)
return false, err.Error()
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false, err.Error()
@@ -84,20 +87,21 @@
return res.Success, res.Data
}
-func (api CameraRuleApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool,interface{}) {
+func (api CameraRuleApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/rule/getLinkRulesByCameraIds"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
if err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
return res.Success, res.Data
}
@@ -106,13 +110,14 @@
url := DATA_URL_PREFIX + "/camera/rule/updateAlarmLevel"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
if err != nil {
logPrint(err)
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -124,13 +129,14 @@
url := DATA_URL_PREFIX + "/camera/rule/deleteGroup"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoDeleteRequest(url, CONTENT_TYPE_JSON, nil,nil)
+ body, err := client.DoDeleteRequest(url, CONTENT_TYPE_JSON, nil, nil)
if err != nil {
logPrint(err)
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err, "body:", string(body))
return false
@@ -138,20 +144,21 @@
return res.Success
}
-func (api CameraRuleApi) FindAll() (flag bool,allRules []protomsg.CameraAndRules) {
+func (api CameraRuleApi) FindAll() (flag bool, allRules []protomsg.CameraAndRules) {
url := DATA_URL_PREFIX + "/camera/rule/findAll"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoGetRequest(url, nil,nil)
+ body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
if !res.Success {
return false, nil
@@ -173,19 +180,20 @@
url := DATA_URL_PREFIX + "/camera/rule/findAllTaskById"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cameraId": camId,
}
- body, err := client.DoGetRequest(url, paramQuery,nil)
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
logPrint(err)
- return false,crs
+ return false, crs
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,crs
+ return false, crs
}
if !res.Success {
return false, crs
@@ -207,16 +215,17 @@
url := DATA_URL_PREFIX + "/camera/rule/existRunningTask"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cameraId": camId,
}
- body, err := client.DoGetRequest(url, paramQuery,nil)
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
logPrint(err)
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -224,24 +233,24 @@
if !res.Success {
return false
}
- if v,ok := res.Data.(bool);ok {
+ if v, ok := res.Data.(bool); ok {
return v
}
return false
}
-
func (api CameraRuleApi) FindAllCameraLink() (b bool, list []protomsg.CameraLink) {
url := DATA_URL_PREFIX + "/camera/findAllCameraLink"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoGetRequest(url, nil,nil)
+ body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
logPrint(err)
return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false, nil
@@ -258,12 +267,12 @@
if err == nil {
return true, list
} else {
- return false ,nil
+ return false, nil
}
}
}
-func (api CameraRuleApi) FindLinksByCameraIds(camIds []string) (b bool,linkList []protomsg.CameraLink) {
+func (api CameraRuleApi) FindLinksByCameraIds(camIds []string) (b bool, linkList []protomsg.CameraLink) {
url := DATA_URL_PREFIX + "/camera/rule/findLinksByCameraIds"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
@@ -271,16 +280,17 @@
"cameraIds": camIds,
}
- body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody,nil, nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
if err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
if res.Success {
bts, err := json.Marshal(res.Data)
@@ -294,4 +304,4 @@
}
}
return false, nil
-}
\ No newline at end of file
+}
diff --git a/chanmanageApi.go b/chanmanageApi.go
index 5a716ec..5116f20 100644
--- a/chanmanageApi.go
+++ b/chanmanageApi.go
@@ -2,56 +2,57 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type ChanManageApi struct {
-
}
//淇濆瓨杞閰嶇疆
-func (api ChanManageApi) SavePollPeriod(period int) (bool,interface{}){
+func (api ChanManageApi) SavePollPeriod(period int) (bool, interface{}) {
url := DATA_URL_PREFIX + "/pollConfig/savePollPeriod"
netNode := getNetNode(url2Topic(Topic_Chanmanage_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["period"] = period
- 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,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api ChanManageApi) SavePollDelay(delay int) (bool,interface{}){
+func (api ChanManageApi) SavePollDelay(delay int) (bool, interface{}) {
url := DATA_URL_PREFIX + "/pollConfig/savePollDelay"
netNode := getNetNode(url2Topic(Topic_Chanmanage_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["delay"] = delay
- 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,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
//鑾峰彇杞閰嶇疆
-func (api ChanManageApi) GetPollConfig() (flag bool,config protomsg.PollConfig) {
+func (api ChanManageApi) GetPollConfig() (flag bool, config protomsg.PollConfig) {
url := DATA_URL_PREFIX + "/pollConfig/getPollConfig"
netNode := getNetNode(url2Topic(Topic_Chanmanage_Service, url))
client := NewClient(WithNodes(netNode))
@@ -62,39 +63,41 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint("unmarshal to Result err:", err)
return false, config
}
b, err := json.Marshal(res.Data)
- if err !=nil {
+ if err != nil {
logPrint("marshal res.Data err:", err)
- return false,config
+ return false, config
} else {
err = json.Unmarshal(b, &config)
- if err !=nil {
+ if err != nil {
logPrint("unmarshal config err:", err)
- return false,config
+ return false, config
} else {
- return true,config
+ return true, config
}
}
}
//鍒囨崲杞鏄惁寮�鍚拰鍏抽棴
-func (api ChanManageApi) UpdatePollEnable(enable bool) bool{
+func (api ChanManageApi) UpdatePollEnable(enable bool) bool {
url := DATA_URL_PREFIX + "/pollConfig/updateEnable"
netNode := getNetNode(url2Topic(Topic_Chanmanage_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["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
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false
}
@@ -102,19 +105,20 @@
return res.Success
}
-func (api ChanManageApi) UpdateChannelCount(pollChannelCount int, videoChannelCount int) bool{
+func (api ChanManageApi) UpdateChannelCount(pollChannelCount int, videoChannelCount int) bool {
url := DATA_URL_PREFIX + "/pollConfig/updateChannelCount"
netNode := getNetNode(url2Topic(Topic_Chanmanage_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["pollChannelCount"] = pollChannelCount
paramBody["videoChannelCount"] = videoChannelCount
- 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
}
diff --git a/cluster.go b/cluster.go
index 16395a4..c61abcf 100644
--- a/cluster.go
+++ b/cluster.go
@@ -2,177 +2,180 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type ClusterApi struct {
-
}
-func (api ClusterApi) FindCluster() (flag bool,info protomsg.ClusterAndNodes) {
+func (api ClusterApi) FindCluster() (flag bool, info protomsg.ClusterAndNodes) {
url := DATA_URL_PREFIX + "/cluster/findCluster"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- body,err := client.DoGetRequest(url, nil,nil)
+ body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return false,info
+ return false, info
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return false,info
+ return false, info
}
if res.Success {
b, err := json.Marshal(res.Data)
- if err !=nil {
+ if err != nil {
logPrint("marshal res.Data err")
- return false,info
+ return false, info
}
- if err = json.Unmarshal(b, &info);err !=nil {
- return false,info
+ if err = json.Unmarshal(b, &info); err != nil {
+ return false, info
} else {
- return true,info
+ return true, info
}
}
- return false,info
+ return false, info
}
-func (api ClusterApi) Create(clusterName string, password string, virtualIp string) (bool,interface{}) {
+func (api ClusterApi) Create(clusterName string, password string, virtualIp string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/create"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
"clusterName": clusterName,
- "password": password,
- "virtualIp": virtualIp,
+ "password": password,
+ "virtualIp": virtualIp,
}
- 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 ClusterApi) Search(searchNum string, password string) (bool,interface{}) {
+func (api ClusterApi) Search(searchNum string, password string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/search"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
"searchNum": searchNum,
- "password": password,
+ "password": password,
}
- 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 ClusterApi) GetSearchNodes() (bool,interface{}) {
+func (api ClusterApi) GetSearchNodes() (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/getSearchNodes"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- body,err := client.DoGetRequest(url, nil,nil)
+ body, err := client.DoGetRequest(url, 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 ClusterApi) StopSearching(searchNum string) (bool,interface{}) {
+func (api ClusterApi) StopSearching(searchNum string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/stopSearching"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
"searchNum": searchNum,
}
- 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 ClusterApi) UpdateClusterName(clusterName string, virtualIp string) (bool,interface{}) {
+func (api ClusterApi) UpdateClusterName(clusterName string, virtualIp string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/updateClusterName"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
"clusterName": clusterName,
- "virtualIp": virtualIp,
+ "virtualIp": virtualIp,
}
- 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,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 ClusterApi) Leave() (bool,interface{}) {
+func (api ClusterApi) Leave() (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/leave"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, nil,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, nil, 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 ClusterApi) JoinCluster(paramBody map[string]interface{}) (bool,interface{}) {
+func (api ClusterApi) JoinCluster(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cluster/joinCluster"
- netNode := getNetNode(url2Topic(Topic_System_Service,url))
+ netNode := getNetNode(url2Topic(Topic_System_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
}
-
-
-
diff --git a/dbpersonApi.go b/dbpersonApi.go
index efc1c92..443a294 100644
--- a/dbpersonApi.go
+++ b/dbpersonApi.go
@@ -2,319 +2,333 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
"strconv"
)
type DbPersonApi struct {
-
}
-func (api DbPersonApi) QueryDbPersonsByTbId(paramBody map[string]interface{}) (bool,interface{}) {
+func (api DbPersonApi) QueryDbPersonsByTbId(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/queryDbPersonsByTbId"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ 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 DbPersonApi) UpdateDbPerson(paramBody map[string]interface{}) (bool,interface{}) {
+func (api DbPersonApi) UpdateDbPerson(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/updateDbPerson"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ 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 DbPersonApi) UpdateFace(id string,faceFeature string, pic string) (bool,interface{}) {
+func (api DbPersonApi) UpdateFace(id string, faceFeature string, pic string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/updateFace"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
- "id": id,
- "faceFeature": faceFeature,
+ "id": id,
+ "faceFeature": faceFeature,
"personPicUrl": pic,
}
- 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 DbPersonApi) AddDbPerson(paramBody map[string]interface{}) (bool,interface{}) {
+func (api DbPersonApi) AddDbPerson(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/addDbPerson"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ 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 DbPersonApi) DeleteDbPerson(id string) (bool,interface{}) {
+func (api DbPersonApi) DeleteDbPerson(id string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/deleteDbPersonById"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ 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
}
-func (api DbPersonApi) DeleteMoreDbPerson(paramBody map[string]interface{}) (bool,interface{}) {
+func (api DbPersonApi) DeleteMoreDbPerson(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/deleteMoreDbPerson"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ 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 DbPersonApi) DeletePersonsByTbId(tableId string) (bool,interface{}) {
+func (api DbPersonApi) DeletePersonsByTbId(tableId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/deletePersonsByTbId"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"tableId": tableId,
}
- 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 DbPersonApi) Dbpersoninfosbyid (ids []string) (persons []protomsg.Dbperson,err error) {
+func (api DbPersonApi) Dbpersoninfosbyid(ids []string) (persons []protomsg.Dbperson, err error) {
url := DATA_URL_PREFIX + "/dbperson/dbPersonInfoByIds"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ 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, &persons);err !=nil {
- return nil,err
+ if err = json.Unmarshal(dataBytes, &persons); err != nil {
+ return nil, err
}
- return persons,nil
+ return persons, nil
}
-func (api DbPersonApi) GetPersonTotal (tableId string) (total int64,err error) {
+func (api DbPersonApi) GetPersonTotal(tableId string) (total int64, err error) {
url := DATA_URL_PREFIX + "/dbperson/getPersonTotal"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]string{
"tableId": tableId,
}
- body,err := client.DoGetRequest(url, paramBody,nil)
+ body, err := client.DoGetRequest(url, paramBody, nil)
if err != nil {
- return 0,err
+ return 0, err
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return 0,err
+ return 0, err
}
- return int64(res.Data.(float64)),nil
+ return int64(res.Data.(float64)), nil
}
-func (api DbPersonApi) GetPersonsCompareCacheBase (from int,size int) (persons []*protomsg.Esinfo,err error) {
+func (api DbPersonApi) GetPersonsCompareCacheBase(from int, size int) (persons []*protomsg.Esinfo, err error) {
url := DATA_URL_PREFIX + "/dbperson/getPersonsCompareCacheBase"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]string{
"from": strconv.Itoa(from),
"size": strconv.Itoa(size),
}
- body,err := client.DoGetRequest(url, paramBody,nil)
+ body, err := client.DoGetRequest(url, paramBody, 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)
var arr []protomsg.Esinfo
- if err = json.Unmarshal(dataBytes, &arr);err !=nil {
- return nil,err
+ if err = json.Unmarshal(dataBytes, &arr); err != nil {
+ return nil, err
}
- for _,ei :=range arr {
- persons = append(persons,&protomsg.Esinfo{
- Id: ei.Id,
- Tableid: ei.Tableid,
+ for _, ei := range arr {
+ persons = append(persons, &protomsg.Esinfo{
+ Id: ei.Id,
+ Tableid: ei.Tableid,
FaceFeature: ei.FaceFeature,
- Enable: ei.Enable,
+ Enable: ei.Enable,
CarNo: ei.CarNo,
})
}
- return persons,nil
+ return persons, nil
}
-func (api DbPersonApi) FindLikePersonIds (tableIds []string,inputValue string) (interface{},error) {
+func (api DbPersonApi) FindLikePersonIds(tableIds []string, inputValue string) (interface{}, error) {
url := DATA_URL_PREFIX + "/dbperson/findLikePersonIds"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
- "tableIds": tableIds,
+ "tableIds": tableIds,
"inputValue": inputValue,
}
- 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
}
- return res.Data,nil
+ return res.Data, nil
}
-func (api DbPersonApi) JoinDbTable (tableIds []string,faceFeature string, personPicUrl string) (bool,interface{}) {
+func (api DbPersonApi) JoinDbTable(tableIds []string, faceFeature string, personPicUrl string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/joinDbTable"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
- "tableIds": tableIds,
- "faceFeature": faceFeature,
+ "tableIds": tableIds,
+ "faceFeature": faceFeature,
"personPicUrl": personPicUrl,
}
- 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 DbPersonApi) Move (personId string,tableIds []string) (bool,interface{}) {
+func (api DbPersonApi) Move(personId string, tableIds []string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/move"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
"personId": personId,
"tableIds": tableIds,
}
- 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 DbPersonApi) Copy (personId string,tableIds []string) (bool,interface{}) {
+func (api DbPersonApi) Copy(personId string, tableIds []string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dbperson/copy"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ netNode := getNetNode(url2Topic(Topic_CompTable_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
"personId": personId,
"tableIds": tableIds,
}
- 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 DbPersonApi) MultiUploadCarNo(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/dbperson/multiUploadCarNo"
- netNode := getNetNode(url2Topic(Topic_CompTable_Service,url))
+ 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 {
logPrint("multiUploadCarNo err:", err)
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- logPrint("unmarshal err:",err)
+ logPrint("unmarshal err:", err)
return false
}
return res.Success
-}
\ No newline at end of file
+}
diff --git a/dbtableApi.go b/dbtableApi.go
index a450ed7..2e24edf 100644
--- a/dbtableApi.go
+++ b/dbtableApi.go
@@ -2,232 +2,240 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
"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))
+ 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))
+ 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))
+ 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))
+ 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))
+ 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))
+ 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))
+ 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))
+ 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))
+ 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))
+ 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
}
-
diff --git a/deviceCtlApi.go b/deviceCtlApi.go
index 9008f28..a92ddfc 100644
--- a/deviceCtlApi.go
+++ b/deviceCtlApi.go
@@ -2,14 +2,13 @@
import (
"basic.com/valib/c_bhomebus.git/proto/source/bhome_msg"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type DeviceCtlApi struct {
-
}
-func (api DeviceCtlApi) DevAuthApply(targetIp string, fromDevId string, fromIp string, key string) (bool,interface{}) {
+func (api DeviceCtlApi) DevAuthApply(targetIp string, fromDevId string, fromIp string, key string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/devAuth/apply"
dest := &bhome_msg.BHAddress{
Ip: []byte(targetIp),
@@ -19,22 +18,23 @@
})
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
+ paramBody := map[string]interface{}{
"key": key,
"fromDevId": fromDevId,
"fromIp": fromIp,
}
- 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 DeviceCtlApi) DevDetail(targetIp string, devId string) (bool, interface{}) {
@@ -47,21 +47,22 @@
Addr: dest,
})
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"devId": devId,
}
client := NewClient(WithNodes(netNode))
- body,err := client.DoGetRequest(url,paramQuery,nil)
+ body, err := client.DoGetRequest(url, 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
}
//鎺у埗鍏朵粬鑺傜偣鍒涘缓闆嗙兢
@@ -76,17 +77,18 @@
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
}
//鎺у埗鍏朵粬鑺傜偣鎼滅储闆嗙兢
@@ -101,17 +103,18 @@
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
}
//鑾峰彇杩滅▼璁惧鎼滅储鍒伴泦缇よ妭鐐瑰垪琛�
@@ -126,17 +129,18 @@
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
}
//鎺у埗鍏朵粬鑺傜偣璁惧鍔犲叆闆嗙兢
@@ -151,17 +155,18 @@
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
}
//杩滅▼鎺у埗璁惧閲嶅惎
@@ -175,20 +180,19 @@
})
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
-
- }
- body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, paramBody,nil)
+ paramBody := map[string]interface{}{}
+ 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
}
//杩滅▼鎺у埗绠楁硶鎴栧簲鐢ㄥ嵏杞�
@@ -202,20 +206,21 @@
})
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
+ paramBody := map[string]interface{}{
"id": id,
}
- 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
}
//杩滅▼鎺у埗璁惧绯荤粺鏇存柊
@@ -230,16 +235,16 @@
client := NewClient(WithNodes(netNode))
- body,err := client.DoPutRequest(url,CONTENT_TYPE_JSON, nil,nil)
+ body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, 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
}
-
diff --git a/dicApi.go b/dicApi.go
index d59c191..0c977b6 100644
--- a/dicApi.go
+++ b/dicApi.go
@@ -2,70 +2,73 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type DicApi struct {
-
}
-func (api DicApi) FindByType(dicType string) (bool,interface{}) {
+func (api DicApi) FindByType(dicType string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dictionary/findByType"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string)
paramMap["type"] = dicType
respBody, err := client.DoGetRequest(url, paramMap, nil)
- if err !=nil {
- return false,nil
+ if err != nil {
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
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 DicApi) FindByParentId(parentId string) (bool,interface{}){
+func (api DicApi) FindByParentId(parentId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/dictionary/findByParentId"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string)
paramMap["parentId"] = parentId
respBody, err := client.DoGetRequest(url, paramMap, nil)
- if err !=nil {
- return false,nil
+ if err != nil {
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
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 DicApi) ListByType(typ string) (flag bool,list []protomsg.Dic){
+func (api DicApi) ListByType(typ string) (flag bool, list []protomsg.Dic) {
url := DATA_URL_PREFIX + "/dictionary/listByType"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string)
paramMap["type"] = typ
respBody, err := client.DoGetRequest(url, paramMap, nil)
- if err !=nil {
- return false,nil
+ if err != nil {
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
if res.Success {
dataBytes, _ := json.Marshal(res.Data)
- if err = json.Unmarshal(dataBytes, &list);err !=nil {
- return false,nil
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
+ if err = json.Unmarshal(dataBytes, &list); err != nil {
+ return false, nil
}
return true, list
}
return false, nil
-}
\ No newline at end of file
+}
diff --git a/eventPush.go b/eventPush.go
index bbc050a..91118e2 100644
--- a/eventPush.go
+++ b/eventPush.go
@@ -2,141 +2,147 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type EventPushApi struct {
-
}
-func (api EventPushApi) Save(paramBody map[string]interface{}) (bool,interface{}){
+func (api EventPushApi) Save(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/eventPush/save"
netNode := getNetNode(url2Topic(Topic_EventPush_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 {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api EventPushApi) FindByEventTopic(topic string,childType string) (bool,interface{}){
+func (api EventPushApi) FindByEventTopic(topic string, childType string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/eventPush/findByEventTopic"
netNode := getNetNode(url2Topic(Topic_EventPush_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery :=make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["topic"] = topic
paramQuery["type"] = childType
body, err := client.DoGetRequest(url, 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 true,res.Data
+ return true, res.Data
}
-func (api EventPushApi) FindAll(name string) (bool,interface{}){
+func (api EventPushApi) FindAll(name string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/eventPush/findAll"
netNode := getNetNode(url2Topic(Topic_EventPush_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery :=make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["name"] = name
body, err := client.DoGetRequest(url, 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 true,res.Data
+ return true, res.Data
}
-func (api EventPushApi) FindAllDetails() (b bool,allRules []protomsg.EventPush){
+func (api EventPushApi) FindAllDetails() (b bool, allRules []protomsg.EventPush) {
url := DATA_URL_PREFIX + "/eventPush/findAllDetails"
netNode := getNetNode(url2Topic(Topic_EventPush_Service, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, 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
}
bytes, _ := json.Marshal(res.Data)
err = json.Unmarshal(bytes, &allRules)
- if err !=nil{
- logPrint("all eventPushRules unmarshal err:",err)
- return false,nil
+ if err != nil {
+ logPrint("all eventPushRules unmarshal err:", err)
+ return false, nil
}
- return true,allRules
+ return true, allRules
}
-func (api EventPushApi) GetById(id string) (bool,interface{}){
+func (api EventPushApi) GetById(id string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/eventPush/getById"
netNode := getNetNode(url2Topic(Topic_EventPush_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery :=make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["id"] = id
body, err := client.DoGetRequest(url, 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 true,res.Data
+ return true, res.Data
}
-func (api EventPushApi) ChangeStatus(id string,enable bool) (bool,interface{}){
+func (api EventPushApi) ChangeStatus(id string, enable bool) (bool, interface{}) {
url := DATA_URL_PREFIX + "/eventPush/changeStatus"
netNode := getNetNode(url2Topic(Topic_EventPush_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["id"] = id
paramBody["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 true,res.Data
+ return true, res.Data
}
-func (api EventPushApi) Delete(id string) (bool,interface{}){
+func (api EventPushApi) Delete(id string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/eventPush/delete"
netNode := getNetNode(url2Topic(Topic_EventPush_Service, url))
client := NewClient(WithNodes(netNode))
- paramForm :=make(map[string]interface{},0)
+ paramForm := make(map[string]interface{}, 0)
paramForm["id"] = id
body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramForm, 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 true,res.Data
-}
\ No newline at end of file
+ return true, res.Data
+}
diff --git a/fileAnalysis.go b/fileAnalysis.go
index 4b248d6..1a928c1 100644
--- a/fileAnalysis.go
+++ b/fileAnalysis.go
@@ -2,24 +2,24 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
"strconv"
)
-type FileAnalysisApi struct{
-
+type FileAnalysisApi struct {
}
func (api FileAnalysisApi) Save(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/fileAnalysis/save"
netNode := getNetNode(url2Topic(Topic_Stack_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
}
@@ -27,12 +27,12 @@
return res.Success
}
-func (api FileAnalysisApi) Show(id string) (bool,interface{}) {
+func (api FileAnalysisApi) Show(id string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/fileAnalysis/show"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
- "id":id,
+ paramQuery := map[string]string{
+ "id": id,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
@@ -40,6 +40,7 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
@@ -47,15 +48,15 @@
return res.Success, res.Data
}
-func (api FileAnalysisApi) FindAllFile(fileName string,fType int, page int, size int) (bool,interface{}){
+func (api FileAnalysisApi) FindAllFile(fileName string, fType int, page int, size int) (bool, interface{}) {
url := DATA_URL_PREFIX + "/fileAnalysis/findAllFile"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"fileName": fileName,
- "type": strconv.Itoa(fType),
- "page": strconv.Itoa(page),
- "size": strconv.Itoa(size),
+ "type": strconv.Itoa(fType),
+ "page": strconv.Itoa(page),
+ "size": strconv.Itoa(size),
}
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
@@ -63,6 +64,7 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
@@ -70,7 +72,7 @@
return res.Success, res.Data
}
-func (api FileAnalysisApi) GetAnalysisFiles() (files []protomsg.FileAnalysis,err error){
+func (api FileAnalysisApi) GetAnalysisFiles() (files []protomsg.FileAnalysis, err error) {
url := DATA_URL_PREFIX + "/fileAnalysis/getAnalysisFiles"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
@@ -81,8 +83,9 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return files,err
+ return files, err
}
bytes, _ := json.Marshal(res.Data)
@@ -91,33 +94,34 @@
return files, err
}
-func (api FileAnalysisApi) FindByStackId(stackId string, typ int,name string, page int, size int) (bool,interface{}) {
+func (api FileAnalysisApi) FindByStackId(stackId string, typ int, name string, page int, size int) (bool, interface{}) {
url := DATA_URL_PREFIX + "/fileAnalysis/findByStackId"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]string {
+ paramBody := map[string]string{
"stackId": stackId,
- "type": strconv.Itoa(typ),
- "name": name,
- "page": strconv.Itoa(page),
- "size": strconv.Itoa(size),
+ "type": strconv.Itoa(typ),
+ "name": name,
+ "page": strconv.Itoa(page),
+ "size": strconv.Itoa(size),
}
body, err := client.DoGetRequest(url, paramBody, nil)
if err != nil {
- logPrint("err:",err)
- return false,nil
+ logPrint("err:", err)
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- logPrint("unmarshal res err:",err)
- return false,nil
+ logPrint("unmarshal res err:", err)
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api FileAnalysisApi) GetFileAnalysisSet() (set protomsg.FileAnalysisSetting,err error) {
+func (api FileAnalysisApi) GetFileAnalysisSet() (set protomsg.FileAnalysisSetting, err error) {
url := DATA_URL_PREFIX + "/fileSetting/show"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
@@ -128,8 +132,9 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return set,err
+ return set, err
}
bytes, _ := json.Marshal(res.Data)
@@ -142,16 +147,17 @@
url := DATA_URL_PREFIX + "/fileAnalysis/updateProgress"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "ids":ids,
+ paramBody := map[string]interface{}{
+ "ids": ids,
"progress": progress,
}
- 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 {
logPrint(err)
return false
@@ -164,15 +170,16 @@
url := DATA_URL_PREFIX + "/fileSetting/changeEnable"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "enable":enable,
+ paramBody := map[string]interface{}{
+ "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
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -185,16 +192,17 @@
url := DATA_URL_PREFIX + "/fileAnalysis/updateStatus"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
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 res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -207,15 +215,16 @@
url := DATA_URL_PREFIX + "/fileAnalysis/delete"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "ids":idArr,
+ paramBody := map[string]interface{}{
+ "ids": idArr,
}
- 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 {
logPrint(err)
return false
@@ -224,20 +233,21 @@
return res.Success
}
-func (api FileAnalysisApi) SortFile(id string,direct int) bool {
+func (api FileAnalysisApi) SortFile(id string, direct int) bool {
url := DATA_URL_PREFIX + "/fileAnalysis/sortFile"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "id": id,
+ paramBody := map[string]interface{}{
+ "id": id,
"direct": direct,
}
- 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 {
logPrint(err)
return false
@@ -246,20 +256,21 @@
return res.Success
}
-func (api FileAnalysisApi) Rename(id string,name string) bool {
+func (api FileAnalysisApi) Rename(id string, name string) bool {
url := DATA_URL_PREFIX + "/fileAnalysis/rename"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "id": id,
+ paramBody := map[string]interface{}{
+ "id": id,
"name": name,
}
- 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 res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -268,20 +279,21 @@
return res.Success
}
-func (api FileAnalysisApi) Move(id string,stackId string) bool {
+func (api FileAnalysisApi) Move(id string, stackId string) bool {
url := DATA_URL_PREFIX + "/fileAnalysis/move"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "id": id,
+ paramBody := map[string]interface{}{
+ "id": id,
"stackId": stackId,
}
- 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 res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -290,24 +302,25 @@
return res.Success
}
-func (api FileAnalysisApi) Copy(id string,stackIds []string) bool {
+func (api FileAnalysisApi) Copy(id string, stackIds []string) bool {
url := DATA_URL_PREFIX + "/fileAnalysis/copy"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "id": id,
+ paramBody := map[string]interface{}{
+ "id": id,
"stackIds": stackIds,
}
- 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 {
logPrint(err)
return false
}
return res.Success
-}
\ No newline at end of file
+}
diff --git a/fileStack.go b/fileStack.go
index a3213ce..e3c8e20 100644
--- a/fileStack.go
+++ b/fileStack.go
@@ -2,53 +2,54 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ 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))
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))
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)
@@ -61,11 +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))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"name": name,
"type": strconv.Itoa(fType),
"page": strconv.Itoa(page),
@@ -76,16 +77,17 @@
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))
client := NewClient(WithNodes(netNode))
@@ -95,6 +97,7 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
@@ -102,38 +105,39 @@
if !res.Success {
logPrint("FindAllDoingStacks ret false,res:", res)
- return false,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
}
}
-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))
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
}
@@ -145,17 +149,18 @@
url := DATA_URL_PREFIX + "/fileStack/delete"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
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
}
@@ -166,15 +171,16 @@
url := DATA_URL_PREFIX + "/fileStack/updateStatus"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
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)
@@ -188,14 +194,15 @@
url := DATA_URL_PREFIX + "/fileSetting/updateChannelCount"
netNode := getNetNode(url2Topic(Topic_Stack_Service, url))
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)
@@ -205,7 +212,7 @@
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))
client := NewClient(WithNodes(netNode))
@@ -215,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
+}
diff --git a/gb28181Api.go b/gb28181Api.go
index 5d4ea58..c43052f 100644
--- a/gb28181Api.go
+++ b/gb28181Api.go
@@ -2,30 +2,31 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
"strconv"
)
-type Gb28181Api struct{
-
+type Gb28181Api struct {
}
//鍥芥爣閰嶇疆鏄剧ず
-func (api Gb28181Api) Show() (flag bool,gbConfig protomsg.Gb28181Config) {
+func (api Gb28181Api) Show() (flag bool, gbConfig protomsg.Gb28181Config) {
netNode := getNetNode(Topic_Gb28181_Service)
url := DATA_URL_PREFIX + "/gb28181/configShow"
client := NewClient(WithNodes(netNode))
respBody, err := client.DoGetRequest(url, nil, nil)
- if err !=nil {
- return false,gbConfig
+ if err != nil {
+ return false, gbConfig
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
- return false,gbConfig
+ return false, gbConfig
}
if res.Success {
- if bts,err := json.Marshal(res.Data);err ==nil {
- if err = json.Unmarshal(bts, &gbConfig);err ==nil {
+ if bts, err := json.Marshal(res.Data); err == nil {
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
+ if err = json.Unmarshal(bts, &gbConfig); err == nil {
return true, gbConfig
}
}
@@ -43,42 +44,45 @@
return flag
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
return flag
}
return res.Success
}
-func (api Gb28181Api) FindAreaByParentId(parentId string) (bool,interface{}) {
+func (api Gb28181Api) FindAreaByParentId(parentId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/gb28181/findAreaByParentId"
- netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string, 0)
paramMap["parentId"] = parentId
respBody, err := client.DoGetRequest(url, paramMap, nil)
- if err !=nil {
- return false,nil
+ if err != nil {
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
- return false,nil
+ return false, nil
}
return res.Success, res.Data
}
-func (api Gb28181Api) NewGbId(code string) (bool,interface{}) {
+func (api Gb28181Api) NewGbId(code string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/gb28181/newGbId"
- netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
paramMap := make(map[string]string, 0)
paramMap["code"] = code
respBody, err := client.DoGetRequest(url, paramMap, nil)
- if err !=nil {
- return false,nil
+ if err != nil {
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
- return false,nil
+ return false, nil
}
return res.Success, res.Data
}
@@ -88,7 +92,7 @@
//cameraName锛堟憚鍍忔満鍚嶇О锛�
func (api Gb28181Api) GetGb28181CameraTree(parentId string, searchType string, cameraName string) []TreeMenu {
url := DATA_URL_PREFIX + "/gb28181/tree"
- netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
var result []TreeMenu
client := NewClient(WithNodes(netNode))
@@ -104,12 +108,13 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
return nil
}
bytes, _ := json.Marshal(res.Data)
- if err = json.Unmarshal(bytes, &result);err !=nil{
+ if err = json.Unmarshal(bytes, &result); err != nil {
return nil
}
return result
@@ -122,13 +127,14 @@
flag := false
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
- "id":id,
+ "id": id,
}
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
return flag
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
return flag
}
@@ -147,6 +153,7 @@
return flag
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(respBody, &res); err != nil {
return flag
}
@@ -155,27 +162,28 @@
}
//鑾峰彇鏈妭鐐圭殑鎵�鏈夊浗鏍囨憚鍍忔満
-func (api Gb28181Api) GetAllCamerasByServer(serverId string,cameraName string) (b bool,cams []protomsg.Camera) {
+func (api Gb28181Api) GetAllCamerasByServer(serverId string, cameraName string) (b bool, cams []protomsg.Camera) {
url := DATA_URL_PREFIX + "/gb28181/getAllCamerasByServer"
- netNode := getNetNode(url2Topic(Topic_Gb28181_Service,url))
+ netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["serverId"] = serverId
paramQuery["cameraName"] = cameraName
body, err := client.DoGetRequest(url, 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
}
dataBytes, _ := json.Marshal(res.Data)
- if err := json.Unmarshal(dataBytes, &cams);err !=nil {
- return false,nil
+ if err := json.Unmarshal(dataBytes, &cams); err != nil {
+ return false, nil
}
- return res.Success,cams
+ return res.Success, cams
}
//鏌ユ壘鍦板浘涓婄殑鍥芥爣鎽勫儚鏈�
@@ -183,29 +191,30 @@
url := DATA_URL_PREFIX + "/gb28181/camera/findOnMap"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody:= map[string]interface{}{
+ paramBody := map[string]interface{}{
"isOnMap": isOnMap,
"floor": floor,
"cameraName": cameraName,
}
- 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 {
logPrint(err)
- return false,nil
+ return false, nil
}
if res.Success {
- if bts, e := json.Marshal(res.Data);e == nil {
- if e = json.Unmarshal(bts, &cams);e ==nil {
+ if bts, e := json.Marshal(res.Data); e == nil {
+ if e = json.Unmarshal(bts, &cams); e == nil {
return true, cams
}
}
}
- return false,nil
+ return false, nil
}
//鏇存柊鎽勫儚鏈虹粡绾害浠ュ強妤煎眰
@@ -213,18 +222,19 @@
url := DATA_URL_PREFIX + "/gb28181/camera/updatePos"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody:= map[string]interface{}{
- "id": id,
- "floor": floor,
+ paramBody := map[string]interface{}{
+ "id": id,
+ "floor": floor,
"longitude": longitude,
- "latitude": latitude,
+ "latitude": latitude,
}
- 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 {
logPrint(err)
return false
@@ -240,12 +250,13 @@
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, 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
}
@@ -255,17 +266,18 @@
url := DATA_URL_PREFIX + "/gb28181/camera/coord"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cameraId": cameraId,
}
body, err := client.DoGetRequest(url, 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
}
@@ -275,12 +287,13 @@
url := DATA_URL_PREFIX + "/gb28181/camera/updateCoord"
netNode := getNetNode(url2Topic(Topic_Gb28181_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 {
logPrint(err)
return false
@@ -289,18 +302,17 @@
return res.Success
}
-
-
func (api Gb28181Api) CameraUpdate(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/gb28181/camera/update"
netNode := getNetNode(url2Topic(Topic_Gb28181_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
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false
}
@@ -311,15 +323,16 @@
url := DATA_URL_PREFIX + "/gb28181/camera/updateSnapshot"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["snapshot"] = snapshot
paramBody["cameraId"] = cameraId
- 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 res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -333,7 +346,7 @@
url := DATA_URL_PREFIX + "/gb28181/camera/show"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cid": cameraId,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
@@ -342,8 +355,9 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return camera,err
+ return camera, err
}
bytes, _ := json.Marshal(res.Data)
@@ -356,17 +370,18 @@
url := DATA_URL_PREFIX + "/gb28181/camera/updateCameraArea"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
+ paramBody := map[string]interface{}{
"cameraId": cameraId,
- "areaId": areaId,
+ "areaId": areaId,
}
- body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil,nil)
- if err !=nil {
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
+ if err != nil {
return false
}
var res Result
- if err = json.Unmarshal(body, &res);err != nil {
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
+ if err = json.Unmarshal(body, &res); err != nil {
return false
}
@@ -377,11 +392,11 @@
url := DATA_URL_PREFIX + "/gb28181/camera/showAll"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cameraName": cameraName,
- "runType": runType,
- "cameraId": cameraId,
- "areaId": areaId,
+ "runType": runType,
+ "cameraId": cameraId,
+ "areaId": areaId,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
@@ -390,6 +405,7 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return nil
@@ -403,129 +419,135 @@
//鏍规嵁杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
//runType(0:鑾峰彇杞鍒楄〃锛�1锛氳幏鍙栧疄鏃跺垪琛�)
-func (api Gb28181Api) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
+func (api Gb28181Api) GetCamerasByRunType(runType int, cameraName string) (flag bool, cameras []protomsg.Camera) {
url := DATA_URL_PREFIX + "/gb28181/camera/getCamerasByRunType"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,2)
- paramQuery["runType"]=strconv.Itoa(runType)
+ paramQuery := make(map[string]string, 2)
+ paramQuery["runType"] = strconv.Itoa(runType)
paramQuery["cameraName"] = cameraName
body, err := client.DoGetRequest(url, 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
}
b, err := json.Marshal(res.Data)
- if err !=nil {
+ if err != nil {
logPrint("unmarshal GetCamerasByRunType.result err")
- return false,nil
+ return false, nil
}
- if err = json.Unmarshal(b, &cameras);err !=nil {
- return false,nil
+ if err = json.Unmarshal(b, &cameras); err != nil {
+ return false, nil
} else {
- return true,cameras
+ return true, cameras
}
}
-func (api Gb28181Api) UpdateRunEnable(cameraId string,runEnable bool) (bool,interface{}){
+func (api Gb28181Api) UpdateRunEnable(cameraId string, runEnable bool) (bool, interface{}) {
url := DATA_URL_PREFIX + "/gb28181/camera/updateRunEnable"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraId"] = cameraId
paramBody["runEnable"] = runEnable
- 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,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api Gb28181Api) UpdateIsRunningState(cameraId string,isRunning bool) (bool,interface{}){
+func (api Gb28181Api) UpdateIsRunningState(cameraId string, isRunning bool) (bool, interface{}) {
url := DATA_URL_PREFIX + "/gb28181/camera/updateIsRunningState"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraId"] = cameraId
paramBody["isRunning"] = isRunning
- 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,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api Gb28181Api) UpdateIsRunningAll(cameraIds []string) (bool,interface{}){
+func (api Gb28181Api) UpdateIsRunningAll(cameraIds []string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/gb28181/camera/updateIsRunningAll"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraIds"] = cameraIds
- 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 {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
//鎵归噺鍒囨崲鎽勫儚鏈鸿疆璇㈡垨瀹炴椂鐘舵��
-func (api Gb28181Api) ChangeRunType(paramBody map[string]interface{}) (bool,interface{}){
+func (api Gb28181Api) ChangeRunType(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/gb28181/camera/changeRunType"
netNode := getNetNode(url2Topic(Topic_Gb28181_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 {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
func (api Gb28181Api) SaveNotExistOrUpdate(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/gb28181/saveNotExistOrUpdate"
netNode := getNetNode(url2Topic(Topic_Gb28181_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 {
logPrint(err)
return false
}
return res.Success
-}
\ No newline at end of file
+}
diff --git a/httpClient.go b/httpClient.go
index e62875f..04f3d6d 100644
--- a/httpClient.go
+++ b/httpClient.go
@@ -2,12 +2,12 @@
import (
"bytes"
- json "github.com/json-iterator/go"
+ "github.com/ajg/form"
+ jsoniter "github.com/json-iterator/go"
"io/ioutil"
"log"
"net/http"
"strings"
- "github.com/ajg/form"
)
type HttpClient struct{}
@@ -52,17 +52,18 @@
var request *http.Request
var err error
if contentType == CONTENT_TYPE_FORM || contentType == CONTENT_TYPE_MULFORM {
- formData,err := form.EncodeToString(body)
- if err !=nil {
- return resultBytes,err
+ formData, err := form.EncodeToString(body)
+ if err != nil {
+ return resultBytes, err
}
- request, err = http.NewRequest("POST",url,strings.NewReader(formData))
- if err !=nil {
- return resultBytes,err
+ request, err = http.NewRequest("POST", url, strings.NewReader(formData))
+ if err != nil {
+ return resultBytes, err
}
} else {
var bodyJson []byte
if body != nil {
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var err error
bodyJson, err = json.Marshal(body)
if err != nil {
@@ -108,6 +109,7 @@
var resultBytes []byte
var bodyJson []byte
if body != nil {
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var err error
bodyJson, err = json.Marshal(body)
if err != nil {
@@ -144,6 +146,7 @@
var resultBytes []byte
var bodyJson []byte
if body != nil {
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var err error
bodyJson, err = json.Marshal(body)
if err != nil {
diff --git a/licenseApi.go b/licenseApi.go
index fd6176f..1494f16 100644
--- a/licenseApi.go
+++ b/licenseApi.go
@@ -1,61 +1,62 @@
package bhomedbapi
import (
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
-type LicenseApi struct{
-
+type LicenseApi struct {
}
-
-func (api LicenseApi) GetRegisterCode(paramBody map[string]interface{}) (bool,interface{}){
+func (api LicenseApi) GetRegisterCode(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/license/getRegisterCode"
netNode := getNetNode(url2Topic(Topic_System_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 json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
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 LicenseApi) Save(paramBody map[string]interface{}) (bool,interface{}){
+func (api LicenseApi) Save(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/license/save"
netNode := getNetNode(url2Topic(Topic_System_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 json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
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 LicenseApi) Show() (int,bool,interface{}){
+func (api LicenseApi) Show() (int, bool, interface{}) {
url := DATA_URL_PREFIX + "/license/show"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return 500,false,nil
+ return 500, false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return 500,false,nil
+ return 500, false, nil
}
- return res.Code,res.Success,res.Data
+ return res.Code, res.Success, res.Data
}
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
+}
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
+}
diff --git a/sysInitApi.go b/sysInitApi.go
index 657b2d9..bc9d9d9 100644
--- a/sysInitApi.go
+++ b/sysInitApi.go
@@ -1,15 +1,14 @@
package bhomedbapi
import (
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type SysInitApi struct {
-
}
//鑾峰彇鏈嶅姟鍣ㄦ湰鏈洪厤缃俊鎭�
-func (api SysInitApi) GetRegInfo() (bool,interface{}){
+func (api SysInitApi) GetRegInfo() (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysinit/getRegInfo"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -19,10 +18,11 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
return res.Success, res.Data
-}
\ No newline at end of file
+}
diff --git a/sysMenuApi.go b/sysMenuApi.go
index 15ab2ab..42befb2 100644
--- a/sysMenuApi.go
+++ b/sysMenuApi.go
@@ -1,14 +1,13 @@
package bhomedbapi
import (
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type SysMenuApi struct {
-
}
-func (api SysMenuApi) MenuTree(userId string) (bool,interface{}) {
+func (api SysMenuApi) MenuTree(userId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/menu/tree"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -17,12 +16,13 @@
}
body, err := client.DoGetRequest(url, query, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
- return true,res.Data
+ return true, res.Data
}
diff --git a/sysRoleApi.go b/sysRoleApi.go
index 13907f8..3ff00f7 100644
--- a/sysRoleApi.go
+++ b/sysRoleApi.go
@@ -1,25 +1,25 @@
package bhomedbapi
import (
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type SysRoleApi struct {
-
}
-func (api SysRoleApi) FindAll() (bool,interface{}) {
+func (api SysRoleApi) FindAll() (bool, interface{}) {
url := DATA_URL_PREFIX + "/role/findAll"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
- return true,res.Data
+ return true, res.Data
}
diff --git a/syssetApi.go b/syssetApi.go
index 72f34a5..e022bb1 100644
--- a/syssetApi.go
+++ b/syssetApi.go
@@ -3,15 +3,14 @@
import (
"basic.com/pubsub/protomsg.git"
"basic.com/valib/c_bhomebus.git/proto/source/bhome_msg"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type SysSetApi struct {
-
}
//鑾峰彇鏈嶅姟鍣ㄦ湰鏈洪厤缃俊鎭�
-func (api SysSetApi) GetServerInfo() (flag bool,sysconf protomsg.LocalConfig){
+func (api SysSetApi) GetServerInfo() (flag bool, sysconf protomsg.LocalConfig) {
url := DATA_URL_PREFIX + "/sysset/getServerInfo"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -21,42 +20,44 @@
return false, sysconf
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, sysconf
}
b, err := json.Marshal(res.Data)
- if err !=nil {
- return false,sysconf
+ if err != nil {
+ return false, sysconf
} else {
err = json.Unmarshal(b, &sysconf)
- if err !=nil {
- return false,sysconf
+ if err != nil {
+ return false, sysconf
} else {
- return true,sysconf
+ return true, sysconf
}
}
}
-func (api SysSetApi) AlarmEdit(paramBody map[string]interface{}) (bool,interface{}){
+func (api SysSetApi) AlarmEdit(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/alarmEdit"
netNode := getNetNode(url2Topic(Topic_System_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 json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
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 SysSetApi) VideoLenShow() (bool,interface{}){
+func (api SysSetApi) VideoLenShow() (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/videoLenShow"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -66,51 +67,54 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api SysSetApi) VideoLenEdit(maxVideoLen string,minVideoLen string) (bool,interface{}){
+func (api SysSetApi) VideoLenEdit(maxVideoLen string, minVideoLen string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/videoLenEdit"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["max_video_len"] = maxVideoLen
paramBody["min_video_len"] = minVideoLen
- 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,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
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 SysSetApi) SaveServerInfo(paramBody map[string]interface{}) (bool,interface{}){
+func (api SysSetApi) SaveServerInfo(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/saveServerInfo"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- 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,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
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 SysSetApi) Gb28181ConfigShow() (bool,interface{}){
+func (api SysSetApi) Gb28181ConfigShow() (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/gb28181ConfigShow"
netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
client := NewClient(WithNodes(netNode))
@@ -120,32 +124,33 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api SysSetApi) Gb28181ConfigEdit(paramBody map[string]interface{}) (bool,interface{}){
+func (api SysSetApi) Gb28181ConfigEdit(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/gb28181ConfigEdit"
netNode := getNetNode(url2Topic(Topic_Gb28181_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 json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
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 SysSetApi) GetRemoteFullServerInfo(headers map[string]string) (flag bool,d interface{}){
+func (api SysSetApi) GetRemoteFullServerInfo(headers map[string]string) (flag bool, d interface{}) {
url := DATA_URL_PREFIX + "/sysset/getDevInfo"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -155,15 +160,16 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api SysSetApi) GetClockInfo(headers map[string]string) (flag bool,d interface{}){
+func (api SysSetApi) GetClockInfo(headers map[string]string) (flag bool, d interface{}) {
url := DATA_URL_PREFIX + "/sysset/clockInfo"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -173,15 +179,16 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api SysSetApi) TestNTPServer(query map[string]string,headers map[string]string) (flag bool,d interface{}){
+func (api SysSetApi) TestNTPServer(query map[string]string, headers map[string]string) (flag bool, d interface{}) {
url := DATA_URL_PREFIX + "/sysset/ntpTest"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -191,33 +198,35 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api SysSetApi) SetSysClock(paramBody map[string]interface{},headers map[string]string) (flag bool,d interface{}){
+func (api SysSetApi) SetSysClock(paramBody map[string]interface{}, headers map[string]string) (flag bool, d interface{}) {
url := DATA_URL_PREFIX + "/sysset/updateClock"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON,paramBody,nil, headers)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, headers)
if err != nil {
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api SysSetApi) GetSysInfo(headers map[string]string) (flag bool,d interface{}){
+func (api SysSetApi) GetSysInfo(headers map[string]string) (flag bool, d interface{}) {
url := DATA_URL_PREFIX + "/sysset/sysinfo"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -227,15 +236,16 @@
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api SysSetApi) GetResourceConfig() (flag bool,rc protomsg.ResourceConfig){
+func (api SysSetApi) GetResourceConfig() (flag bool, rc protomsg.ResourceConfig) {
url := DATA_URL_PREFIX + "/sysset/getResourceConfig"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -245,73 +255,77 @@
return false, rc
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, rc
}
b, err := json.Marshal(res.Data)
- if err !=nil {
- return false,rc
+ if err != nil {
+ return false, rc
} else {
err = json.Unmarshal(b, &rc)
- if err !=nil {
- return false,rc
+ if err != nil {
+ return false, rc
} else {
- return true,rc
+ return true, rc
}
}
}
-func (api SysSetApi) SaveResourceConfig(paramBody map[string]interface{}) (flag bool,d interface{}){
+func (api SysSetApi) SaveResourceConfig(paramBody map[string]interface{}) (flag bool, d interface{}) {
url := DATA_URL_PREFIX + "/sysset/saveResourceConfig"
netNode := getNetNode(url2Topic(Topic_System_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
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
//鎺у埗鏈満reboot
-func (api SysSetApi) RebootOS() (bool,interface{}) {
+func (api SysSetApi) RebootOS() (bool, interface{}) {
url := DATA_URL_PREFIX + "/sysset/reboot"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON,nil,nil, nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, nil, nil, nil)
if err != nil {
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
func (api SysSetApi) SyncDevToManager(addr []*bhome_msg.MsgQueryTopicReply_BHNodeAddress, paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/device/syncDevToManager"
client := NewClient(WithNodes(addr))
- 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
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false, nil
}
- return res.Success,res.Data
-}
\ No newline at end of file
+ return res.Success, res.Data
+}
diff --git a/timePgnApi.go b/timePgnApi.go
index bac64b3..fa80026 100644
--- a/timePgnApi.go
+++ b/timePgnApi.go
@@ -2,53 +2,54 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type TimePgnApi struct {
-
}
-func (api TimePgnApi) SaveCameraPolygon(paramBody map[string]interface{}) (bool,interface{}) {
+func (api TimePgnApi) SaveCameraPolygon(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/polygon/save"
netNode := getNetNode(url2Topic(Topic_Scene_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 json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api TimePgnApi) DeleteCameraPolygon(id string) (bool,interface{}){
+func (api TimePgnApi) DeleteCameraPolygon(id string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/polygon/delete"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,0)
- paramQuery["id"]=id
+ paramQuery := make(map[string]string, 0)
+ paramQuery["id"] = id
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
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 TimePgnApi) FindAllPolygons() ([]protomsg.CameraPolygon) {
+func (api TimePgnApi) FindAllPolygons() []protomsg.CameraPolygon {
url := DATA_URL_PREFIX + "/polygon/findAll"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
- polygons := make([]protomsg.CameraPolygon,0)
+ polygons := make([]protomsg.CameraPolygon, 0)
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
@@ -56,66 +57,70 @@
return nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return nil
}
dataBytes, _ := json.Marshal(res.Data)
- if err := json.Unmarshal(dataBytes, &polygons);err !=nil {
+ if err := json.Unmarshal(dataBytes, &polygons); err != nil {
return nil
}
return polygons
}
-func (api TimePgnApi) FindPolygonsByCameraId(cameraId string) (bool,interface{}) {
+func (api TimePgnApi) FindPolygonsByCameraId(cameraId string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/polygon/findByCameraId"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["cameraId"] = cameraId
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
- return true,res.Data
+ return true, res.Data
}
//鏂板鎴栨洿鏂版椂闂磋鍒�
-func (api TimePgnApi) SaveCameraTimerule(paramBody map[string]interface{}) (bool,interface{}) {
+func (api TimePgnApi) SaveCameraTimerule(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/cameraTimerule/save"
netNode := getNetNode(url2Topic(Topic_Scene_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 json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api TimePgnApi) DeleteCameraTimerule (id string) bool {
+func (api TimePgnApi) DeleteCameraTimerule(id string) bool {
url := DATA_URL_PREFIX + "/cameraTimerule/delete"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,0)
- paramQuery["id"]=id
+ paramQuery := make(map[string]string, 0)
+ paramQuery["id"] = id
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return false
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
return false
@@ -124,61 +129,63 @@
}
//鏍规嵁鎽勫儚鏈篿d鏌ユ壘鎵�鏈夌殑鏃堕棿瑙勫垯
-func (api TimePgnApi) FindAllTimeRules() (flag bool,rules []protomsg.CameraTimerule) {
+func (api TimePgnApi) FindAllTimeRules() (flag bool, rules []protomsg.CameraTimerule) {
url := DATA_URL_PREFIX + "/cameraTimerule/findAll"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
dataBytes, _ := json.Marshal(res.Data)
- if err := json.Unmarshal(dataBytes, &rules);err !=nil {
- return false,nil
+ if err := json.Unmarshal(dataBytes, &rules); err != nil {
+ return false, nil
}
- return true,rules
+ return true, rules
}
-func (api TimePgnApi) UpdateDefenceStateByPolygonId(polygonId string,state string) (bool,interface{}){
+func (api TimePgnApi) UpdateDefenceStateByPolygonId(polygonId string, state string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/polygon/updateDefenceStateByPolygonId"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery :=make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["polygonId"] = polygonId
- paramQuery["defence_state"]=state
+ paramQuery["defence_state"] = state
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
- return true,res.Data
+ return true, res.Data
}
-func (api TimePgnApi) UpdateDefenceStateByCameraId(cameraId string,state string) (bool,interface{}){
+func (api TimePgnApi) UpdateDefenceStateByCameraId(cameraId string, state string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/polygon/updateDefenceStateByCameraId"
netNode := getNetNode(url2Topic(Topic_Scene_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery :=make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["cameraId"] = cameraId
- paramQuery["defence_state"]=state
+ paramQuery["defence_state"] = state
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
- return true,res.Data
+ return true, res.Data
}
-
diff --git a/userApi.go b/userApi.go
index f2282ec..f0681e4 100644
--- a/userApi.go
+++ b/userApi.go
@@ -1,102 +1,106 @@
package bhomedbapi
import (
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type UserApi struct {
-
}
-func (api UserApi) Login(username string,password string) (bool,interface{}){
+func (api UserApi) Login(username string, password string) (bool, interface{}) {
url := "/data/api-u/sys/login"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
- paramBody["username"]=username
- paramBody["password"]=password
- respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil, nil)
+ paramBody := make(map[string]interface{}, 0)
+ paramBody["username"] = username
+ paramBody["password"] = password
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api UserApi) FindAllUser(curUserId string) (bool,interface{}) {
+func (api UserApi) FindAllUser(curUserId string) (bool, interface{}) {
url := "/data/api-u/users/findAllUser"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- query := map[string]string {
+ query := map[string]string{
"userId": curUserId,
}
body, err := client.DoGetRequest(url, query, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
- return true,res.Data
+ return true, res.Data
}
-func (api UserApi) FindById(userId string) (bool,interface{}) {
+func (api UserApi) FindById(userId string) (bool, interface{}) {
url := "/data/api-u/users/findById"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
paramBody := map[string]interface{}{
"userId": userId,
}
- respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil, nil)
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api UserApi) GetUserProfile(userId string) (bool,interface{}) {
+func (api UserApi) GetUserProfile(userId string) (bool, interface{}) {
url := "/data/api-u/users/profile"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- header := map[string]string {
+ header := map[string]string{
"Login_user_id": userId,
}
respBody, err := client.DoGetRequest(url, nil, header)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api UserApi) SaveAuth(paramBody map[string]interface{}) (bool,interface{}) {
+func (api UserApi) SaveAuth(paramBody map[string]interface{}) (bool, interface{}) {
url := "/data/api-u/users/saveAuth"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
- respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api UserApi) UpdatePwd(userId string, oldPwd string, newPwd string) (bool,interface{}) {
+func (api UserApi) UpdatePwd(userId string, oldPwd string, newPwd string) (bool, interface{}) {
url := "/data/api-u/users/updatePwd"
netNode := getNetNode(url2Topic(Topic_System_Service, url))
client := NewClient(WithNodes(netNode))
@@ -105,13 +109,14 @@
"oldPwd": oldPwd,
"newPwd": newPwd,
}
- respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody,nil, nil)
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
-}
\ No newline at end of file
+ return res.Success, res.Data
+}
diff --git a/versionCtrlApi.go b/versionCtrlApi.go
index a245d30..08682a2 100644
--- a/versionCtrlApi.go
+++ b/versionCtrlApi.go
@@ -1,40 +1,40 @@
package bhomedbapi
import (
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
type VersionCtrlApi struct {
-
}
//鑾峰彇鏈嶅姟鍣ㄦ湰鏈洪厤缃俊鎭�
-func (api VersionCtrlApi) GetSn() (bool,map[string]interface{}){
+func (api VersionCtrlApi) GetSn() (bool, map[string]interface{}) {
url := DATA_URL_PREFIX + "/version/snBus"
netNode := getNetNode(url2Topic(Topic_VersionControl, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
if !res.Success {
return false, nil
}
b, err := json.Marshal(res.Data)
- if err !=nil {
- return false,nil
+ if err != nil {
+ return false, nil
} else {
var m map[string]interface{}
err = json.Unmarshal(b, &m)
- if err !=nil {
- return false,nil
+ if err != nil {
+ return false, nil
} else {
return true, m
}
diff --git a/voiceApi.go b/voiceApi.go
index 6568589..a853469 100644
--- a/voiceApi.go
+++ b/voiceApi.go
@@ -2,11 +2,10 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
)
-type VoiceApi struct{
-
+type VoiceApi struct {
}
//鏌ユ壘鎵�鏈夌畻娉�
@@ -16,9 +15,11 @@
var voiceArr []protomsg.Voice
client := NewClient(WithNodes(netNode))
respBody, err := client.DoGetRequest(url, nil, nil)
- if err !=nil {
+ if err != nil {
return false, nil
}
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
var res Result
if err = json.Unmarshal(respBody, &res); err != nil {
logPrint(err)
@@ -27,4 +28,4 @@
bytes, _ := json.Marshal(res.Data)
err = json.Unmarshal(bytes, &voiceArr)
return res.Success, voiceArr
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0