From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp
---
service/SdkInstall.go | 264 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 191 insertions(+), 73 deletions(-)
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index 66fcace..43f29a3 100644
--- a/service/SdkInstall.go
+++ b/service/SdkInstall.go
@@ -1,7 +1,7 @@
package service
import (
- //"basic.com/dbapi.git"
+ "basic.com/dbapi.git"
"basic.com/valib/logger.git"
"encoding/json"
"errors"
@@ -9,26 +9,37 @@
"os"
"path"
"path/filepath"
+ "strconv"
+ "strings"
"webserver/extend/config"
"webserver/extend/util"
)
+type SdkInstallService struct {
+
+}
+
//绠楁硶瀹夎鍖呭畨瑁�
-func (sv SysService) SdkInstall(identifier string,filename string) (bool,error) {
+func (sv SdkInstallService) SdkInstall(identifier string,filename string) (bool,error) {
configPatchPath := ""
if config.Server.PatchPath != "" {
configPatchPath = config.Server.PatchPath
} else {
- configPatchPath = "/opt/vasystem/patch"
+ configPatchPath = "../patch"
}
filenameWithSuffix := path.Base(filename)
ext := path.Ext(filenameWithSuffix)
zipFilePath := configPatchPath + "/"+identifier+ext
+ unPackTargetPath := configPatchPath+"/"+identifier+"_basic/"
if util.Exists(zipFilePath) {
strMd5, e := util.FileMd5(zipFilePath)
if e !=nil || strMd5 == "" {
+ go os.Remove(zipFilePath)
+ if util.DirExists(unPackTargetPath) {
+ go os.RemoveAll(unPackTargetPath)
+ }
return false,errors.New("鑾峰彇瀹夎鍖卪d5澶辫触")
}
if strMd5 == identifier {
@@ -38,6 +49,10 @@
return true,nil
} else {
+ go os.Remove(zipFilePath)
+ if util.DirExists(unPackTargetPath) {
+ go os.RemoveAll(unPackTargetPath)
+ }
logger.Debug("strMd5 is", strMd5,"identifier is",identifier,"not equal")
return false,errors.New("鏍￠獙瀹夎鏂囦欢澶辫触")
}
@@ -52,29 +67,39 @@
if config.Server.PatchPath != "" {
configPatchPath = config.Server.PatchPath
} else {
- configPatchPath = "/opt/vasystem/patch"
+ configPatchPath = "../patch"
}
//1.瑙ｅ帇缂╂洿鏂板寘
- unPackPath := configPatchPath+"/"+identifier+"_basic/"
- if util.Exists(unPackPath) {
+ unPackTargetPath := configPatchPath+"/"+identifier+"_basic/"
+ unPackFilePath := configPatchPath+"/"+identifier+ext
+ defer func() {
+ if util.Exists(unPackTargetPath) {
+ os.RemoveAll(unPackTargetPath)
+ }
+ if util.Exists(unPackFilePath) {
+ os.RemoveAll(unPackFilePath)
+ }
+ }()
+
+ if util.Exists(unPackTargetPath) {
//姝ょ増鏈凡缁忔洿鏂拌繃
- rmErr := os.RemoveAll(unPackPath)
+ rmErr := os.RemoveAll(unPackTargetPath)
if rmErr !=nil {
return false,rmErr
}
}
- if !util.CreateDirectory(unPackPath) {
+ if !util.CreateDirectory(unPackTargetPath) {
return false, errors.New("鍒涘缓鍘嬬缉鏂囦欢澶瑰け璐�")
}
- unPackFilePath := configPatchPath+"/"+identifier+ext
- err := util.UnTarGz(unPackFilePath, unPackPath)
+ logger.Debug("unPackFilePath:", unPackFilePath, "unPackPath:", unPackTargetPath)
+ _,err := util.UnTarGzByCmd(unPackFilePath, unPackTargetPath)
if err !=nil {
logger.Debug("UnPack err:",err,"unPackFile:",unPackFilePath)
return false, err
}
targetFileName := ""
- err = filepath.Walk(unPackPath, func(path string, f os.FileInfo, err error) error {
+ err = filepath.Walk(unPackTargetPath, func(path string, f os.FileInfo, err error) error {
if f == nil {
return err
}
@@ -86,7 +111,7 @@
if err != nil {
return false, err
}
- unPackPath = unPackPath + targetFileName +"/"
+ unPackPath := unPackTargetPath + targetFileName +"/"
//瑙ｅ帇瀹屾垚锛岃幏鍙栧畨瑁呭寘涓殑鏂囦欢锛屽紑濮嬪畨瑁�
//1.瑙ｆ瀽瀹夎璇存槑ins.inc
incPath := unPackPath+"ins.inc"
@@ -106,9 +131,76 @@
//3.灏嗙畻娉晄o銆佷緷璧栨枃浠躲�亃conf銆�
soM := make(map[string]SdkDef)
var skDefArr []SdkDef
+ nInsM := make(map[string]string)
+ aInsM := make(map[string]string)
if err = json.Unmarshal(defB, &skDefArr);err == nil {
- zconfPath := "/opt/vasystem/bin/zconft/"
- libPath := "/opt/vasystem/libst/"
+ var sdkApi dbapi.SdkApi
+ for _,skd := range skDefArr {
+ //娉ㄥ唽绠楁硶淇℃伅鍜岀畻娉曞弬鏁板埌dbserver
+ //鍏堢湅姝ょ畻娉曟湁娌℃湁娉ㄥ唽锛屽鏋滃凡瀹夎锛屾瘮瀵圭増鏈彿
+ bf, curDbSdk := sdkApi.GetById(skd.Def.Id)
+ if bf {
+ bytes, _ := json.Marshal(curDbSdk)
+ var sm map[string]interface{}
+ unE := json.Unmarshal(bytes, &sm)
+ if unE != nil {
+ continue
+ }
+ sdkVersion, ok := sm["version"]
+ if ok { //鏈夌増鏈彿
+ vStr := sdkVersion.(string)
+ if shouldVersionBeUpgrade(vStr, skd.Def.Version) {
+ nInsM[skd.Def.SdkType] = skd.Def.SdkType
+ aInsM[skd.Def.Id] = skd.Def.Id
+ }
+ } else {
+ nInsM[skd.Def.SdkType] = skd.Def.SdkType
+ aInsM[skd.Def.Id] = skd.Def.Id
+ }
+ } else {
+ nInsM[skd.Def.SdkType] = skd.Def.SdkType
+ aInsM[skd.Def.Id] = skd.Def.Id
+ }
+
+
+ if _,ok := soM[skd.Def.SdkType];!ok {
+ soM[skd.Def.SdkType] = skd
+ }
+ if _,ok := aInsM[skd.Def.Id]; ok {
+ srv := SdkRegisterVo{
+ Id: skd.Def.Id,
+ SdkType: skd.Def.SdkType,
+ SdkName: skd.Def.SdkName,
+ Icon: skd.Def.Icon,
+ Url: skd.Def.Url,
+ IconBlob: skd.Def.IconBlob,
+ Version: skd.Def.Version,
+ }
+ for _,ag := range skd.Args {
+ sra := SdkRegisterArgVo{
+ Scope: ag.Scope,
+ }
+ sra.SdkArg = SdkArg{
+ Alias: ag.Alias,
+ Name: ag.Name,
+ Type: ag.Type,
+ ArgType: ag.ArgType,
+ Must: ag.Must,
+ Unit: ag.Unit,
+ Range: ag.Range,
+ DefaultValue: ag.DefaultValue,
+ DefaultOperator: ag.DefaultOperator,
+ Sort: ag.Sort,
+ }
+ srv.Args = append(srv.Args, sra)
+ }
+ paramBody := util.Struct2Map(srv)
+ logger.Debug("sdkApi.Register paramBody:", paramBody)
+ sdkApi.Register(paramBody) //灏嗙畻娉曟敞鍐屽埌鏁版嵁搴撲腑
+ }
+ }
+ zconfPath := "./zconf/"
+ libPath := "../libs/"
if !util.DirExists(zconfPath) {
os.MkdirAll(zconfPath, 0777)
}
@@ -116,59 +208,31 @@
os.MkdirAll(libPath, 0777)
}
for sdkType,_ := range soM {
- //鍏堣В鍘婼dkType.tar.gz鏂囦欢
- if unTarGzE := util.UnTarGz(unPackPath+sdkType+".tar.gz", unPackPath);unTarGzE == nil {
- //澶嶅埗json鍚姩鏂囦欢
- if util.Exists(unPackPath+sdkType+"/zconf/"+sdkType+".json") {
- util.CopyFile(unPackPath+sdkType+"/zconf/"+sdkType+".json", zconfPath)
- }
- if util.DirExists(unPackPath+sdkType+"/"+sdkType) {
- if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/"+sdkType, libPath);cE != nil {
- return false, cE
+ if _,iOk := nInsM[sdkType];iOk {
+ //鍏堣В鍘婼dkType.tar.gz鏂囦欢
+ if unTarGzE := util.UnTarGz(unPackPath+sdkType+".tar.gz", unPackPath);unTarGzE == nil {
+ //澶嶅埗json鍚姩鏂囦欢
+ if util.Exists(unPackPath+sdkType+"/zconf/"+sdkType+".json") {
+ util.CopyFile(unPackPath+sdkType+"/zconf/"+sdkType+".json", zconfPath+sdkType+".json")
}
- }
- if util.DirExists(unPackPath+sdkType+"/models") {
- if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/models", "/opt/vasystem/bin/zconft"); cE != nil {
- return false, cE
+ if util.DirExists(unPackPath+sdkType) {
+ if _,cE := util.CopyDirByCmd(unPackPath+sdkType, libPath);cE != nil {
+ return false, cE
+ }
}
+ if util.DirExists(unPackPath+sdkType+"/models") {
+ if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/models", "./zconf"); cE != nil {
+ return false, cE
+ }
+ }
+ } else {
+ logger.Debug("unTarGzE sdkType.tar.gz err:", unTarGzE)
}
+ } else {
+ logger.Debug("upper version has been installed")
}
}
- //娉ㄥ唽绠楁硶淇℃伅鍜岀畻娉曞弬鏁板埌dbserver
- //var sdkApi dbapi.SdkApi
- for _,skd := range skDefArr {
- if _,ok := soM[skd.Def.SdkType];!ok {
- soM[skd.Def.SdkType] = skd
- }
- srv := SdkRegisterVo{
- Id: skd.Def.Id,
- SdkType: skd.Def.SdkType,
- SdkName: skd.Def.SdkName,
- Icon: skd.Def.Icon,
- Url: skd.Def.Url,
- }
- for _,ag := range skd.Args {
- sra := SdkRegisterArgVo{
- Scope: ag.Scope,
- }
- sra.SdkArg = SdkArg{
- Alias: ag.Alias,
- Name: ag.Name,
- Type: ag.Type,
- ArgType: ag.ArgType,
- Must: ag.Must,
- Unit: ag.Unit,
- Range: ag.Range,
- DefaultValue: ag.DefaultValue,
- DefaultOperator: ag.DefaultOperator,
- Sort: ag.Sort,
- }
- srv.Args = append(srv.Args, sra)
- }
- paramBody := util.Struct2Map(srv)
- logger.Debug("sdkApi.Register paramBody:", paramBody)
- //sdkApi.Register(paramBody) //灏嗙畻娉曟敞鍐屽埌鏁版嵁搴撲腑
- }
+
} else {
return false, errors.New("鍙嶅簭鍒楀寲绠楁硶瀹氫箟淇℃伅澶辫触")
}
@@ -189,6 +253,49 @@
}
return true, nil
+}
+
+func shouldVersionBeUpgrade(curVersion,dstVersion string) bool {
+ if curVersion == "" {
+ return true
+ }
+ if dstVersion == "" {
+ return false
+ }
+ curIVArr := strings.Split(curVersion, ".")
+ dstIVArr := strings.Split(dstVersion, ".")
+ if len(curIVArr) !=3 || len(dstIVArr) != 3{
+ return false
+ }
+ cH,cEH := strconv.Atoi(curIVArr[0])
+ 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])
+ if cEH !=nil || cEM != nil || cEL != nil || dEH != nil ||dEM !=nil || dEL !=nil {
+ return false
+ }
+ if cH > dH {
+ return false
+ } else if cH == dH {
+ if cM > dM {
+ return false
+ } else if cM == dM {
+ if cL > dL {
+ return false
+ } else if cL == dL {
+ return false
+ } else {
+ return true
+ }
+ } else {
+ return true
+ }
+ } else {
+ return true
+ }
}
@@ -224,6 +331,15 @@
Enable bool `gorm:"column:enable;default:1" json:"enable"`
DelFlag int `gorm:"column:del_flag;default:0" json:"del_flag"`
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"` //鐗堟湰鍙�
+}
+
+type SdkInsOrUpgrade struct {
+ Sdk
+ RemoteVersion string `json:"remoteVersion"` //鍟嗗煄浠撳簱鐗堟湰鍙�
+ Installed bool `json:"installed"` //鏄惁宸插畨瑁�
+ IsUpgrade bool `json:"isUpgrade"` //鏄惁闇�瑕佸崌绾�
}
type SdkArgEntity struct {
@@ -248,23 +364,25 @@
type SdkRegisterVo struct {
- Id string `json:"id"`
- SdkType string `json:"sdk_type"`//浜鸿劯妫�娴嬶細FaceDetect,浜鸿劯鎻愬彇锛欶aceExtract,浜鸿劯姣斿锛欶aceCompare,琛屼负锛歒olo
- SdkName string `json:"sdk_name"` //绠楁硶鍚嶇О
- Args []SdkRegisterArgVo `json:"args"` //绠楁硶鍙傛暟
- Icon string `json:"icon"` //绠楁硶鍥炬爣
- Url string `json:"url"` //绠楁硶涓嬭浇鍦板潃
+ Id string `json:"id"`
+ SdkType string `json:"sdk_type"`//浜鸿劯妫�娴嬶細FaceDetect,浜鸿劯鎻愬彇锛欶aceExtract,浜鸿劯姣斿锛欶aceCompare,琛屼负锛歒olo
+ SdkName string `json:"sdk_name"` //绠楁硶鍚嶇О
+ Args []SdkRegisterArgVo `json:"args"` //绠楁硶鍙傛暟
+ Icon string `json:"icon"` //绠楁硶鍥炬爣
+ Url string `json:"url"` //绠楁硶涓嬭浇鍦板潃
+ IconBlob string `json:"iconBlob"` //鍥剧墖
+ Version string `json:"version"` //鐗堟湰鍙�
}
type SdkRegisterArgVo struct {
- Scope string `json:"scope"`
+ Scope string `json:"scope"`
SdkArg
- Dics []SdkArgDic `json:"dics"` //濡傛灉姝ょ畻娉曞弬鏁版槸琚�夐」锛岄渶瑕佸皢鍙傛暟鏋氫妇鍊煎啓鍏ュ埌瀛楀吀琛ㄤ腑
+ Dics []SdkArgDic `json:"dics"` //濡傛灉姝ょ畻娉曞弬鏁版槸琚�夐」锛岄渶瑕佸皢鍙傛暟鏋氫妇鍊煎啓鍏ュ埌瀛楀吀琛ㄤ腑
}
type SdkArgDic struct {
- Value string `json:"value"`
- Name string `json:"name"`
- Sort int `json:"sort"`
+ Value string `json:"value"`
+ Name string `json:"name"`
+ Sort int `json:"sort"`
}
\ No newline at end of file
--
Gitblit v1.8.0