OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 工具sftp复制到远程不创建文件夹/复制到本地不备份

Browse Source
This commit is contained in:
TsMask
2024-04-29 18:21:09 +08:00
parent d8db8ea79a
commit 93a4a40374
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/framework/utils/ssh/ssh.go
View File

@@ -431,15 +431,15 @@ func (s *SSHClientSFTP) CopyFileRemoteToLocal(remotePath, localPath string) erro
} }
// 如果目标文件已经存在，先将目标文件重命名 // 如果目标文件已经存在，先将目标文件重命名
if info, err := os.Stat(localPath); err == nil && !info.IsDir() { // if info, err := os.Stat(localPath); err == nil && !info.IsDir() {
ext := filepath.Ext(localPath) // ext := filepath.Ext(localPath)
name := localPath[0 : len(localPath)-len(ext)] // name := localPath[0 : len(localPath)-len(ext)]
newName := fmt.Sprintf("%s-%s%s", name, time.Now().Format("20060102_150405"), ext) // newName := fmt.Sprintf("%s-%s%s", name, time.Now().Format("20060102_150405"), ext)
err := os.Rename(localPath, newName) // err := os.Rename(localPath, newName)
if err != nil { // if err != nil {
return err // return err
} // }
} // }
// 创建本地文件 // 创建本地文件
localFile, err := os.Create(localPath) localFile, err := os.Create(localPath)
@@ -468,12 +468,6 @@ func (s *SSHClientSFTP) CopyFileLocalToRemote(localPath, remotePath string) erro
} }
defer localFile.Close() defer localFile.Close()
// 创建远程目录
if err := s.Client.MkdirAll(filepath.Dir(remotePath)); err != nil {
logger.Errorf("CopyFileLocalToRemote failed to creating remote directory %s: => %s", remotePath, err.Error())
return err
}
// 创建远程文件 // 创建远程文件
remoteFile, err := s.Client.Create(remotePath) remoteFile, err := s.Client.Create(remotePath)
if err != nil { if err != nil {