From cf11242699cf243f6d8b925f942a5753ad69683c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 13 May 2024 09:40:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84ToSl?= =?UTF-8?q?ash=E5=8E=BB=E9=99=A4=E5=A4=9A=E6=96=9C=E6=9D=A0=E8=BD=AC?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/file/file.go | 4 ++-- src/modules/common/controller/file.go | 2 +- src/modules/network_element/service/ne_info.impl.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/features/file/file.go b/features/file/file.go index 7abfe87d..7162b3f8 100644 --- a/features/file/file.go +++ b/features/file/file.go @@ -72,13 +72,13 @@ func UploadFile(w http.ResponseWriter, r *http.Request) { fileName = fileNamePath } else { path = config.GetYamlConfig().OMC.FrontUpload - fileName, err := services.HandleUploadFile(r, path, fileName) + fileNamePath, err := services.HandleUploadFile(r, path, fileName) if err != nil { log.Error("Faile to HandleUploadFile:", err) services.ResponseInternalServerError500ProcessError(w, err) return } - fileName = fileName + fileName = fileNamePath } log.Debugf("upload file=%s to path=%s", fileName, path) diff --git a/src/modules/common/controller/file.go b/src/modules/common/controller/file.go index c251c2ed..6dc67b7d 100644 --- a/src/modules/common/controller/file.go +++ b/src/modules/common/controller/file.go @@ -220,7 +220,7 @@ func (s *CommontController) TransferStaticFile(c *gin.Context) { delPrefix := strings.Replace(body.StaticPath, static["prefix"].(string), "", 1) staticPath := strings.Replace(delPrefix, "{language}", lang, 1) - newFile := fmt.Sprintf("%s%s", dir, staticPath) + newFile := filepath.ToSlash(fmt.Sprintf("%s%s", dir, staticPath)) err = file.CopyUploadFile(body.UploadPath, newFile) if err != nil { diff --git a/src/modules/network_element/service/ne_info.impl.go b/src/modules/network_element/service/ne_info.impl.go index 9006d95a..92adcdda 100644 --- a/src/modules/network_element/service/ne_info.impl.go +++ b/src/modules/network_element/service/ne_info.impl.go @@ -461,7 +461,7 @@ func (r *NeInfoImpl) neConfOAMWirte(neType, neId string, content any, sync bool) // 网元端配置路径 neFilePath := fmt.Sprintf("/usr/local/etc/%s/%s", neTypeLower, fileName) - neFileDir := filepath.Dir(neFilePath) + neFileDir := filepath.ToSlash(filepath.Dir(neFilePath)) // 修改网元文件权限 sshClient.RunCMD(fmt.Sprintf("sudo mkdir -p %s && sudo chmod o+w %s && sudo touch %s && sudo chmod o+w %s", neFileDir, neFileDir, neFilePath, neFilePath)) // 复制到网元进行覆盖