From 44de9009dd1dd7b607d1e9d368df9cc1fd460b71 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 3 Jun 2024 18:27:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85OMC=E5=8D=87=E7=BA=A7=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network_element/service/ne_license.impl.go    |  2 +-
 .../network_element/service/ne_version.impl.go    | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/modules/network_element/service/ne_license.impl.go b/src/modules/network_element/service/ne_license.impl.go
index d6f684ee..82d3060e 100644
--- a/src/modules/network_element/service/ne_license.impl.go
+++ b/src/modules/network_element/service/ne_license.impl.go
@@ -183,7 +183,7 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error {
 		if neTypeLower == "ims" {
 			cmdStr = "sudo ims-stop || true && sudo ims-start"
 		} else if neTypeLower == "omc" {
-			cmdStr = "sudo /usr/local/omc/bin/omcsvc.sh restart"
+			cmdStr = "sudo systemctl restart restagent"
 		}
 		sshClient.RunCMD(cmdStr)
 	}
diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go
index 473f109a..d642603c 100644
--- a/src/modules/network_element/service/ne_version.impl.go
+++ b/src/modules/network_element/service/ne_version.impl.go
@@ -125,10 +125,6 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
 	if err != nil {
 		return "", err
 	}
-	// 操作自己omc时
-	if neVersion.NeType == "OMC" {
-		return sshClient.RunCMD(fmt.Sprintf("nohup sh -c \"sleep 3s && %s\" > /dev/null 2>&1 & \n", strings.Join(cmdStrArr, " && ")))
-	}
 
 	//  ========= 执行阶段 =========
 	commandLine, err := r.operateRun(sshClient, preinput, cmdStrArr, neVersion.NeType, okFlagStr)
@@ -203,14 +199,15 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
 	// 组合命令输入
 	cmdStrArr := []string{}
 	if neType == "OMC" {
-		cmdStrArr = append(cmdStrArr, pkgCmdStr)
+		cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n")
 		if action == "install" {
-			cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m install") // 初始化数据库
+			cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m install \n") // 初始化数据库
 		} else {
-			cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/omcsvc.sh stop")
-			cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade") // 升级数据库
+			cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade \n") // 升级数据库
 		}
-		cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/omcsvc.sh restart")
+
+		// 2s后重启服务
+		cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 2s && sudo systemctl restart restagent\" > /dev/null 2>&1 & \n")
 	} else if neType == "IMS" {
 		if action == "install" {
 			para5GData := NewNeInfoImpl.Para5GData