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

feat: 更新多个模块以支持新的数据结构和日志格式

Browse Source
This commit is contained in:
TsMask
2025-02-20 10:08:27 +08:00
parent 045a2b6b01
commit f3c33b31ac
272 changed files with 13246 additions and 15885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/ws/controller/ws.go
View File

@@ -5,9 +5,9 @@ import (
"be.ems/src/framework/i18n"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/ctx"
"be.ems/src/framework/reqctx"
"be.ems/src/framework/resp"
"be.ems/src/framework/utils/parse"
"be.ems/src/framework/vo/result"
"be.ems/src/modules/ws/service"
"github.com/gin-gonic/gin"
@@ -36,18 +36,19 @@ type WSController struct {
// @Tags ws
// @Accept json
// @Produce json
// @Param subGroupID query string false "Subscribe to message groups, multiple separated by commas"
// @Success 200 {object} object "Response Results"
// @Param subGroupID query string false "Subscribe to message groups, multiple separated by commas"
// @Param access_token query string false "Authorization tokens are used when it is inconvenient to pass parameters through the header."
// @Success 200 {object} object "Response Results"
// @Summary (ws://) Generic
// @Description (ws://) Generic
// @Router /ws [get]
func (s *WSController) WS(c *gin.Context) {
language := ctx.AcceptLanguage(c)
language := reqctx.AcceptLanguage(c)
// 登录用户信息
loginUser, err := ctx.LoginUser(c)
loginUser, err := reqctx.LoginUser(c)
if err != nil {
c.JSON(401, result.CodeMsg(401, i18n.TKey(language, err.Error())))
c.JSON(401, resp.CodeMsg(401, i18n.TKey(language, err.Error())))
return
}
@@ -70,14 +71,14 @@ func (s *WSController) WS(c *gin.Context) {
}
defer conn.Close()
wsClient := s.wsService.ClientCreate(loginUser.UserID, subGroupIDs, conn, nil)
wsClient := s.wsService.ClientCreate(loginUser.UserId, subGroupIDs, conn, nil)
go s.wsService.ClientWriteListen(wsClient)
go s.wsService.ClientReadListen(wsClient, s.wsReceiveService.Commont)
// 等待停止信号
for value := range wsClient.StopChan {
s.wsService.ClientClose(wsClient.ID)
logger.Infof("ws Stop Client UID %s %s", wsClient.BindUid, value)
logger.Infof("ws Stop Client UID %d %s", wsClient.BindUid, value)
return
}
}
@@ -86,12 +87,12 @@ func (s *WSController) WS(c *gin.Context) {
//
// GET /test?clientId=xxx&groupID=xxx
func (s *WSController) Test(c *gin.Context) {
language := ctx.AcceptLanguage(c)
language := reqctx.AcceptLanguage(c)
// 登录用户信息
loginUser, err := ctx.LoginUser(c)
loginUser, err := reqctx.LoginUser(c)
if err != nil {
c.JSON(401, result.CodeMsg(401, i18n.TKey(language, err.Error())))
c.JSON(401, resp.CodeMsg(401, i18n.TKey(language, err.Error())))
return
}
@@ -113,5 +114,5 @@ func (s *WSController) Test(c *gin.Context) {
}
}
c.JSON(200, result.OkData(errMsgArr))
c.JSON(200, resp.OkData(errMsgArr))
}

28
src/modules/ws/controller/ws_redis.go
View File

@@ -1,11 +1,11 @@
package controller
import (
"be.ems/src/framework/database/redis"
"be.ems/src/framework/i18n"
"be.ems/src/framework/logger"
"be.ems/src/framework/redis"
"be.ems/src/framework/utils/ctx"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/reqctx"
"be.ems/src/framework/resp"
neService "be.ems/src/modules/network_element/service"
"github.com/gin-gonic/gin"
@@ -15,26 +15,26 @@ import (
//
// GET /redis?hostId=1
func (s *WSController) Redis(c *gin.Context) {
language := ctx.AcceptLanguage(c)
language := reqctx.AcceptLanguage(c)
var query struct {
HostId string `form:"hostId" binding:"required"` // 连接主机ID
HostId int64 `form:"hostId" binding:"required"` // 连接主机ID
}
if err := c.ShouldBindQuery(&query); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}
// 登录用户信息
loginUser, err := ctx.LoginUser(c)
loginUser, err := reqctx.LoginUser(c)
if err != nil {
c.JSON(401, result.CodeMsg(401, i18n.TKey(language, err.Error())))
c.JSON(401, resp.CodeMsg(401, i18n.TKey(language, err.Error())))
return
}
neHost := neService.NewNeHost.SelectById(query.HostId)
if neHost.HostID != query.HostId || neHost.HostType != "redis" {
neHost := neService.NewNeHost.FindById(query.HostId)
if neHost.ID != query.HostId || neHost.HostType != "redis" {
// 没有可访问主机信息数据！
c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.noData")))
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.noData")))
return
}
@@ -44,7 +44,7 @@ func (s *WSController) Redis(c *gin.Context) {
client, err := connRedis.NewClient()
if err != nil {
// 连接主机失败，请检查连接参数后重试
c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
return
}
defer client.Close()
@@ -56,14 +56,14 @@ func (s *WSController) Redis(c *gin.Context) {
}
defer wsConn.Close()
wsClient := s.wsService.ClientCreate(loginUser.UserID, nil, wsConn, client)
wsClient := s.wsService.ClientCreate(loginUser.UserId, nil, wsConn, client)
go s.wsService.ClientWriteListen(wsClient)
go s.wsService.ClientReadListen(wsClient, s.wsReceiveService.Redis)
// 等待停止信号
for value := range wsClient.StopChan {
s.wsService.ClientClose(wsClient.ID)
logger.Infof("ws Stop Client UID %s %s", wsClient.BindUid, value)
logger.Infof("ws Stop Client UID %d %s", wsClient.BindUid, value)
return
}
}

38
src/modules/ws/controller/ws_ssh.go
View File

@@ -7,9 +7,9 @@ import (
"be.ems/src/framework/i18n"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/ctx"
"be.ems/src/framework/utils/ssh"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/reqctx"
"be.ems/src/framework/resp"
"be.ems/src/framework/ssh"
neService "be.ems/src/modules/network_element/service"
"github.com/gin-gonic/gin"
@@ -19,14 +19,14 @@ import (
//
// GET /ssh?hostId=1&cols=80&rows=40
func (s *WSController) SSH(c *gin.Context) {
language := ctx.AcceptLanguage(c)
language := reqctx.AcceptLanguage(c)
var query struct {
HostId string `form:"hostId" binding:"required"` // 连接主机ID
Cols int `form:"cols"` // 终端单行字符数
Rows int `form:"rows"` // 终端显示行数
HostId int64 `form:"hostId" binding:"required"` // 连接主机ID
Cols int `form:"cols"` // 终端单行字符数
Rows int `form:"rows"` // 终端显示行数
}
if err := c.ShouldBindQuery(&query); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}
if query.Cols < 80 || query.Cols > 400 {
@@ -37,16 +37,16 @@ func (s *WSController) SSH(c *gin.Context) {
}
// 登录用户信息
loginUser, err := ctx.LoginUser(c)
loginUser, err := reqctx.LoginUser(c)
if err != nil {
c.JSON(401, result.CodeMsg(401, i18n.TKey(language, err.Error())))
c.JSON(401, resp.CodeMsg(401, i18n.TKey(language, err.Error())))
return
}
neHost := neService.NewNeHost.SelectById(query.HostId)
if neHost.HostID != query.HostId || neHost.HostType != "ssh" {
neHost := neService.NewNeHost.FindById(query.HostId)
if neHost.ID != query.HostId || neHost.HostType != "ssh" {
// 没有可访问主机信息数据！
c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.noData")))
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.noData")))
return
}
@@ -62,7 +62,7 @@ func (s *WSController) SSH(c *gin.Context) {
}
if clientErr != nil {
// 连接主机失败，请检查连接参数后重试
c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
return
}
defer client.Close()
@@ -71,7 +71,7 @@ func (s *WSController) SSH(c *gin.Context) {
clientSession, err := client.NewClientSession(query.Cols, query.Rows)
if err != nil {
// 连接主机失败，请检查连接参数后重试
c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
return
}
defer clientSession.Close()
@@ -83,7 +83,7 @@ func (s *WSController) SSH(c *gin.Context) {
}
defer wsConn.Close()
wsClient := s.wsService.ClientCreate(loginUser.UserID, nil, wsConn, clientSession)
wsClient := s.wsService.ClientCreate(loginUser.UserId, nil, wsConn, clientSession)
go s.wsService.ClientWriteListen(wsClient)
go s.wsService.ClientReadListen(wsClient, s.wsReceiveService.Shell)
@@ -96,8 +96,8 @@ func (s *WSController) SSH(c *gin.Context) {
outputByte := clientSession.Read()
if len(outputByte) > 0 {
outputStr := string(outputByte)
msgByte, _ := json.Marshal(result.Ok(map[string]any{
"requestId": fmt.Sprintf("ssh_%s_%d", neHost.HostID, ms.UnixMilli()),
msgByte, _ := json.Marshal(resp.Ok(map[string]any{
"requestId": fmt.Sprintf("ssh_%d_%d", neHost.ID, ms.UnixMilli()),
"data": outputStr,
}))
wsClient.MsgChan <- msgByte
@@ -111,7 +111,7 @@ func (s *WSController) SSH(c *gin.Context) {
}
case <-wsClient.StopChan: // 等待停止信号
s.wsService.ClientClose(wsClient.ID)
logger.Infof("ws Stop Client UID %s", wsClient.BindUid)
logger.Infof("ws Stop Client UID %d", wsClient.BindUid)
return
}
}

36
src/modules/ws/controller/ws_telnet.go
View File

@@ -7,9 +7,9 @@ import (
"be.ems/src/framework/i18n"
"be.ems/src/framework/logger"
"be.ems/src/framework/reqctx"
"be.ems/src/framework/resp"
"be.ems/src/framework/telnet"
"be.ems/src/framework/utils/ctx"
"be.ems/src/framework/vo/result"
neService "be.ems/src/modules/network_element/service"
"github.com/gin-gonic/gin"
@@ -19,14 +19,14 @@ import (
//
// GET /telnet?hostId=1
func (s *WSController) Telnet(c *gin.Context) {
language := ctx.AcceptLanguage(c)
language := reqctx.AcceptLanguage(c)
var query struct {
HostId string `form:"hostId" binding:"required"` // 连接主机ID
Cols int `form:"cols"` // 终端单行字符数
Rows int `form:"rows"` // 终端显示行数
HostId int64 `form:"hostId" binding:"required"` // 连接主机ID
Cols int `form:"cols"` // 终端单行字符数
Rows int `form:"rows"` // 终端显示行数
}
if err := c.ShouldBindQuery(&query); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}
if query.Cols < 120 || query.Cols > 400 {
@@ -37,16 +37,16 @@ func (s *WSController) Telnet(c *gin.Context) {
}
// 登录用户信息
loginUser, err := ctx.LoginUser(c)
loginUser, err := reqctx.LoginUser(c)
if err != nil {
c.JSON(401, result.CodeMsg(401, i18n.TKey(language, err.Error())))
c.JSON(401, resp.CodeMsg(401, i18n.TKey(language, err.Error())))
return
}
neHost := neService.NewNeHost.SelectById(query.HostId)
if neHost.HostID != query.HostId || neHost.HostType != "telnet" {
neHost := neService.NewNeHost.FindById(query.HostId)
if neHost.ID != query.HostId || neHost.HostType != "telnet" {
// 没有可访问主机信息数据！
c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.noData")))
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.noData")))
return
}
@@ -56,7 +56,7 @@ func (s *WSController) Telnet(c *gin.Context) {
client, err := connTelnet.NewClient()
if err != nil {
// 连接主机失败，请检查连接参数后重试
c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
return
}
defer client.Close()
@@ -64,7 +64,7 @@ func (s *WSController) Telnet(c *gin.Context) {
clientSession, err := client.NewClientSession(query.Cols, query.Rows)
if err != nil {
// 连接主机失败，请检查连接参数后重试
c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
return
}
defer clientSession.Close()
@@ -76,7 +76,7 @@ func (s *WSController) Telnet(c *gin.Context) {
}
defer wsConn.Close()
wsClient := s.wsService.ClientCreate(loginUser.UserID, nil, wsConn, clientSession)
wsClient := s.wsService.ClientCreate(loginUser.UserId, nil, wsConn, clientSession)
go s.wsService.ClientWriteListen(wsClient)
go s.wsService.ClientReadListen(wsClient, s.wsReceiveService.Telnet)
@@ -89,8 +89,8 @@ func (s *WSController) Telnet(c *gin.Context) {
outputByte := clientSession.Read()
if len(outputByte) > 0 {
outputStr := string(outputByte)
msgByte, _ := json.Marshal(result.Ok(map[string]any{
"requestId": fmt.Sprintf("telnet_%s_%d", neHost.HostID, ms.UnixMilli()),
msgByte, _ := json.Marshal(resp.Ok(map[string]any{
"requestId": fmt.Sprintf("telnet_%d_%d", neHost.ID, ms.UnixMilli()),
"data": outputStr,
}))
wsClient.MsgChan <- msgByte
@@ -104,7 +104,7 @@ func (s *WSController) Telnet(c *gin.Context) {
}
case <-wsClient.StopChan: // 等待停止信号
s.wsService.ClientClose(wsClient.ID)
logger.Infof("ws Stop Client UID %s", wsClient.BindUid)
logger.Infof("ws Stop Client UID %d", wsClient.BindUid)
return
}
}

26
src/modules/ws/controller/ws_view.go
View File

@@ -7,8 +7,8 @@ import (
"be.ems/src/framework/i18n"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/ctx"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/reqctx"
"be.ems/src/framework/resp"
neService "be.ems/src/modules/network_element/service"
"github.com/gin-gonic/gin"
@@ -21,17 +21,17 @@ import (
// @Tags ws
// @Accept json
// @Produce json
// @Param neType query string true "NE Type" Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC)
// @Param neType query string true "NE Type" Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
// @Param neId query string true "NE ID" default(001)
// @Param cols query number false "Terminal line characters" default(120)
// @Param rows query number false "Terminal display lines" default(40)
// @Param access_token query string true "Authorization"
// @Param access_token query string true "Authorization tokens are used when it is inconvenient to pass parameters through the header."
// @Success 200 {object} object "Response Results"
// @Summary (ws://) Terminal Interactive File Content Viewing
// @Description (ws://) Terminal Interactive File Content Viewing
// @Router /ws/view [get]
func (s *WSController) ShellView(c *gin.Context) {
language := ctx.AcceptLanguage(c)
language := reqctx.AcceptLanguage(c)
var query struct {
NeType string `form:"neType" binding:"required"` // 网元类型
NeId string `form:"neId" binding:"required"` // 网元标识id
@@ -39,7 +39,7 @@ func (s *WSController) ShellView(c *gin.Context) {
Rows int `form:"rows"` // 终端显示行数
}
if err := c.ShouldBindQuery(&query); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}
if query.Cols < 120 || query.Cols > 400 {
@@ -50,23 +50,23 @@ func (s *WSController) ShellView(c *gin.Context) {
}
// 登录用户信息
loginUser, err := ctx.LoginUser(c)
loginUser, err := reqctx.LoginUser(c)
if err != nil {
c.JSON(401, result.CodeMsg(401, i18n.TKey(language, err.Error())))
c.JSON(401, resp.CodeMsg(401, i18n.TKey(language, err.Error())))
return
}
// 网元主机的SSH客户端
sshClient, err := neService.NewNeInfo.NeRunSSHClient(query.NeType, query.NeId)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
c.JSON(200, resp.ErrMsg(err.Error()))
return
}
defer sshClient.Close()
// ssh连接会话
clientSession, err := sshClient.NewClientSession(query.Cols, query.Rows)
if err != nil {
c.JSON(200, result.ErrMsg("neinfo ssh client session new err"))
c.JSON(200, resp.ErrMsg("neinfo ssh client session new err"))
return
}
defer clientSession.Close()
@@ -78,7 +78,7 @@ func (s *WSController) ShellView(c *gin.Context) {
}
defer wsConn.Close()
wsClient := s.wsService.ClientCreate(loginUser.UserID, nil, wsConn, clientSession)
wsClient := s.wsService.ClientCreate(loginUser.UserId, nil, wsConn, clientSession)
go s.wsService.ClientWriteListen(wsClient)
go s.wsService.ClientReadListen(wsClient, s.wsReceiveService.ShellView)
@@ -95,7 +95,7 @@ func (s *WSController) ShellView(c *gin.Context) {
outputByte := clientSession.Read()
if len(outputByte) > 0 {
outputStr := string(outputByte)
msgByte, _ := json.Marshal(result.Ok(map[string]any{
msgByte, _ := json.Marshal(resp.Ok(map[string]any{
"requestId": fmt.Sprintf("view_%d", ms.UnixMilli()),
"data": outputStr,
}))
@@ -103,7 +103,7 @@ func (s *WSController) ShellView(c *gin.Context) {
}
case <-wsClient.StopChan: // 等待停止信号
s.wsService.ClientClose(wsClient.ID)
logger.Infof("ws Stop Client UID %s", wsClient.BindUid)
logger.Infof("ws Stop Client UID %d", wsClient.BindUid)
return
}
}

2
src/modules/ws/model/ws.go
View File

@@ -7,7 +7,7 @@ type WSClient struct {
ID string // 客户端连接ID-随机字符串16位
Conn *websocket.Conn // 连接实例
LastHeartbeat int64 // 最近一次心跳消息（毫秒）
BindUid string // 绑定登录用户ID
BindUid int64 // 绑定登录用户ID
SubGroup []string // 订阅组ID
MsgChan chan []byte // 消息通道
StopChan chan struct{} // 停止信号-退出协程

20
src/modules/ws/processor/cdr_connect.go
View File

@@ -5,7 +5,7 @@ import (
"fmt"
"be.ems/src/framework/logger"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/resp"
neDataModel "be.ems/src/modules/network_data/model"
neDataService "be.ems/src/modules/network_data/service"
neInfoService "be.ems/src/modules/network_element/service"
@@ -22,14 +22,14 @@ func GetCDRConnectByIMS(requestID string, data any) ([]byte, error) {
}
// 查询网元信息 rmUID
neInfo := neInfoService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID)
if neInfo.NeId != query.NeID || neInfo.IP == "" {
return nil, fmt.Errorf("query neinfo not found")
}
query.RmUID = neInfo.RmUID
rows, total := neDataService.NewCDREventIMS.SelectPage(query)
resultByte, err := json.Marshal(result.Ok(map[string]any{
rows, total := neDataService.NewCDREventIMS.FindByPage(query)
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": map[string]any{"rows": rows, "total": total},
}))
@@ -47,14 +47,14 @@ func GetCDRConnectBySMF(requestID string, data any) ([]byte, error) {
}
// 查询网元信息 rmUID
neInfo := neInfoService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID)
if neInfo.NeId != query.NeID || neInfo.IP == "" {
return nil, fmt.Errorf("query neinfo not found")
}
query.RmUID = neInfo.RmUID
rows, total := neDataService.NewCDREventSMF.SelectPage(query)
resultByte, err := json.Marshal(result.Ok(map[string]any{
rows, total := neDataService.NewCDREventSMF.FindByPage(query)
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": map[string]any{"rows": rows, "total": total},
}))
@@ -72,14 +72,14 @@ func GetCDRConnectBySMSC(requestID string, data any) ([]byte, error) {
}
// 查询网元信息 rmUID
neInfo := neInfoService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID)
if neInfo.NeId != query.NeID || neInfo.IP == "" {
return nil, fmt.Errorf("query neinfo not found")
}
query.RmUID = neInfo.RmUID
rows, total := neDataService.NewCDREventSMSC.SelectPage(query)
resultByte, err := json.Marshal(result.Ok(map[string]any{
rows, total := neDataService.NewCDREventSMSC.FindByPage(query)
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": map[string]any{"rows": rows, "total": total},
}))

8
src/modules/ws/processor/ne_state.go
View File

@@ -5,7 +5,7 @@ import (
"fmt"
"be.ems/src/framework/logger"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/resp"
neFetchlink "be.ems/src/modules/network_element/fetch_link"
neService "be.ems/src/modules/network_element/service"
)
@@ -28,7 +28,7 @@ func GetNeState(requestID string, data any) ([]byte, error) {
}
// 查询网元获取IP
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
if neInfo.NeId != querys.NeID || neInfo.IP == "" {
return nil, fmt.Errorf("no matching network element information found")
}
@@ -36,7 +36,7 @@ func GetNeState(requestID string, data any) ([]byte, error) {
// 网元直连
resData, err := neFetchlink.NeState(neInfo)
if err != nil {
resultByte, err := json.Marshal(result.Ok(map[string]any{
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": map[string]any{
"online": false,
@@ -50,7 +50,7 @@ func GetNeState(requestID string, data any) ([]byte, error) {
}
resData["online"] = true
resultByte, err := json.Marshal(result.Ok(map[string]any{
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": resData,
}))

4
src/modules/ws/processor/net_connect.go
View File

@@ -6,7 +6,7 @@ import (
"strings"
"be.ems/src/framework/logger"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/resp"
"be.ems/src/modules/ws/model"
"github.com/shirou/gopsutil/v4/net"
"github.com/shirou/gopsutil/v4/process"
@@ -56,7 +56,7 @@ func GetNetConnections(requestID string, data any) ([]byte, error) {
}
}
resultByte, err := json.Marshal(result.Ok(map[string]any{
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": dataArr,
}))

4
src/modules/ws/processor/ps_process.go
View File

@@ -8,7 +8,7 @@ import (
"sync"
"be.ems/src/framework/logger"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/resp"
"be.ems/src/modules/ws/model"
"github.com/shirou/gopsutil/v4/process"
)
@@ -120,7 +120,7 @@ func GetProcessData(requestID string, data any) ([]byte, error) {
return dataArr[i].PID < dataArr[j].PID
})
resultByte, err := json.Marshal(result.Ok(map[string]any{
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": dataArr,
}))

14
src/modules/ws/processor/ue_connect.go
View File

@@ -5,7 +5,7 @@ import (
"fmt"
"be.ems/src/framework/logger"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/resp"
neDataModel "be.ems/src/modules/network_data/model"
neDataService "be.ems/src/modules/network_data/service"
neService "be.ems/src/modules/network_element/service"
@@ -22,14 +22,14 @@ func GetUEConnectByAMF(requestID string, data any) ([]byte, error) {
}
// 查询网元获取IP
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID("AMF", query.NeID)
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID("AMF", query.NeID)
if neInfo.NeId != query.NeID || neInfo.IP == "" {
return nil, fmt.Errorf("not fount neId info")
}
query.RmUID = neInfo.RmUID
rows, total := neDataService.NewUEEventAMF.SelectPage(query)
resultByte, err := json.Marshal(result.Ok(map[string]any{
rows, total := neDataService.NewUEEventAMF.FindByPage(query)
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": map[string]any{"rows": rows, "total": total},
}))
@@ -47,14 +47,14 @@ func GetUEConnectByMME(requestID string, data any) ([]byte, error) {
}
// 查询网元获取IP
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID("MME", query.NeID)
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID("MME", query.NeID)
if neInfo.NeId != query.NeID || neInfo.IP == "" {
return nil, fmt.Errorf("not fount neId info")
}
query.RmUID = neInfo.RmUID
rows, total := neDataService.NewUEEventMME.SelectPage(query)
resultByte, err := json.Marshal(result.Ok(map[string]any{
rows, total := neDataService.NewUEEventMME.FindByPage(query)
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": map[string]any{"rows": rows, "total": total},
}))

8
src/modules/ws/processor/upf_total_flow.go
View File

@@ -5,7 +5,7 @@ import (
"fmt"
"be.ems/src/framework/logger"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/resp"
neDataService "be.ems/src/modules/network_data/service"
neService "be.ems/src/modules/network_element/service"
)
@@ -29,14 +29,14 @@ func GetUPFTotalFlow(requestID string, data any) ([]byte, error) {
}
// 查询网元获取IP
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
if neInfo.NeId != querys.NeID || neInfo.IP == "" {
return nil, fmt.Errorf("no matching network element information found")
}
dataMap := neDataService.NewPerfKPI.SelectUPFTotalFlow(neInfo.NeType, neInfo.RmUID, querys.Day)
dataMap := neDataService.NewKpiReport.FindUPFTotalFlow(neInfo.RmUID, querys.Day)
resultByte, err := json.Marshal(result.Ok(map[string]any{
resultByte, err := json.Marshal(resp.Ok(map[string]any{
"requestId": requestID,
"data": dataMap,
}))

18
src/modules/ws/service/ws.go
View File

@@ -7,8 +7,8 @@ import (
"time"
"be.ems/src/framework/logger"
"be.ems/src/framework/resp"
"be.ems/src/framework/utils/generate"
"be.ems/src/framework/vo/result"
"be.ems/src/modules/ws/model"
"github.com/gorilla/websocket"
)
@@ -53,7 +53,7 @@ func (s *WS) UpgraderWs(w http.ResponseWriter, r *http.Request) *websocket.Conn
// groupIDs 用户订阅组
// conn ws连接实例
// childConn 子连接实例
func (s *WS) ClientCreate(uid string, groupIDs []string, conn *websocket.Conn, childConn any) *model.WSClient {
func (s *WS) ClientCreate(uid int64, groupIDs []string, conn *websocket.Conn, childConn any) *model.WSClient {
// clientID也可以用其他方式生成，只要能保证在所有服务端中都能保证唯一即可
clientID := generate.Code(16)
@@ -72,7 +72,7 @@ func (s *WS) ClientCreate(uid string, groupIDs []string, conn *websocket.Conn, c
wsClients.Store(clientID, wsClient)
// 存入用户持有客户端
if uid != "" {
if uid > 0 {
if v, ok := wsUsers.Load(uid); ok {
uidClientIds := v.(*[]string)
*uidClientIds = append(*uidClientIds, clientID)
@@ -82,7 +82,7 @@ func (s *WS) ClientCreate(uid string, groupIDs []string, conn *websocket.Conn, c
}
// 存入用户订阅组
if uid != "" && len(groupIDs) > 0 {
if uid > 0 && len(groupIDs) > 0 {
for _, groupID := range groupIDs {
if v, ok := wsGroup.Load(groupID); ok {
groupClientIds := v.(*[]string)
@@ -112,7 +112,7 @@ func (s *WS) ClientClose(clientID string) {
}()
// 客户端断线时自动踢出Uid绑定列表
if client.BindUid != "" {
if client.BindUid > 0 {
if v, ok := wsUsers.Load(client.BindUid); ok {
uidClientIds := v.(*[]string)
if len(*uidClientIds) > 0 {
@@ -160,7 +160,7 @@ func (s *WS) ClientReadListen(wsClient *model.WSClient, receiveFn func(*model.WS
// 读取消息
messageType, msg, err := wsClient.Conn.ReadMessage()
if err != nil {
logger.Warnf("ws ReadMessage UID %s err: %s", wsClient.BindUid, err.Error())
logger.Warnf("ws ReadMessage UID %d err: %s", wsClient.BindUid, err.Error())
s.ClientClose(wsClient.ID)
return
}
@@ -170,7 +170,7 @@ func (s *WS) ClientReadListen(wsClient *model.WSClient, receiveFn func(*model.WS
if messageType == websocket.TextMessage {
var reqMsg model.WSRequest
if err := json.Unmarshal(msg, &reqMsg); err != nil {
msgByte, _ := json.Marshal(result.ErrMsg("message format json error"))
msgByte, _ := json.Marshal(resp.ErrMsg("message format json error"))
wsClient.MsgChan <- msgByte
continue
}
@@ -189,7 +189,7 @@ func (s *WS) ClientWriteListen(wsClient *model.WSClient) {
}
}()
// 发客户端id确认是否连接
msgByte, _ := json.Marshal(result.OkData(map[string]string{
msgByte, _ := json.Marshal(resp.OkData(map[string]string{
"clientId": wsClient.ID,
}))
wsClient.MsgChan <- msgByte
@@ -203,7 +203,7 @@ func (s *WS) ClientWriteListen(wsClient *model.WSClient) {
// 发送消息
err := wsClient.Conn.WriteMessage(websocket.TextMessage, msg)
if err != nil {
logger.Warnf("ws WriteMessage UID %s err: %s", wsClient.BindUid, err.Error())
logger.Warnf("ws WriteMessage UID %d err: %s", wsClient.BindUid, err.Error())
s.ClientClose(wsClient.ID)
return
}

50
src/modules/ws/service/ws_receive.go
View File

@@ -8,11 +8,11 @@ import (
"strings"
"time"
"be.ems/src/framework/database/redis"
"be.ems/src/framework/logger"
"be.ems/src/framework/redis"
"be.ems/src/framework/resp"
"be.ems/src/framework/ssh"
"be.ems/src/framework/telnet"
"be.ems/src/framework/utils/ssh"
"be.ems/src/framework/vo/result"
"be.ems/src/modules/ws/model"
"be.ems/src/modules/ws/processor"
)
@@ -26,7 +26,7 @@ type WSReceive struct{}
// close 关闭服务连接
func (s *WSReceive) close(client *model.WSClient) {
// 主动关闭
resultByte, _ := json.Marshal(result.OkMsg("user initiated closure"))
resultByte, _ := json.Marshal(resp.OkMsg("user initiated closure"))
client.MsgChan <- resultByte
// 等待1s后关闭连接
time.Sleep(1 * time.Second)
@@ -38,8 +38,8 @@ func (s *WSReceive) Commont(client *model.WSClient, reqMsg model.WSRequest) {
// 必传requestId确认消息
if reqMsg.RequestID == "" {
msg := "message requestId is required"
logger.Infof("ws Commont UID %s err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(result.ErrMsg(msg))
logger.Infof("ws Commont UID %d err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(resp.ErrMsg(msg))
client.MsgChan <- msgByte
return
}
@@ -74,8 +74,8 @@ func (s *WSReceive) Commont(client *model.WSClient, reqMsg model.WSRequest) {
}
if err != nil {
logger.Warnf("ws Commont UID %s err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(result.ErrMsg(err.Error()))
logger.Warnf("ws Commont UID %d err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(resp.ErrMsg(err.Error()))
client.MsgChan <- msgByte
return
}
@@ -89,8 +89,8 @@ func (s *WSReceive) Shell(client *model.WSClient, reqMsg model.WSRequest) {
// 必传requestId确认消息
if reqMsg.RequestID == "" {
msg := "message requestId is required"
logger.Infof("ws Shell UID %s err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(result.ErrMsg(msg))
logger.Infof("ws Shell UID %d err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(resp.ErrMsg(msg))
client.MsgChan <- msgByte
return
}
@@ -124,8 +124,8 @@ func (s *WSReceive) Shell(client *model.WSClient, reqMsg model.WSRequest) {
}
if err != nil {
logger.Warnf("ws Shell UID %s err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(result.ErrMsg(err.Error()))
logger.Warnf("ws Shell UID %d err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(resp.ErrMsg(err.Error()))
client.MsgChan <- msgByte
if err == io.EOF {
// 等待1s后关闭连接
@@ -144,8 +144,8 @@ func (s *WSReceive) ShellView(client *model.WSClient, reqMsg model.WSRequest) {
// 必传requestId确认消息
if reqMsg.RequestID == "" {
msg := "message requestId is required"
logger.Infof("ws ShellView UID %s err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(result.ErrMsg(msg))
logger.Infof("ws ShellView UID %d err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(resp.ErrMsg(msg))
client.MsgChan <- msgByte
return
}
@@ -190,8 +190,8 @@ func (s *WSReceive) ShellView(client *model.WSClient, reqMsg model.WSRequest) {
}
if err != nil {
logger.Warnf("ws ShellView UID %s err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(result.ErrMsg(err.Error()))
logger.Warnf("ws ShellView UID %d err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(resp.ErrMsg(err.Error()))
client.MsgChan <- msgByte
if err == io.EOF {
// 等待1s后关闭连接
@@ -210,8 +210,8 @@ func (s *WSReceive) Telnet(client *model.WSClient, reqMsg model.WSRequest) {
// 必传requestId确认消息
if reqMsg.RequestID == "" {
msg := "message requestId is required"
logger.Infof("ws Shell UID %s err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(result.ErrMsg(msg))
logger.Infof("ws Shell UID %d err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(resp.ErrMsg(msg))
client.MsgChan <- msgByte
return
}
@@ -245,8 +245,8 @@ func (s *WSReceive) Telnet(client *model.WSClient, reqMsg model.WSRequest) {
}
if err != nil {
logger.Warnf("ws Shell UID %s err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(result.ErrMsg(err.Error()))
logger.Warnf("ws Shell UID %d err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(resp.ErrMsg(err.Error()))
client.MsgChan <- msgByte
if err == io.EOF {
// 等待1s后关闭连接
@@ -265,8 +265,8 @@ func (s *WSReceive) Redis(client *model.WSClient, reqMsg model.WSRequest) {
// 必传requestId确认消息
if reqMsg.RequestID == "" {
msg := "message requestId is required"
logger.Infof("ws Shell UID %s err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(result.ErrMsg(msg))
logger.Infof("ws Shell UID %d err: %s", client.BindUid, msg)
msgByte, _ := json.Marshal(resp.ErrMsg(msg))
client.MsgChan <- msgByte
return
}
@@ -309,7 +309,7 @@ func (s *WSReceive) Redis(client *model.WSClient, reqMsg model.WSRequest) {
dataStr = fmt.Sprintf("%s \r\n", output)
}
}
resByte, _ = json.Marshal(result.Ok(map[string]any{
resByte, _ = json.Marshal(resp.Ok(map[string]any{
"requestId": reqMsg.RequestID,
"data": dataStr,
}))
@@ -318,8 +318,8 @@ func (s *WSReceive) Redis(client *model.WSClient, reqMsg model.WSRequest) {
}
if err != nil {
logger.Warnf("ws Shell UID %s err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(result.ErrMsg(err.Error()))
logger.Warnf("ws Shell UID %d err: %s", client.BindUid, err.Error())
msgByte, _ := json.Marshal(resp.ErrMsg(err.Error()))
client.MsgChan <- msgByte
if err == io.EOF {
// 等待1s后关闭连接

8
src/modules/ws/service/ws_send.go
View File

@@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"
"be.ems/src/framework/vo/result"
"be.ems/src/framework/resp"
"be.ems/src/modules/ws/model"
)
@@ -34,6 +34,10 @@ const (
GROUP_AMF_UE = "1010"
// 组号-MME_UE会话事件 1011_neId
GROUP_MME_UE = "1011"
// 组号-告警 2000_neType_neId
GROUP_ALARM = "2000"
// 组号-告警事件 2000_neType_neId
GROUP_ALARM_EVENT = "2002"
)
// 实例化服务层 WSSend 结构体
@@ -49,7 +53,7 @@ func (s *WSSend) ByClientID(clientID string, data any) error {
return fmt.Errorf("no fount client ID: %s", clientID)
}
dataByte, err := json.Marshal(result.OkData(data))
dataByte, err := json.Marshal(resp.OkData(data))
if err != nil {
return err
}