From f56f110c8cac942fb912e82eea6893cd5cd3bf62 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 12 Jul 2024 17:46:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=8D=E5=88=B6=E5=88=B0=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/nms_cxy/service/config.impl.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/modules/nms_cxy/service/config.impl.go b/src/modules/nms_cxy/service/config.impl.go index 93aa9c4..fbbe011 100644 --- a/src/modules/nms_cxy/service/config.impl.go +++ b/src/modules/nms_cxy/service/config.impl.go @@ -11,6 +11,7 @@ import ( neService "nms_cxy/src/modules/network_element/service" "nms_cxy/src/modules/nms_cxy/model" "nms_cxy/src/modules/nms_cxy/utils/common" + "runtime" "strings" "time" @@ -62,9 +63,14 @@ func (s *ConfigImpl) ConfigUploadOSS(neType string) error { // 配置文件目录 nePath := fmt.Sprintf("/usr/local/etc/%s/*.yaml", strings.ToLower(neType)) - localPath := fmt.Sprintf("/usr/local/omc/etc/%s/", strings.ToLower(neType)) + nePathTemp := fmt.Sprintf("/tmp/%s/config/", strings.ToLower(neType)) + localPath := fmt.Sprintf("/usr/local/etc/omc/ne_config/%s/config/", strings.ToLower(neType)) + if runtime.GOOS == "windows" { + localPath = fmt.Sprintf("C:%s", localPath) + } + sshClient.RunCMD(fmt.Sprintf("mkdir -p %s && sudo cp -rf %s %s", nePathTemp, nePath, nePathTemp)) // 复制到本地 - if err = sftpClient.CopyDirRemoteToLocal(nePath, localPath); err != nil { + if err = sftpClient.CopyDirRemoteToLocal(nePathTemp, localPath); err != nil { logger.Errorf("%s : please check if scp remote copy is allowed", neInfo.NeType) return fmt.Errorf("copy config err") } @@ -464,7 +470,7 @@ func (s *ConfigImpl) ConfigParamModify(neInfo neModel.NeInfo, byUsername string, // 新增 // if operType == "add" {} - // 操作记录推送 Kafka + // 操作记录到数据库 bytes, _ := json.Marshal(operPara) nowTime := time.Now() nrmLog := model.NRMLog{ @@ -477,6 +483,7 @@ func (s *ConfigImpl) ConfigParamModify(neInfo neModel.NeInfo, byUsername string, ChangeOper: string(bytes), } nrmLogId := s.resourceService.ResourceeInsert(nrmLog) + // 操作记录推入kafka if nrmLogId != "" { pushData := operPara pushData["MsgID"] = nrmLogId