From f767e14bf1d8b18fa2184d4fee671559a4019492 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 18 Mar 2025 19:29:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=87=E4=BB=BD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E8=B7=AF=E5=BE=84=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delete_ne_config_backup/delete_ne_config_backup.go | 2 +- src/modules/network_element/service/ne_config_backup.go | 4 ++-- src/modules/network_element/service/ne_info.go | 4 ++-- src/modules/network_element/service/ne_license.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go b/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go index d98e13cb..0de94e17 100644 --- a/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go +++ b/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go @@ -90,7 +90,7 @@ func (s *DeleteNeConfigBackupProcessor) Execute(data any) (any, error) { // deleteFile 删除本地文件 func (s DeleteNeConfigBackupProcessor) deleteFile(neType, neId string, oldFileDate time.Time) { neTypeLower := strings.ToLower(neType) - localPath := fmt.Sprintf("/usr/local/etc/omc/ne_config/%s/%s/backup ", neTypeLower, neId) + localPath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s/backup ", neTypeLower, neId) files, err := os.ReadDir(localPath) if err != nil { logger.Errorf("logger Remove ne_config File ReadDir err: %v", err.Error()) diff --git a/src/modules/network_element/service/ne_config_backup.go b/src/modules/network_element/service/ne_config_backup.go index 5de58c38..388bd26b 100644 --- a/src/modules/network_element/service/ne_config_backup.go +++ b/src/modules/network_element/service/ne_config_backup.go @@ -70,7 +70,7 @@ func (s NeConfigBackup) DeleteByIds(ids []int64) (int64, error) { func (s NeConfigBackup) FileLocalToNe(neInfo model.NeInfo, localFile string) error { neTypeLower := strings.ToLower(neInfo.NeType) // 网管本地路径 - omcPath := "/usr/local/etc/omc/ne_config" + omcPath := "/usr/local/omc/backup/ne_config" if runtime.GOOS == "windows" { omcPath = fmt.Sprintf("C:%s", omcPath) } @@ -149,7 +149,7 @@ func (s NeConfigBackup) FileNeToLocal(neInfo model.NeInfo) (string, error) { neTypeLower := strings.ToLower(neInfo.NeType) // 网管本地路径 - omcPath := "/usr/local/etc/omc/ne_config" + omcPath := "/usr/local/omc/backup/ne_config" if runtime.GOOS == "windows" { omcPath = fmt.Sprintf("C:%s", omcPath) } diff --git a/src/modules/network_element/service/ne_info.go b/src/modules/network_element/service/ne_info.go index 9fd015e3..f27fe805 100644 --- a/src/modules/network_element/service/ne_info.go +++ b/src/modules/network_element/service/ne_info.go @@ -593,7 +593,7 @@ func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, e neTypeLower := strings.ToLower(neType) fileName := "oam_manager.yaml" // 网管本地路径 - localFilePath := fmt.Sprintf("/usr/local/etc/omc/ne_config/%s/%s/%s", neTypeLower, neId, fileName) + localFilePath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s/%s", neTypeLower, neId, fileName) if runtime.GOOS == "windows" { localFilePath = fmt.Sprintf("C:%s", localFilePath) } @@ -648,7 +648,7 @@ func (r NeInfo) neConfOAMWirte(neType, neId string, content any, sync bool) erro neTypeLower := strings.ToLower(neType) fileName := "oam_manager.yaml" // 网管本地路径 - omcPath := "/usr/local/etc/omc/ne_config" + omcPath := "/usr/local/omc/backup/ne_config" if runtime.GOOS == "windows" { omcPath = fmt.Sprintf("C:%s", omcPath) } diff --git a/src/modules/network_element/service/ne_license.go b/src/modules/network_element/service/ne_license.go index 6a7452db..859c4249 100644 --- a/src/modules/network_element/service/ne_license.go +++ b/src/modules/network_element/service/ne_license.go @@ -100,7 +100,7 @@ func (r *NeLicense) FindByNeTypeAndNeID(neType, neId string) model.NeLicense { func (r *NeLicense) ReadLicenseInfo(neLicense model.NeLicense) (string, string) { neTypeLower := strings.ToLower(neLicense.NeType) // 网管本地路径 - omcPath := "/usr/local/etc/omc/ne_license" + omcPath := "/usr/local/omc/backup/ne_license" if runtime.GOOS == "windows" { omcPath = fmt.Sprintf("C:%s", omcPath) }