From 0d858e8610a79b15cb337daf134c4a00962dd477 Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期四, 04 六月 2020 16:44:29 +0800 Subject: [PATCH] add sdk upload --- service/SdkInstall.go | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/service/SdkInstall.go b/service/SdkInstall.go index c0d784b..b930aab 100644 --- a/service/SdkInstall.go +++ b/service/SdkInstall.go @@ -2,7 +2,6 @@ import ( "basic.com/dbapi.git" - //"basic.com/dbapi.git" "basic.com/valib/logger.git" "encoding/json" "errors" @@ -14,8 +13,12 @@ "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 @@ -30,6 +33,7 @@ if util.Exists(zipFilePath) { strMd5, e := util.FileMd5(zipFilePath) if e !=nil || strMd5 == "" { + go os.Remove(zipFilePath) return false,errors.New("鑾峰彇瀹夎鍖卪d5澶辫触") } if strMd5 == identifier { @@ -39,6 +43,7 @@ return true,nil } else { + go os.Remove(zipFilePath) logger.Debug("strMd5 is", strMd5,"identifier is",identifier,"not equal") return false,errors.New("鏍¢獙瀹夎鏂囦欢澶辫触") } @@ -56,27 +61,36 @@ configPatchPath = "/opt/vasystem/patch" } //1.瑙e帇缂╂洿鏂板寘 - 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 - logger.Debug("unPackFilePath:", unPackFilePath, "unPackPath:", unPackPath) - _,err := util.UnTarGzByCmd(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 } @@ -88,7 +102,7 @@ if err != nil { return false, err } - unPackPath = unPackPath + targetFileName +"/" + unPackPath := unPackTargetPath + targetFileName +"/" //瑙e帇瀹屾垚锛岃幏鍙栧畨瑁呭寘涓殑鏂囦欢锛屽紑濮嬪畨瑁� //1.瑙f瀽瀹夎璇存槑ins.inc incPath := unPackPath+"ins.inc" -- Gitblit v1.8.0