From d080dcd36748b543b34d57f48106b52656652f3a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 29 May 2025 14:50:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E6=BF=80=E6=B4=BB?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=A0=81=E6=8F=90=E5=8F=96=E4=B8=A4=E8=A1=8C?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=BF=80=E6=B4=BB=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_element/controller/ne_license.go | 5 ++++- src/modules/network_element/service/ne_license.go | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/modules/network_element/controller/ne_license.go b/src/modules/network_element/controller/ne_license.go index 64bc1a84..ca6fb04e 100644 --- a/src/modules/network_element/controller/ne_license.go +++ b/src/modules/network_element/controller/ne_license.go @@ -2,6 +2,7 @@ package controller import ( "fmt" + "strings" "github.com/gin-gonic/gin" @@ -265,7 +266,9 @@ func (s *NeLicenseController) State(c *gin.Context) { neLicense.ExpiryDate = fmt.Sprint(neState["expire"]) } else { neLicense.Status = "0" - // 更新授权码 + } + // 更新授权码 + if neLicense.ActivationRequestCode == "" || strings.HasPrefix(neLicense.ActivationRequestCode, "SN") { code, licensePath := s.neLicenseService.ReadLicenseInfo(neLicense) neLicense.ActivationRequestCode = code neLicense.LicensePath = licensePath diff --git a/src/modules/network_element/service/ne_license.go b/src/modules/network_element/service/ne_license.go index 4173aa40..a3961ebb 100644 --- a/src/modules/network_element/service/ne_license.go +++ b/src/modules/network_element/service/ne_license.go @@ -136,7 +136,13 @@ func (r *NeLicense) ReadLicenseInfo(neLicense model.NeLicense) (string, string) if err = sftpClient.CopyFileRemoteToLocal(nePath+"/system.ini", omcPath+"/system.ini"); err == nil { licensePath = omcPath + "/system.ini" } - return strings.TrimSpace(string(bytes)), licensePath + + activationRequestCode := string(bytes) + parts := strings.SplitAfter(string(bytes), "\n") + if len(parts) > 1 { + activationRequestCode = parts[1] // 获取 \n 后的内容 + } + return strings.TrimSpace(activationRequestCode), licensePath } // UploadLicense 授权文件上传到网元主机