Merge branch 'main' of http://192.168.2.166:3180/OMC/ems_backend
This commit is contained in:
@@ -5,7 +5,6 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"ems.agt/src/framework/config"
|
|
||||||
"ems.agt/src/framework/i18n"
|
"ems.agt/src/framework/i18n"
|
||||||
"ems.agt/src/framework/utils/ctx"
|
"ems.agt/src/framework/utils/ctx"
|
||||||
"ems.agt/src/framework/utils/file"
|
"ems.agt/src/framework/utils/file"
|
||||||
@@ -53,7 +52,7 @@ func (s *NeActionController) PushFile(c *gin.Context) {
|
|||||||
|
|
||||||
// 本地文件
|
// 本地文件
|
||||||
localPath := file.ParseUploadFilePath(body.UploadPath)
|
localPath := file.ParseUploadFilePath(body.UploadPath)
|
||||||
nePath := config.Get("mml.upload").(string)
|
nePath := "/tmp" //config.Get("mml.upload").(string)
|
||||||
// 复制到远程
|
// 复制到远程
|
||||||
err := ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
|
err := ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
mmlclient "ems.agt/lib/core/mml_client"
|
mmlclient "ems.agt/lib/core/mml_client"
|
||||||
"ems.agt/src/framework/config"
|
|
||||||
"ems.agt/src/framework/constants/uploadsubpath"
|
"ems.agt/src/framework/constants/uploadsubpath"
|
||||||
"ems.agt/src/framework/i18n"
|
"ems.agt/src/framework/i18n"
|
||||||
"ems.agt/src/framework/utils/ctx"
|
"ems.agt/src/framework/utils/ctx"
|
||||||
@@ -437,7 +436,7 @@ func (s *UDMAuthController) Import(c *gin.Context) {
|
|||||||
|
|
||||||
// 本地文件
|
// 本地文件
|
||||||
localPath := file.ParseUploadFilePath(upFilePath)
|
localPath := file.ParseUploadFilePath(upFilePath)
|
||||||
nePath := config.Get("mml.upload").(string)
|
nePath := "/tmp" //config.Get("mml.upload").(string)
|
||||||
// 复制到远程
|
// 复制到远程
|
||||||
err = ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
|
err = ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
mmlclient "ems.agt/lib/core/mml_client"
|
mmlclient "ems.agt/lib/core/mml_client"
|
||||||
"ems.agt/src/framework/config"
|
|
||||||
"ems.agt/src/framework/constants/uploadsubpath"
|
"ems.agt/src/framework/constants/uploadsubpath"
|
||||||
"ems.agt/src/framework/i18n"
|
"ems.agt/src/framework/i18n"
|
||||||
"ems.agt/src/framework/utils/ctx"
|
"ems.agt/src/framework/utils/ctx"
|
||||||
@@ -515,7 +514,7 @@ func (s *UDMSubController) Import(c *gin.Context) {
|
|||||||
|
|
||||||
// 本地文件
|
// 本地文件
|
||||||
localPath := file.ParseUploadFilePath(upFilePath)
|
localPath := file.ParseUploadFilePath(upFilePath)
|
||||||
nePath := config.Get("mml.upload").(string)
|
nePath := "/tmp" //config.Get("mml.upload").(string)
|
||||||
// 复制到远程
|
// 复制到远程
|
||||||
err = ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
|
err = ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user