From 9303b69ea569bcb5e581147543a3fd58e90d0d25 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:05:23 +0800
Subject: [PATCH] add get buckets contrl
---
service/SdkInstall.go | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index 43f29a3..ce8c083 100644
--- a/service/SdkInstall.go
+++ b/service/SdkInstall.go
@@ -33,12 +33,16 @@
zipFilePath := configPatchPath + "/"+identifier+ext
unPackTargetPath := configPatchPath+"/"+identifier+"_basic/"
+ md5DirPath := configPatchPath+"/"+identifier
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)
+ }
+ if util.DirExists(md5DirPath) {
+ go os.RemoveAll(md5DirPath)
}
return false,errors.New("鑾峰彇瀹夎鍖卪d5澶辫触")
}
@@ -52,6 +56,9 @@
go os.Remove(zipFilePath)
if util.DirExists(unPackTargetPath) {
go os.RemoveAll(unPackTargetPath)
+ }
+ if util.DirExists(md5DirPath) {
+ go os.RemoveAll(md5DirPath)
}
logger.Debug("strMd5 is", strMd5,"identifier is",identifier,"not equal")
return false,errors.New("鏍￠獙瀹夎鏂囦欢澶辫触")
@@ -72,12 +79,16 @@
//1.瑙ｅ帇缂╂洿鏂板寘
unPackTargetPath := configPatchPath+"/"+identifier+"_basic/"
unPackFilePath := configPatchPath+"/"+identifier+ext
+ md5DirPath := configPatchPath+"/"+identifier
defer func() {
if util.Exists(unPackTargetPath) {
os.RemoveAll(unPackTargetPath)
}
if util.Exists(unPackFilePath) {
os.RemoveAll(unPackFilePath)
+ }
+ if util.DirExists(md5DirPath) {
+ go os.RemoveAll(md5DirPath)
}
}()
@@ -221,9 +232,16 @@
}
}
if util.DirExists(unPackPath+sdkType+"/models") {
- if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/models", "./zconf"); cE != nil {
+ 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)
@@ -271,9 +289,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
}
--
Gitblit v1.8.0