Merge branch 'main' into multi-tenant

src/modules/network_element/controller/action.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -9,6 +10,7 @@ import (
 	"be.ems/src/framework/i18n"
 	"be.ems/src/framework/utils/ctx"
 	"be.ems/src/framework/utils/file"
+	"be.ems/src/framework/utils/generate"
 	"be.ems/src/framework/utils/ssh"
 	"be.ems/src/framework/vo/result"
 	neService "be.ems/src/modules/network_element/service"
@@ -29,7 +31,7 @@ type NeActionController struct {
 	neInfoService neService.INeInfo
 }
 
-// 发送文件到网元端
+// 发送文件从本地到网元
 //
 // POST /pushFile
 func (s *NeActionController) PushFile(c *gin.Context) {
@@ -38,6 +40,7 @@ func (s *NeActionController) PushFile(c *gin.Context) {
 		NeType     string `json:"neType" binding:"required"`
 		NeID       string `json:"neId" binding:"required"`
 		UploadPath string `json:"uploadPath" binding:"required"`
+		DelTemp    bool   `json:"delTemp"` // 删除本地临时文件
 	}
 	if err := c.ShouldBindBodyWith(&body, binding.JSON); err != nil {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
@@ -68,13 +71,20 @@ func (s *NeActionController) PushFile(c *gin.Context) {
 
 	// 本地文件
 	localFilePath := file.ParseUploadFilePath(body.UploadPath)
-	neFilePath := fmt.Sprintf("/tmp/%s", filepath.Base(localFilePath))
+	// 网元端临时目录
+	sshClient.RunCMD("mkdir -p /tmp/omc/push && sudo chmod 777 -R /tmp/omc")
+	neFilePath := filepath.ToSlash(filepath.Join("/tmp/omc/push", filepath.Base(localFilePath)))
 	// 复制到远程
 	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("Please check if the file exists or if scp is allowed to copy remotely"))
 		return
 	}
 
+	defer func() {
+		if body.DelTemp {
+			_ = os.Remove(localFilePath)
+		}
+	}()
 	c.JSON(200, result.OkData(filepath.ToSlash(neFilePath)))
 }
 
@@ -88,6 +98,7 @@ func (s *NeActionController) PullFile(c *gin.Context) {
 		NeID     string `form:"neId" binding:"required"`
 		Path     string `form:"path" binding:"required"`
 		FileName string `form:"fileName" binding:"required"`
+		DelTemp  bool   `form:"delTemp"` // 删除本地临时文件
 	}
 	if err := c.ShouldBindQuery(&querys); err != nil {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
@@ -116,8 +127,9 @@ func (s *NeActionController) PullFile(c *gin.Context) {
 	}
 	defer sftpClient.Close()
 
-	nePath := fmt.Sprintf("%s/%s", querys.Path, querys.FileName)
-	localFilePath := fmt.Sprintf("/tmp/omc/pullFile%s", nePath)
+	nePath := filepath.ToSlash(filepath.Join(querys.Path, querys.FileName))
+	fileName := generate.Code(6) + "_" + querys.FileName
+	localFilePath := filepath.Join("/tmp/omc/pull", fileName)
 	if runtime.GOOS == "windows" {
 		localFilePath = fmt.Sprintf("C:%s", localFilePath)
 	}
@@ -126,7 +138,13 @@ func (s *NeActionController) PullFile(c *gin.Context) {
 		c.JSON(200, result.ErrMsg(err.Error()))
 		return
 	}
-	c.FileAttachment(localFilePath, querys.FileName)
+
+	defer func() {
+		if querys.DelTemp {
+			_ = os.Remove(localFilePath)
+		}
+	}()
+	c.FileAttachment(localFilePath, fileName)
 }
 
 // 网元端文件列表

src/modules/network_element/ne_config_test.go

@@ -29,7 +29,7 @@ const (
 	// 配置文件路径
 	configParamDir = "../../../config/param"
 	// configParamFile = "*" // 目录下全部更新
-	configParamFile = "ims_param_config.yaml" // 单文件更新
+	configParamFile = "cbc_param_config.yaml" // 单文件更新
 )
 
 func TestEncrypt(t *testing.T) {
@@ -154,9 +154,9 @@ func saveDB(s model.NeConfig) string {
 	s.UpdateTime = time.Now().UnixMilli()
 	if id != "" {
 		s.ID = id
-		db.Save(s)
+		db.Save(&s)
 	} else {
-		db.Create(s)
+		db.Create(&s)
 	}
 	return s.ID
 }

src/modules/network_element/repository/ne_info.impl.go

@@ -31,6 +31,7 @@ var neListSort = []string{
 	"N3IWF",
 	"MOCNGW",
 	"SMSC",
+	"CBC",
 }
 
 // 实例化数据层 NeInfoImpl 结构体