From 3a46c8b7a41a33ef46b02759015ebb6b6484713f Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 13 七月 2020 20:21:16 +0800
Subject: [PATCH] update protomsg
---
service/SdkInstall.go | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index 2f6c74a..8ddbf0e 100644
--- a/service/SdkInstall.go
+++ b/service/SdkInstall.go
@@ -2,6 +2,7 @@
import (
"basic.com/dbapi.git"
+ "basic.com/valib/licence.git"
"basic.com/valib/logger.git"
"encoding/json"
"errors"
@@ -13,10 +14,44 @@
"strings"
"webserver/extend/config"
"webserver/extend/util"
+ reqUtil "webserver/extend/util"
)
type SdkInstallService struct {
+}
+
+func (sv SdkInstallService) Active(cod string) error {
+ //浣跨敤婵�娲荤爜婵�娲荤畻娉�
+ url := "http://"+config.ShopConf.Url+"/data/api-s/sdk/activeByAINode"
+ machineCode := licence.GetMachineCode()
+ if machineCode == "" {
+ logger.Debug("鑾峰彇鏈哄櫒鐮佸け璐�")
+ return errors.New("鑾峰彇鏈哄櫒鐮佸け璐�")
+ }
+ paramBody := map[string]interface{}{
+ "code": cod,
+ "machineCode": machineCode,
+ }
+ header := map[string]string {
+ "Authorization": token,
+ }
+ respBody, err := reqUtil.DoPostRequest(url, reqUtil.CONTENT_TYPE_JSON, paramBody, nil, header)
+ if err != nil {
+ logger.Debug("DoPostRequest err:", err)
+ return err
+ }
+ var res dbapi.Result
+ if err = json.Unmarshal(respBody, &res); err != nil {
+ logger.Debug("unmarshal err:", err)
+ return err
+ }
+ if !res.Success {
+ logger.Debug("res.Data:", res.Data)
+ return errors.New("璇锋眰鍟嗗煄澶辫触")
+ }
+
+ return nil
}
//绠楁硶瀹夎鍖呭畨瑁�
@@ -186,6 +221,8 @@
Url: skd.Def.Url,
IconBlob: skd.Def.IconBlob,
Version: skd.Def.Version,
+ EnTrack: skd.Def.EnTrack,
+ ArgDef: skd.Def.ArgDef,
}
for _,ag := range skd.Args {
sra := SdkRegisterArgVo{
@@ -352,6 +389,8 @@
IconBlob string `gorm:"column:iconBlob;type:text;" json:"iconBlob"` //鍥剧墖
Version string `gorm:"column:version;type:varchar(50);default:'1.0';" json:"version"` //鐗堟湰鍙�
Args []SdkArg `json:"args"`
+ EnTrack bool `gorm:"column:enTrack" json:"enTrack"`
+ ArgDef string `gorm:"column:argDef" json:"argDef"` //绠楁硶鍙傛暟榛樿閰嶇疆
}
type SdkInsOrUpgrade struct {
@@ -391,6 +430,8 @@
Url string `json:"url"` //绠楁硶涓嬭浇鍦板潃
IconBlob string `json:"iconBlob"` //鍥剧墖
Version string `json:"version"` //鐗堟湰鍙�
+ EnTrack bool `json:"enTrack"` //鏄惁寮�鍚窡韪�
+ ArgDef string `json:"argDef"` //绠楁硶榛樿鍙傛暟瀹氫箟
}
type SdkRegisterArgVo struct {
--
Gitblit v1.8.0