fix: 网元端文件目录/tmp/omc 上传push 下载pull
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
|||||||
"be.ems/src/framework/i18n"
|
"be.ems/src/framework/i18n"
|
||||||
"be.ems/src/framework/utils/ctx"
|
"be.ems/src/framework/utils/ctx"
|
||||||
"be.ems/src/framework/utils/file"
|
"be.ems/src/framework/utils/file"
|
||||||
|
"be.ems/src/framework/utils/generate"
|
||||||
"be.ems/src/framework/utils/ssh"
|
"be.ems/src/framework/utils/ssh"
|
||||||
"be.ems/src/framework/vo/result"
|
"be.ems/src/framework/vo/result"
|
||||||
neService "be.ems/src/modules/network_element/service"
|
neService "be.ems/src/modules/network_element/service"
|
||||||
@@ -68,7 +69,9 @@ func (s *NeActionController) PushFile(c *gin.Context) {
|
|||||||
|
|
||||||
// 本地文件
|
// 本地文件
|
||||||
localFilePath := file.ParseUploadFilePath(body.UploadPath)
|
localFilePath := file.ParseUploadFilePath(body.UploadPath)
|
||||||
neFilePath := fmt.Sprintf("/tmp/%s", filepath.Base(localFilePath))
|
// 网元端临时目录
|
||||||
|
sshClient.RunCMD("mkdir -p /tmp/omc && sudo chmod 777 -R /tmp/omc")
|
||||||
|
neFilePath := filepath.Join("/tmp/omc/push", filepath.Base(localFilePath))
|
||||||
// 复制到远程
|
// 复制到远程
|
||||||
if err = sftpClient.CopyFileLocalToRemote(localFilePath, neFilePath); err != nil {
|
if err = sftpClient.CopyFileLocalToRemote(localFilePath, neFilePath); err != nil {
|
||||||
c.JSON(200, result.ErrMsg(fmt.Sprintf("%s : please check if scp remote copy is allowed", neInfo.NeType)))
|
c.JSON(200, result.ErrMsg(fmt.Sprintf("%s : please check if scp remote copy is allowed", neInfo.NeType)))
|
||||||
@@ -116,8 +119,9 @@ func (s *NeActionController) PullFile(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
defer sftpClient.Close()
|
defer sftpClient.Close()
|
||||||
|
|
||||||
nePath := fmt.Sprintf("%s/%s", querys.Path, querys.FileName)
|
nePath := filepath.Join(querys.Path, querys.FileName)
|
||||||
localFilePath := fmt.Sprintf("/tmp/omc/pullFile%s", nePath)
|
fileName := generate.Code(6) + "_" + querys.FileName
|
||||||
|
localFilePath := filepath.Join("/tmp/omc/pull", fileName)
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
localFilePath = fmt.Sprintf("C:%s", localFilePath)
|
localFilePath = fmt.Sprintf("C:%s", localFilePath)
|
||||||
}
|
}
|
||||||
@@ -126,7 +130,7 @@ func (s *NeActionController) PullFile(c *gin.Context) {
|
|||||||
c.JSON(200, result.ErrMsg(err.Error()))
|
c.JSON(200, result.ErrMsg(err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.FileAttachment(localFilePath, querys.FileName)
|
c.FileAttachment(localFilePath, fileName)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 网元端文件列表
|
// 网元端文件列表
|
||||||
|
|||||||
Reference in New Issue
Block a user