feat: 合并代码

features/udm_user/api_udm_user.go

@@ -10,7 +10,6 @@ import (
 	"ems.agt/features/udm_user/model"
 	"ems.agt/features/udm_user/service"
 	"ems.agt/lib/core/conf"
-	"ems.agt/lib/core/file"
 	mmlclient "ems.agt/lib/core/mml_client"
 	"ems.agt/lib/core/utils/ctx"
 	"ems.agt/lib/core/utils/parse"
@@ -21,6 +20,8 @@ import (
 	"ems.agt/lib/services"
 	"ems.agt/restagent/config"
 	"ems.agt/src/framework/middleware/collectlogs"
+	"ems.agt/src/framework/utils/file"
+	"ems.agt/src/framework/utils/ssh"
 )
 
 // UDM 用户信息接口添加到路由
@@ -588,7 +589,7 @@ func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// 复制到远程
-	err = file.FileSCPLocalToNe(neInfo.Ip, localPath, nePath)
+	err = ssh.FileSCPLocalToNe(neInfo.Ip, localPath, nePath)
 	if err != nil {
 		ctx.JSON(w, 200, result.ErrMsg(err.Error()))
 		return
@@ -1179,7 +1180,7 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// 复制到远程
-	err = file.FileSCPLocalToNe(neInfo.Ip, localPath, nePath)
+	err = ssh.FileSCPLocalToNe(neInfo.Ip, localPath, nePath)
 	if err != nil {
 		ctx.JSON(w, 200, result.ErrMsg(err.Error()))
 		return