fix: 网元激活申请码提取两行中的激活码
This commit is contained in:
@@ -2,6 +2,7 @@ package controller
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
|
||||||
@@ -265,7 +266,9 @@ func (s *NeLicenseController) State(c *gin.Context) {
|
|||||||
neLicense.ExpiryDate = fmt.Sprint(neState["expire"])
|
neLicense.ExpiryDate = fmt.Sprint(neState["expire"])
|
||||||
} else {
|
} else {
|
||||||
neLicense.Status = "0"
|
neLicense.Status = "0"
|
||||||
// 更新授权码
|
}
|
||||||
|
// 更新授权码
|
||||||
|
if neLicense.ActivationRequestCode == "" || strings.HasPrefix(neLicense.ActivationRequestCode, "SN") {
|
||||||
code, licensePath := s.neLicenseService.ReadLicenseInfo(neLicense)
|
code, licensePath := s.neLicenseService.ReadLicenseInfo(neLicense)
|
||||||
neLicense.ActivationRequestCode = code
|
neLicense.ActivationRequestCode = code
|
||||||
neLicense.LicensePath = licensePath
|
neLicense.LicensePath = licensePath
|
||||||
|
|||||||
@@ -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 {
|
if err = sftpClient.CopyFileRemoteToLocal(nePath+"/system.ini", omcPath+"/system.ini"); err == nil {
|
||||||
licensePath = omcPath + "/system.ini"
|
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 授权文件上传到网元主机
|
// UploadLicense 授权文件上传到网元主机
|
||||||
|
|||||||
Reference in New Issue
Block a user