From 662fdfec9c391b13b9af9b67009e44d394bc97c9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期六, 30 五月 2020 17:32:54 +0800
Subject: [PATCH] fix UnTarGzByCmd
---
service/SdkInstall.go | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 270 insertions(+), 0 deletions(-)
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index 6d43c33..e759454 100644
--- a/service/SdkInstall.go
+++ b/service/SdkInstall.go
@@ -1 +1,271 @@
package service
+
+import (
+ //"basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
+ "encoding/json"
+ "errors"
+ "io/ioutil"
+ "os"
+ "path"
+ "path/filepath"
+ "webserver/extend/config"
+ "webserver/extend/util"
+)
+
+//绠楁硶瀹夎鍖呭畨瑁�
+func (sv SysService) SdkInstall(identifier string,filename string) (bool,error) {
+ configPatchPath := ""
+ if config.Server.PatchPath != "" {
+ configPatchPath = config.Server.PatchPath
+ } else {
+ configPatchPath = "/opt/vasystem/patch"
+ }
+
+ filenameWithSuffix := path.Base(filename)
+ ext := path.Ext(filenameWithSuffix)
+
+ zipFilePath := configPatchPath + "/"+identifier+ext
+ if util.Exists(zipFilePath) {
+ strMd5, e := util.FileMd5(zipFilePath)
+ if e !=nil || strMd5 == "" {
+ return false,errors.New("鑾峰彇瀹夎鍖卪d5澶辫触")
+ }
+ if strMd5 == identifier {
+ if _,insE := installSdk(identifier, ext); insE != nil {
+ return false, insE
+ }
+ return true,nil
+
+ } else {
+ logger.Debug("strMd5 is", strMd5,"identifier is",identifier,"not equal")
+ return false,errors.New("鏍￠獙瀹夎鏂囦欢澶辫触")
+ }
+ } else {
+ return false,errors.New("瀹夎鍖呭凡涓㈠け锛岃閲嶆柊涓婁紶")
+ }
+}
+
+//瀹夎sdk
+func installSdk(identifier string, ext string) (bool, error) {
+ configPatchPath := ""
+ if config.Server.PatchPath != "" {
+ configPatchPath = config.Server.PatchPath
+ } else {
+ configPatchPath = "/opt/vasystem/patch"
+ }
+ //1.瑙ｅ帇缂╂洿鏂板寘
+ unPackPath := configPatchPath+"/"+identifier+"_basic/"
+ if util.Exists(unPackPath) {
+ //姝ょ増鏈凡缁忔洿鏂拌繃
+ rmErr := os.RemoveAll(unPackPath)
+ if rmErr !=nil {
+ return false,rmErr
+ }
+ }
+ if !util.CreateDirectory(unPackPath) {
+ return false, errors.New("鍒涘缓鍘嬬缉鏂囦欢澶瑰け璐�")
+ }
+
+ unPackFilePath := configPatchPath+"/"+identifier+ext
+ logger.Debug("unPackFilePath:", unPackFilePath, "unPackPath:", unPackPath)
+ _,err := util.UnTarGzByCmd(unPackFilePath, unPackPath)
+ 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 {
+ if f == nil {
+ return err
+ }
+ if f.IsDir() {
+ targetFileName = f.Name()
+ }
+ return nil
+ })
+ if err != nil {
+ return false, err
+ }
+ unPackPath = unPackPath + targetFileName +"/"
+ //瑙ｅ帇瀹屾垚锛岃幏鍙栧畨瑁呭寘涓殑鏂囦欢锛屽紑濮嬪畨瑁�
+ //1.瑙ｆ瀽瀹夎璇存槑ins.inc
+ incPath := unPackPath+"ins.inc"
+ if util.Exists(incPath) {
+ if incB, err := ioutil.ReadFile(incPath);err == nil {
+ var ins InsInc
+ if err = json.Unmarshal(incB, &ins); err == nil {
+ //澶勭悊鎺堟潈淇℃伅
+ curMc := ""
+ if ins.MachineCode != curMc {
+
+ }
+ //2.瑙ｆ瀽sdk.def,灏唖o鍜寊conf澶嶅埗鍒�/opt/vasystem/libs/鏂囦欢澶逛笅
+ defPath := unPackPath + "sdk.def"
+ if util.Exists(defPath) {
+ if defB, err := ioutil.ReadFile(defPath); err == nil {
+ //3.灏嗙畻娉晄o銆佷緷璧栨枃浠躲�亃conf銆�
+ soM := make(map[string]SdkDef)
+ var skDefArr []SdkDef
+ if err = json.Unmarshal(defB, &skDefArr);err == nil {
+ zconfPath := "/opt/vasystem/bin/zconft/"
+ libPath := "/opt/vasystem/libst/"
+ if !util.DirExists(zconfPath) {
+ os.MkdirAll(zconfPath, 0777)
+ }
+ if !util.DirExists(libPath) {
+ 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 util.DirExists(unPackPath+sdkType+"/models") {
+ if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/models", "/opt/vasystem/bin/zconft"); cE != nil {
+ return false, cE
+ }
+ }
+ }
+ }
+ //娉ㄥ唽绠楁硶淇℃伅鍜岀畻娉曞弬鏁板埌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("鍙嶅簭鍒楀寲绠楁硶瀹氫箟淇℃伅澶辫触")
+ }
+ } else {
+ return false, errors.New("璇诲彇绠楁硶瀹氫箟淇℃伅澶辫触")
+ }
+ } else {
+ return false, errors.New("绠楁硶瀹氫箟淇℃伅涓㈠け")
+ }
+ } else {
+ return false, errors.New("鍙嶅簭鍒楀寲鎺堟潈淇℃伅澶辫触")
+ }
+ } else {
+ return false, errors.New("璇诲彇鎺堟潈鏂囦欢澶辫触")
+ }
+ } else {
+ return false, errors.New("鎺堟潈鏂囦欢涓嶅瓨鍦�")
+ }
+
+ return true, nil
+}
+
+
+type InsInc struct {
+ OrderId string `json:"orderId"`
+ ProductId string `json:"productId"`
+ ActivateCode string `json:"activateCode"`
+ MachineCode string `json:"machineCode"`
+ UserId string `json:"userId"`
+ SdkIds []string `json:"sdkIds"`
+ ModuleIds []string `json:"moduleIds"`
+ ChCount int `json:"chCount"`
+ AuthCount int `json:"authCount"`
+ ServeYear int `json:"serveYear"`
+}
+
+//绠楁硶鍜屽弬鏁板畾涔�
+type SdkDef struct {
+ Def Sdk `json:"def"`
+ Args []SdkArgEntity `json:"args"`
+}
+
+type Sdk struct {
+ Id string `gorm:"column:id;primary_key;type:varchar(50);unique;not null;" json:"id"`
+ IpcId string `gorm:"column:ipc_id" json:"ipc_id"`
+ SdkType string `gorm:"column:sdk_type" json:"sdk_type"`
+ SdkName string `gorm:"column:sdk_name" json:"sdk_name" example:"浜鸿劯妫�娴�"`
+ Icon string `gorm:"column:icon" json:"icon,omitempty"`
+ Url string `gorm:"column:url" json:"url,omitempty" example:"http://ip:port/govideo/sdk/1"`
+ CreateTime string `gorm:"column:create_time" json:"create_time"`
+ CreateBy string `gorm:"column:create_by" json:"create_by"`
+ UpdateTime string `gorm:"column:update_time" json:"update_time"`
+ 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鐗堟湰绛�)
+}
+
+type SdkArgEntity struct {
+ Id string `gorm:"primary_key;column:id" json:"id"`
+ SdkId string `gorm:"column:sdk_id" json:"sdk_id"`
+ Scope string `gorm:"column:scope" json:"scope"`
+ SdkArg
+}
+
+type SdkArg struct {
+ Alias string `gorm:"column:alias" json:"alias"` //鍙傛暟鐨勫埆鍚�
+ Name string `gorm:"column:name" json:"name"` //鍙傛暟鍚嶇О
+ Type string `gorm:"column:type" json:"type"` //鍙傛暟绫诲瀷(鏁存暟锛屽瓧绗︿覆鎴栨暟缁�)
+ ArgType string `gorm:"column:arg_type" json:"arg_type"`
+ Must bool `gorm:"column:must" json:"must"` //鏄惁蹇呭～
+ Unit string `gorm:"column:unit" json:"unit"` //鍗曚綅
+ Range string `gorm:"column:range" json:"range"` //鍊肩殑鑼冨洿锛宔g锛�0,100琛ㄧず浠�0鍒�100
+ DefaultValue string `gorm:"column:default_value" json:"default_value"`
+ DefaultOperator string `gorm:"column:default_operator" json:"default_operator"`
+ Sort int `gorm:"column:sort;default:1" json:"sort"`
+}
+
+
+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"` //绠楁硶涓嬭浇鍦板潃
+}
+
+type SdkRegisterArgVo struct {
+ Scope string `json:"scope"`
+ SdkArg
+
+ Dics []SdkArgDic `json:"dics"` //濡傛灉姝ょ畻娉曞弬鏁版槸琚�夐」锛岄渶瑕佸皢鍙傛暟鏋氫妇鍊煎啓鍏ュ埌瀛楀吀琛ㄤ腑
+}
+
+type SdkArgDic struct {
+ Value string `json:"value"`
+ Name string `json:"name"`
+ Sort int `json:"sort"`
+}
\ No newline at end of file
--
Gitblit v1.8.0