From aa91d7884e7fef55b47d6a4905596f72a5ef1ac3 Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期六, 30 五月 2020 17:43:03 +0800 Subject: [PATCH] fix sdkType unTar --- service/SdkInstall.go | 57 ++++++++++++++++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 27 deletions(-) diff --git a/service/SdkInstall.go b/service/SdkInstall.go index e759454..d397ee7 100644 --- a/service/SdkInstall.go +++ b/service/SdkInstall.go @@ -108,33 +108,6 @@ 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 { @@ -170,6 +143,36 @@ logger.Debug("sdkApi.Register paramBody:", paramBody) //sdkApi.Register(paramBody) //灏嗙畻娉曟敞鍐屽埌鏁版嵁搴撲腑 } + 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 + } + } + } else { + logger.Debug("unTarGzE sdkType.tar.gz err:", unTarGzE) + } + } + } else { return false, errors.New("鍙嶅簭鍒楀寲绠楁硶瀹氫箟淇℃伅澶辫触") } -- Gitblit v1.8.0