From c825ce5df1b3441f9ff74214b10a6d222a7c7526 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 13 七月 2020 19:26:45 +0800
Subject: [PATCH] fix sdk install add ArgDef
---
service/SdkInstall.go | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index a223dbd..74f6f92 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,7 @@
Url: skd.Def.Url,
IconBlob: skd.Def.IconBlob,
Version: skd.Def.Version,
+ ArgDef: skd.Def.ArgDef,
}
for _,ag := range skd.Args {
sra := SdkRegisterArgVo{
@@ -235,6 +271,13 @@
if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/models", "./"); cE != nil {
return false, cE
}
+ //鎷疯礉瀹屾垚鍚庡垹闄ibs涓媠dkType鏂囦欢澶逛笅models
+ }
+ if util.DirExists(libPath+sdkType+"/models") {
+ os.RemoveAll(libPath+sdkType+"/models")
+ }
+ if util.DirExists(libPath+sdkType+"/zconf") {
+ os.RemoveAll(libPath+sdkType+"/zconf")
}
} else {
logger.Debug("unTarGzE sdkType.tar.gz err:", unTarGzE)
@@ -282,9 +325,9 @@
cM,cEM := strconv.Atoi(curIVArr[1])
cL,cEL := strconv.Atoi(curIVArr[2])
- dH,dEH := strconv.Atoi(curIVArr[0])
- dM,dEM := strconv.Atoi(curIVArr[1])
- dL,dEL := strconv.Atoi(curIVArr[2])
+ dH,dEH := strconv.Atoi(dstIVArr[0])
+ dM,dEM := strconv.Atoi(dstIVArr[1])
+ dL,dEL := strconv.Atoi(dstIVArr[2])
if cEH !=nil || cEM != nil || cEL != nil || dEH != nil ||dEM !=nil || dEL !=nil {
return false
}
@@ -344,6 +387,8 @@
Env string `gorm:"column:env" json:"env"` //杩愯鐜鍙婄粨鏋滆鏄庯紝json鏍煎紡锛屽寘鍚玸o_file_path,runtime,param,depends(cuda鐗堟湰锛宱pencv鐗堟湰锛宼ensorflow鐗堟湰绛�)
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"`
+ ArgDef string `gorm:"column:argDef" json:"argDef"` //绠楁硶鍙傛暟榛樿閰嶇疆
}
type SdkInsOrUpgrade struct {
@@ -383,6 +428,7 @@
Url string `json:"url"` //绠楁硶涓嬭浇鍦板潃
IconBlob string `json:"iconBlob"` //鍥剧墖
Version string `json:"version"` //鐗堟湰鍙�
+ ArgDef string `json:"argDef"`
}
type SdkRegisterArgVo struct {
--
Gitblit v1.8.0