From f07d2e37345473604950dbe74b82b0fc12a962f6 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 26 Oct 2023 18:26:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9file=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/trace/tcpdump.go         | 10 +++++-----
 features/udm_user/api_udm_user.go |  7 ++++---
 src/app.go                        | 11 ++++++++++-
 src/modules/crontask/crontask.go  |  5 ++---
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/features/trace/tcpdump.go b/features/trace/tcpdump.go
index 06bc9f5f..a4c6b4a6 100644
--- a/features/trace/tcpdump.go
+++ b/features/trace/tcpdump.go
@@ -7,14 +7,14 @@ import (
 	"strings"
 	"time"
 
-	"ems.agt/lib/core/cmd"
 	"ems.agt/lib/core/conf"
-	"ems.agt/lib/core/file"
 	"ems.agt/lib/core/utils/ctx"
 	"ems.agt/lib/core/vo/result"
 	"ems.agt/lib/dborm"
 	"ems.agt/lib/log"
 	"ems.agt/restagent/config"
+	"ems.agt/src/framework/cmd"
+	"ems.agt/src/framework/utils/ssh"
 )
 
 var (
@@ -101,7 +101,7 @@ func TcpdumpPcapDownload(w http.ResponseWriter, r *http.Request) {
 
 	nePath := fmt.Sprintf("/tmp/%s", body.FileName)
 	localPath := fmt.Sprintf("%s/tcpdump/pcap/%s", conf.Get("ne.omcdir"), body.FileName)
-	err = file.FileSCPNeToLocal(neInfo.Ip, nePath, localPath)
+	err = ssh.FileSCPNeToLocal(neInfo.Ip, nePath, localPath)
 	if err != nil {
 		ctx.JSON(w, 200, result.ErrMsg(err.Error()))
 		return
@@ -218,7 +218,7 @@ func TcpdumpNeUPFTask(w http.ResponseWriter, r *http.Request) {
 		fileLogName := fmt.Sprintf("tmp_%s_%s.log", body.NeType, body.NeId)
 		filePcapName := fmt.Sprintf("tmp_%s_%s.pcap", body.NeType, body.NeId)
 		// 复制文件到网元上
-		err := file.FileSCPLocalToNe(neInfo.Ip, "C:\\AMP\\Probject\\ems_backend\\restagent\\backup\\upf_pcap", "/tmp")
+		err := ssh.FileSCPLocalToNe(neInfo.Ip, "C:\\AMP\\Probject\\ems_backend\\restagent\\backup\\upf_pcap", "/tmp")
 		if err != nil {
 			ctx.JSON(w, 200, result.ErrMsg(err.Error()))
 			return
@@ -245,7 +245,7 @@ func TcpdumpNeUPFTask(w http.ResponseWriter, r *http.Request) {
 		fileLogName := fmt.Sprintf("tmp_%s_%s.log", body.NeType, body.NeId)
 		filePcapName := fmt.Sprintf("tmp_%s_%s.pcap", body.NeType, body.NeId)
 		// cmdStr := "cd /tmp \nexpect /tmp/cat.sh "
-		err := file.FileSCPLocalToNe(neInfo.Ip, "C:\\AMP\\Probject\\ems_backend\\restagent\\backup\\upf_pcap", "/tmp")
+		err := ssh.FileSCPLocalToNe(neInfo.Ip, "C:\\AMP\\Probject\\ems_backend\\restagent\\backup\\upf_pcap", "/tmp")
 		if err != nil {
 			ctx.JSON(w, 200, result.ErrMsg(err.Error()))
 			return
diff --git a/features/udm_user/api_udm_user.go b/features/udm_user/api_udm_user.go
index c441085b..dd58d08b 100644
--- a/features/udm_user/api_udm_user.go
+++ b/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
diff --git a/src/app.go b/src/app.go
index 2e7260c0..eafc0070 100644
--- a/src/app.go
+++ b/src/app.go
@@ -10,7 +10,9 @@ import (
 	"ems.agt/src/modules/common"
 	"ems.agt/src/modules/crontask"
 	"ems.agt/src/modules/monitor"
+	netelement "ems.agt/src/modules/net_element"
 	"ems.agt/src/modules/system"
+	"ems.agt/src/modules/trace"
 
 	"github.com/gin-gonic/gin"
 )
@@ -113,9 +115,16 @@ func initDefeat(app *gin.Engine) {
 
 // 初始模块路由
 func initModulesRoute(app *gin.Engine) {
-
+	// 通用模块
 	common.Setup(app)
+	// 监控模块
 	monitor.Setup(app)
+	// 系统模块
 	system.Setup(app)
+	// 网元模块
+	netelement.Setup(app)
+	// 跟踪模块
+	trace.Setup(app)
+	// 调度任务模块--暂无接口
 	crontask.Setup(app)
 }
diff --git a/src/modules/crontask/crontask.go b/src/modules/crontask/crontask.go
index 4011eca3..0eea775e 100644
--- a/src/modules/crontask/crontask.go
+++ b/src/modules/crontask/crontask.go
@@ -12,11 +12,10 @@ import (
 
 // Setup 模块路由注册
 func Setup(router *gin.Engine) {
-	logger.Infof("开始加载 ====> monitor 模块路由")
+	logger.Infof("开始加载 ====> crontask 模块路由")
 
-	// 启动时需要的初始参数
+	// 初始定时任务队列
 	InitCronQueue()
-
 }
 
 // InitCronQueue 初始定时任务队列