From aaef63e086f12d06cf5dae27007c81abf40ca3a2 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 11 六月 2020 19:45:14 +0800
Subject: [PATCH] fix models path
---
service/SdkInstall.go | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index 43f29a3..a223dbd 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,7 +232,7 @@
}
}
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
}
}
--
Gitblit v1.8.0