diff --git a/scagent/core/FileRpc.go b/scagent/core/FileRpc.go index bc170bc..cc54fc7 100644 --- a/scagent/core/FileRpc.go +++ b/scagent/core/FileRpc.go @@ -76,15 +76,6 @@ func (f *FileService) Compress(args *ZipBlock, reply *string) error { taskId <- "upok" }() - if strings.EqualFold(strings.ToLower(rest), "upok") { - logger.Info("上传文件", zap.String("filename", zpFileName), zap.String("path", remotePath)) - // 解压缩文件,文件存在的文化 - util.DecompressZip(remotePath) - logger.Info("解压缩文件", zap.String("filename", zpFileName), zap.String("path", remotePath)) - // 上传完成后删除本地压缩包 - // util.DeleteFile(ziprl) - } - // 返回压缩包名称 *reply = ziprl } diff --git a/scagent/core/UpFile.go b/scagent/core/UpFile.go index 3665bd2..3276062 100644 --- a/scagent/core/UpFile.go +++ b/scagent/core/UpFile.go @@ -91,10 +91,12 @@ func (f *UpFileService) UnzipArchive(info FileInfo, reply *string) error { logger := util.NewProductionLogger() defer logger.Sync() logger.Info("UnzipArchive", zap.String("filename", info.FileName)) + // 解压到的目录 + dirpath := filepath.Dir(info.FileName) // 解压缩文件 ret := make(chan string) go func() { - util.DecompressZip(info.FileName) + util.DecompressZip(info.FileName, dirpath) ret <- "uzok" }() // 返回true的字符串