diff --git a/src/modules/network_element/controller/ne_license.go b/src/modules/network_element/controller/ne_license.go index ca6fb04e..9399e4dd 100644 --- a/src/modules/network_element/controller/ne_license.go +++ b/src/modules/network_element/controller/ne_license.go @@ -268,7 +268,7 @@ func (s *NeLicenseController) State(c *gin.Context) { neLicense.Status = "0" } // 更新授权码 - if neLicense.ActivationRequestCode == "" || strings.HasPrefix(neLicense.ActivationRequestCode, "SN") { + if neLicense.ActivationRequestCode == "" || strings.HasPrefix(neLicense.ActivationRequestCode, "SN") || neLicense.Status == "0" { 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 a3961ebb..59db136f 100644 --- a/src/modules/network_element/service/ne_license.go +++ b/src/modules/network_element/service/ne_license.go @@ -138,9 +138,9 @@ func (r *NeLicense) ReadLicenseInfo(neLicense model.NeLicense) (string, string) } activationRequestCode := string(bytes) - parts := strings.SplitAfter(string(bytes), "\n") - if len(parts) > 1 { - activationRequestCode = parts[1] // 获取 \n 后的内容 + parts := strings.Split(activationRequestCode, "\n") + if len(parts) > 1 && strings.HasPrefix(parts[0], "SN") { + activationRequestCode = parts[1] // 获取第二行内容 } return strings.TrimSpace(activationRequestCode), licensePath } diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go index 84042fb9..ea7340d7 100644 --- a/src/modules/network_element/service/ne_version.go +++ b/src/modules/network_element/service/ne_version.go @@ -658,7 +658,7 @@ func (r NeVersion) operateRun(sshClient *ssh.ConnSSH, preinput map[string]string } } if !suffix { - suffix = strings.LastIndex(outputStr, "~# ") != -1 + suffix = strings.LastIndex(outputStr, "# ") != -1 // 特殊内容中的终端终止符 } if len(cmdStrArr) > 0 && suffix { if firstRead {