From 5bc1834adc6d6fe1b49f6cf54e2383d69311b113 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 21 七月 2020 09:47:18 +0800
Subject: [PATCH] update protomsg,sdk active add sdkId arg and fix camera show
---
service/SdkInstall.go | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index dee8b18..edd704b 100644
--- a/service/SdkInstall.go
+++ b/service/SdkInstall.go
@@ -22,16 +22,17 @@
}
-func (sv SdkInstallService) Active(cod string) error {
+func (sv SdkInstallService) Active(cod string, sdkId string) (interface{},error) {
//浣跨敤婵�娲荤爜婵�娲荤畻娉�
url := "http://"+config.ShopConf.Url+"/data/api-s/sdk/activeByAINode"
machineCode := licence.GetMachineCode()
if machineCode == "" {
logger.Debug("鑾峰彇鏈哄櫒鐮佸け璐�")
- return errors.New("鑾峰彇鏈哄櫒鐮佸け璐�")
+ return nil, errors.New("鑾峰彇鏈哄櫒鐮佸け璐�")
}
paramBody := map[string]interface{}{
"code": cod,
+ "sdkId": sdkId,
"machineCode": machineCode,
}
header := map[string]string {
@@ -40,19 +41,19 @@
respBody, err := reqUtil.DoPostRequest(url, reqUtil.CONTENT_TYPE_JSON, paramBody, nil, header)
if err != nil {
logger.Debug("DoPostRequest err:", err)
- return err
+ return nil, err
}
var res dbapi.Result
if err = json.Unmarshal(respBody, &res); err != nil {
logger.Debug("unmarshal err:", err)
- return err
+ return nil, err
}
if !res.Success {
logger.Debug("res.Data:", res.Data)
- return errors.New("璇锋眰鍟嗗煄澶辫触")
+ return nil, errors.New("璇锋眰鍟嗗煄澶辫触")
}
- return nil
+ return res.Data, nil
}
//绠楁硶瀹夎鍖呭畨瑁�
@@ -281,26 +282,26 @@
}
} else {
logger.Debug("鍙嶅簭鍒楀寲绠楁硶瀹氫箟淇℃伅澶辫触")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勫畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
logger.Debug("璇诲彇绠楁硶瀹氫箟淇℃伅澶辫触")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勫畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
logger.Debug("绠楁硶瀹氫箟淇℃伅涓㈠け")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勭畻娉曞畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
logger.Debug("鍙嶅簭鍒楀寲鎺堟潈淇℃伅澶辫触")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勭畻娉曞畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
logger.Debug("璇诲彇鎺堟潈鏂囦欢澶辫触")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勭畻娉曞畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
- return false, errors.New("涓嶆槸姝ｇ‘鐨勭畻娉曞畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
return true, nil
--
Gitblit v1.8.0