OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

Merge branch 'lichang' into lite

Browse Source
This commit is contained in:
TsMask
2025-04-29 16:15:16 +08:00
parent b82f359b5f 23881042bc
commit 2a51f0fa86
670 changed files with 17749 additions and 19324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/cm/ne.go
View File

@@ -863,7 +863,7 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
// send 204 to fe firstly
services.ResponseStatusOK204NoContent(w)
//actionCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh %s", config.GetYamlConfig().NE.OmcDir, action)
actionCmd := fmt.Sprintf("sudo systemctl %s restagent", action)
actionCmd := fmt.Sprintf("sudo systemctl %s omc", action)
go RunSSHCmd(sshHost, actionCmd)
return
// cmd := exec.Command("ssh", sshHost, actionCmd)

8
features/cm/omc/route.go
View File

@@ -11,19 +11,19 @@ func Register(r *gin.RouterGroup) {
{
var o *ConfigOMC
cmOMC.GET("/config/:paramName",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
o.Get,
)
cmOMC.POST("/config/:paramName",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
o.Post,
)
cmOMC.PUT("/config/:paramName",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
o.Put,
)
cmOMC.DELETE("/config/:paramName",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
o.Delete,
)
}

134
features/lm/file_export/controller.go
View File

@@ -4,7 +4,6 @@ import (
"encoding/json"
"net/http"
"os"
"path"
"path/filepath"
"be.ems/lib/file"
@@ -13,9 +12,6 @@ import (
"be.ems/src/framework/database/db"
"be.ems/src/framework/i18n"
"be.ems/src/framework/reqctx"
"be.ems/src/framework/resp"
"be.ems/src/framework/ssh"
systemService "be.ems/src/modules/system/service"
"github.com/gin-gonic/gin"
)
@@ -140,133 +136,3 @@ func (m *FileExport) Delete(c *gin.Context) {
}
c.JSON(http.StatusNoContent, nil) // 204 No Content
}
// 设置FTP配置
// POST /table/ftp
func (m *SysJob) SetFTPConfig(c *gin.Context) {
language := reqctx.AcceptLanguage(c)
var body struct {
Password string `json:"password" `
Username string `json:"username" binding:"required"`
ToIp string `json:"toIp" binding:"required"`
ToPort int64 `json:"toPort" binding:"required"`
Enable bool `json:"enable"`
Dir string `json:"dir" binding:"required"`
}
if err := c.ShouldBindBodyWithJSON(&body); err != nil {
c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}
// 获取配置
cfg := systemService.NewSysConfig.FindByKey("neData.exportTableFTP")
if cfg.ConfigId > 0 {
byteData, err := json.Marshal(body)
if err != nil {
c.JSON(200, resp.ErrMsg(err.Error()))
return
}
cfg.ConfigValue = string(byteData)
cfg.UpdateBy = reqctx.LoginUserToUserName(c)
systemService.NewSysConfig.UpdateEncryptValue(cfg)
}
c.JSON(200, resp.Ok(nil))
}
// 获取FTP配置
// GET /table/ftp
func (m *SysJob) GetFTPConfig(c *gin.Context) {
// 获取配置
cfg := systemService.NewSysConfig.FindByKeyDecryptValue("neData.exportTableFTP")
if cfg.ConfigId > 0 {
var body struct {
Password string `json:"password" `
Username string `json:"username" binding:"required"`
ToIp string `json:"toIp" binding:"required"`
ToPort int64 `json:"toPort" binding:"required"`
Enable bool `json:"enable"`
Dir string `json:"dir" binding:"required"`
}
if err := json.Unmarshal([]byte(cfg.ConfigValue), &body); err != nil {
c.JSON(200, resp.ErrMsg(err.Error()))
return
}
c.JSON(200, resp.OkData(body))
return
}
c.JSON(200, resp.Ok(nil))
}
// FTP发送
// PUT /table/ftp
func (m *SysJob) PutFTP(c *gin.Context) {
language := reqctx.AcceptLanguage(c)
var body struct {
FilePath string `json:"filePath" binding:"required"`
FileName string `json:"fileName" binding:"required"`
}
if err := c.ShouldBindBodyWithJSON(&body); err != nil {
c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}
localFilePath := filepath.Join(body.FilePath, body.FileName)
// 判断文件是否存在
if _, err := os.Stat(localFilePath); os.IsNotExist(err) {
c.JSON(200, resp.ErrMsg(err.Error()))
return
}
// 获取配置
var cfgData struct {
Password string `json:"password" `
Username string `json:"username" binding:"required"`
ToIp string `json:"toIp" binding:"required"`
ToPort int64 `json:"toPort" binding:"required"`
Enable bool `json:"enable"`
Dir string `json:"dir" binding:"required"`
}
cfg := systemService.NewSysConfig.FindByKeyDecryptValue("neData.exportTableFTP")
if cfg.ConfigId > 0 {
if err := json.Unmarshal([]byte(cfg.ConfigValue), &cfgData); err != nil {
c.JSON(200, resp.ErrMsg(err.Error()))
return
}
}
if !cfgData.Enable {
c.JSON(200, resp.ErrMsg("Setting Remote Backup is disabled"))
return
}
connSSH := ssh.ConnSSH{
User: cfgData.Username,
Password: cfgData.Password,
Addr: cfgData.ToIp,
Port: cfgData.ToPort,
AuthMode: "0",
}
sshClient, err := connSSH.NewClient()
if err != nil {
c.JSON(200, resp.ErrMsg(err.Error()))
return
}
defer sshClient.Close()
// 网元主机的SSH客户端进行文件传输
sftpClient, err := sshClient.NewClientSFTP()
if err != nil {
c.JSON(200, resp.ErrMsg(err.Error()))
return
}
defer sftpClient.Close()
// 远程文件
remotePath := filepath.Join(cfgData.Dir, path.Base(body.FilePath), body.FileName)
// 复制到远程
if err = sftpClient.CopyFileLocalToRemote(localFilePath, remotePath); err != nil {
c.JSON(200, resp.ErrMsg("error uploading file"))
return
}
c.JSON(200, resp.Ok(nil))
}

24
features/lm/file_export/route.go
View File

@@ -12,41 +12,27 @@ func Register(r *gin.RouterGroup) {
{
var m *SysJob
lmTable.GET("/list",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
m.GetFileExportTable,
)
lmTable.POST("/ftp",
middleware.PreAuthorize(nil),
middleware.CryptoApi(true, false),
m.SetFTPConfig,
)
lmTable.GET("/ftp",
middleware.PreAuthorize(nil),
middleware.CryptoApi(false, true),
m.GetFTPConfig,
)
lmTable.PUT("/ftp",
middleware.PreAuthorize(nil),
m.PutFTP,
)
}
lmFile := r.Group("/file")
{
var f *FileExport
lmFile.GET("/list",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
f.GetFileList,
)
lmFile.GET("/total",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
f.Total,
)
lmFile.GET("/:fileName",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
f.DownloadHandler,
)
lmFile.DELETE("/:fileName",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
f.Delete,
)
}

10
features/mml/mml.go
View File

@@ -101,7 +101,7 @@ func PostMML2ToNF(w http.ResponseWriter, r *http.Request) {
buf := make([]byte, BUFFER_SIZE)
var n int
var mmlResult []string
hostMML := fmt.Sprintf("%s:%d", telnetHost.Addr, telnetHost.Port)
hostMML := net.JoinHostPort(telnetHost.Addr, fmt.Sprintf("%d", telnetHost.Port))
conn, err := net.Dial("tcp", hostMML)
if err != nil {
errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
@@ -345,7 +345,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
// log.Debug(string(buf[0:n]))
for _, mml := range mmlRequest.MML {
hostMML := fmt.Sprintf("%s:%d", telnetHost.Addr, telnetHost.Port)
hostMML := net.JoinHostPort(telnetHost.Addr, fmt.Sprintf("%d", telnetHost.Port))
conn, err := net.Dial("tcp", hostMML)
if err != nil {
errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
@@ -410,7 +410,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
// mmlResult = append(mmlResult, "COMMAND OK\n")
}
case "ims":
hostMML := fmt.Sprintf("%s:%d", telnetHost.Addr, telnetHost.Port)
hostMML := net.JoinHostPort(telnetHost.Addr, fmt.Sprintf("%d", telnetHost.Port))
conn, err := net.Dial("tcp", hostMML)
if err != nil {
errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
@@ -529,7 +529,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
mmlResult = append(mmlResult, result)
}
default:
hostMML := fmt.Sprintf("%s:%d", telnetHost.Addr, telnetHost.Port)
hostMML := net.JoinHostPort(telnetHost.Addr, fmt.Sprintf("%d", telnetHost.Port))
conn, err := net.Dial("tcp", hostMML)
if err != nil {
errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
@@ -618,7 +618,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
mmlResult = append(mmlResult, result)
// UDM 特殊命令处理
if neType == "UDM" && strings.Contains(mml, "dec key") {
if neType == "UDM" && mml == "dec key" {
output, err := neService.NewNeInfo.NeRunSSHCmd(neInfo.NeType, neInfo.NeId, "cat /usr/local/etc/udm/ueKeyProfile.tmp")
if err != nil {
mmlResult = append(mmlResult, err.Error())

6
features/nbi/file/route.go
View File

@@ -11,15 +11,15 @@ func Register(r *gin.RouterGroup) {
{
var f *FileNBI
fileNBI.GET("/:category/:type/list",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
f.GetFileList,
)
fileNBI.GET("/:category/:type/:dateIndex",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
f.GetSingleFileHandler,
)
fileNBI.GET("/:category/:type",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
f.GetMultiFileHandler,
)
}

14
features/pm/kpi_c_report/route.go
View File

@@ -12,31 +12,31 @@ func Register(r *gin.RouterGroup) {
{
var k *KpiCReport
pmKPIC.GET("/report",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.GetReport2FE,
)
pmKPIC.GET("/report/list",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Get,
)
pmKPIC.GET("/report/totalList",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Total,
)
pmKPIC.GET("/report/total",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Total,
)
pmKPIC.POST("/report",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Post,
)
pmKPIC.PUT("/report/:id",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Put,
)
pmKPIC.DELETE("/report/:id",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Delete,
)
}

12
features/pm/kpi_c_title/route.go
View File

@@ -12,27 +12,27 @@ func Register(r *gin.RouterGroup) {
{
var k *KpiCTitle
pmKPIC.GET("/title",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Get,
)
pmKPIC.GET("/title/total",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Total,
)
pmKPIC.GET("/title/totalList",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.GetToalList,
)
pmKPIC.POST("/title",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Post,
)
pmKPIC.PUT("/title/:id",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Put,
)
pmKPIC.DELETE("/title/:id",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Delete,
)
}

20
features/pm/performance.go
View File

@@ -695,7 +695,7 @@ func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
}
log.Debug("ips:", ips)
measureTask.NotifyUrl = global.SetNotifyUrl(ips[0], config.GetYamlConfig().Rest[0].Port, fmt.Sprintf(MeasureReportFmt, neType))
measureTask.NotifyUrl = global.SetNotifyUrl(ips[0], 33030, fmt.Sprintf(MeasureReportFmt, neType))
log.Debug("Measure Task to NF:", measureTask)
if len(task.NeIds) == 0 {
@@ -1124,9 +1124,9 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
log.Debug("measurement:", measurement)
// layout := global.DateTime
// layout := time.RFC3339
// measurement.Date = GetDateFromTimeString(layout, measurement.StartTime)
// measurement.StartTime = GetDateTimeFromTimeString(layout, measurement.StartTime)
layout := time.RFC3339
measurement.Date = GetDateFromTimeString(layout, measurement.StartTime)
measurement.StartTime = GetDateTimeFromTimeString(layout, measurement.StartTime)
// tx := db.DB("").Table("nbi_pm").Create(measurement)
// if tx.Error != nil && tx.RowsAffected <= 0 {
// log.Error("Failed to insert nbi_pm:", err)
@@ -1207,12 +1207,12 @@ func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
layout := time.RFC3339
measurement.Date = GetDateFromTimeString(layout, measurement.StartTime)
measurement.StartTime = GetDateTimeFromTimeString(layout, measurement.StartTime)
tx := db.DB("").Table("nbi_pm").Create(measurement)
if tx.Error != nil && tx.RowsAffected <= 0 {
log.Error("Failed to insert nbi_pm:", err)
services.ResponseInternalServerError500DatabaseOperationFailed(w)
return
}
// tx := db.DB("").Table("nbi_pm").Create(measurement)
// if tx.Error != nil && tx.RowsAffected <= 0 {
// log.Error("Failed to insert nbi_pm:", err)
// services.ResponseInternalServerError500DatabaseOperationFailed(w)
// return
// }
default:
log.Debug("response body:", string(response.Body()))
body := new(map[string]interface{})

13
features/state/getstate.go
View File

@@ -21,6 +21,7 @@ import (
cfg "be.ems/src/framework/config"
"be.ems/src/framework/constants"
"be.ems/src/framework/database/db"
"be.ems/src/framework/utils/parse"
)
type CpuUsage struct {
@@ -914,7 +915,15 @@ func GetEMSState(ip string) *SysState {
if expiryDateStr == "" {
expiryDateStr = "-"
}
var port uint16 = 33030
httpArr := cfg.Get("server")
if httpArr != nil {
arr := httpArr.([]any)
if len(arr) > 1 {
rest := arr[0].(map[string]any)
port = uint16(parse.Number(rest["port"]))
}
}
hostName, _ := os.Hostname()
dbInfo := getDbInfo()
emsState := &SysState{
@@ -922,7 +931,7 @@ func GetEMSState(ip string) *SysState {
OsInfo: getUnameStr(),
DbInfo: dbInfo,
IpAddr: ipAddrs,
Port: config.GetYamlConfig().Rest[0].Port,
Port: port,
Version: global.Version,
Capability: CapabilityInt,
SerialNum: snStr,