From f1980b2d9057281879faa0bc1b4207fba7e0ecc3 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 26 Apr 2024 15:09:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=9B=AE=E5=BD=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network_element/service/ne_license.impl.go    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/modules/network_element/service/ne_license.impl.go b/src/modules/network_element/service/ne_license.impl.go
index 8e5fc916..9316f0cb 100644
--- a/src/modules/network_element/service/ne_license.impl.go
+++ b/src/modules/network_element/service/ne_license.impl.go
@@ -3,6 +3,7 @@ package service
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"time"
@@ -174,17 +175,17 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error {
 
 	// 网元端授权文件路径
 	neTypeLower := strings.ToLower(neLicense.NeType)
-	neLicensePath := fmt.Sprintf("/usr/local/etc/%s/license", neTypeLower)
-	// 修改文件夹权限
-	sshClient.RunCMD(fmt.Sprintf("sudo chmod o+w %s/", neLicensePath))
-	sshClient.RunCMD(fmt.Sprintf("sudo chmod o+w %s/system.ini", neLicensePath))
+	neLicensePath := fmt.Sprintf("/usr/local/etc/%s/license/system.ini", neTypeLower)
+	neLicenseDir := filepath.ToSlash(filepath.Dir(neLicensePath))
+	// 修改网元文件权限
+	sshClient.RunCMD(fmt.Sprintf("sudo chmod o+w %s && sudo chmod o+w %s", neLicenseDir, neLicensePath))
+
 	// 尝试备份授权文件
 	neLicensePathBack := fmt.Sprintf("%s/system_%s.ini", neLicensePath, time.Now().Format("20060102_150405"))
 	sshClient.RunCMD(fmt.Sprintf("sudo cp -rf %s/system.ini %s", neLicensePath, neLicensePathBack))
 
 	// 上传授权文件去覆盖
-	err = sftpClient.CopyFileLocalToRemote(omcLicensePath, neLicensePath+"/system.ini")
-	if err != nil {
+	if err := sftpClient.CopyFileLocalToRemote(omcLicensePath, neLicensePath); err != nil {
 		return err
 	}
 
@@ -192,7 +193,7 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error {
 	if neLicense.Reload {
 		cmdStr := fmt.Sprintf("sudo service %s restart", neTypeLower)
 		if neTypeLower == "ims" {
-			cmdStr = "sudo ims-stop && sudo ims-start"
+			cmdStr = "sudo ims-stop || true && sudo ims-start"
 		} else if neTypeLower == "omc" {
 			cmdStr = "sudo /usr/local/omc/bin/omcsvc.sh restart"
 		}