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

Merge branch 'main' of http://192.168.2.166:3180/OMC/ems_backend

Browse Source
This commit is contained in:
simonzhangsz
2023-10-31 18:41:49 +08:00
parent f093283649 4e55820bc8
commit f5bcaa1bf9
3 changed files with 32 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/modules/common/common.go
View File

@@ -15,11 +15,11 @@ func Setup(router *gin.Engine) {
// 路由主页
indexGroup := router.Group("/")
indexGroup.GET("",
middleware.RateLimit(middleware.LimitOption{
Time: 300,
Count: 10,
Type: middleware.LIMIT_IP,
}),
// middleware.RateLimit(middleware.LimitOption{
// Time: 300,
// Count: 10,
// Type: middleware.LIMIT_IP,
// }),
controller.NewIndex.Handler,
)
@@ -28,32 +28,32 @@ func Setup(router *gin.Engine) {
// 验证码操作处理
indexGroup.GET("/captchaImage",
middleware.RateLimit(middleware.LimitOption{
Time: 300,
Count: 60,
Type: middleware.LIMIT_IP,
}),
// middleware.RateLimit(middleware.LimitOption{
// Time: 300,
// Count: 60,
// Type: middleware.LIMIT_IP,
// }),
controller.NewCaptcha.Image,
)
// 账号身份操作处理
{
indexGroup.POST("/login",
middleware.RateLimit(middleware.LimitOption{
Time: 300,
Count: 10,
Type: middleware.LIMIT_IP,
}),
// middleware.RateLimit(middleware.LimitOption{
// Time: 300,
// Count: 10,
// Type: middleware.LIMIT_IP,
// }),
controller.NewAccount.Login,
)
indexGroup.GET("/getInfo", middleware.PreAuthorize(nil), controller.NewAccount.Info)
indexGroup.GET("/getRouters", middleware.PreAuthorize(nil), controller.NewAccount.Router)
indexGroup.POST("/logout",
middleware.RateLimit(middleware.LimitOption{
Time: 300,
Count: 5,
Type: middleware.LIMIT_IP,
}),
// middleware.RateLimit(middleware.LimitOption{
// Time: 300,
// Count: 5,
// Type: middleware.LIMIT_IP,
// }),
controller.NewAccount.Logout,
)
}
@@ -61,11 +61,11 @@ func Setup(router *gin.Engine) {
// 账号注册操作处理
{
indexGroup.POST("/register",
middleware.RateLimit(middleware.LimitOption{
Time: 300,
Count: 10,
Type: middleware.LIMIT_IP,
}),
// middleware.RateLimit(middleware.LimitOption{
// Time: 300,
// Count: 10,
// Type: middleware.LIMIT_IP,
// }),
controller.NewRegister.Register,
)
}

2
src/modules/monitor/service/monitor.go
View File

@@ -10,5 +10,5 @@ type IMonitor interface {
RunMonitorDataCancel(removeBefore bool, interval float64)
// SelectMonitorInfo 查询监控资源信息
SelectMonitorInfo(query map[string]any) map[string]MonitorData
SelectMonitorInfo(query map[string]any) map[string]any
}

36
src/modules/monitor/service/monitor.impl.go
View File

@@ -212,14 +212,8 @@ func (s *MonitorImpl) saveNetDataToDB(ctx context.Context, interval float64) {
}
}
// MonitorData 监控资源信息
type MonitorData struct {
Date []int64 `json:"date"`
Value []any `json:"value"`
}
// SelectMonitorInfo 查询监控资源信息
func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]MonitorData {
func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]any {
infoType := query["type"]
startTimeMilli := query["startTime"]
endTimeMilli := query["endTime"]
@@ -228,7 +222,7 @@ func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]Monitor
name := query["name"]
// 返回数据
backdatas := map[string]MonitorData{}
backDatas := map[string]any{}
// 基本信息
if infoType == "all" || infoType == "cpu" || infoType == "memory" {
@@ -238,13 +232,7 @@ func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]Monitor
"neType": neType,
"neId": neId,
})
// 组装数据
var itemData MonitorData
for _, base := range rows {
itemData.Date = append(itemData.Date, base.CreateTime)
itemData.Value = append(itemData.Value, base)
}
backdatas["base"] = itemData
backDatas["base"] = rows
}
// 磁盘IO
@@ -256,13 +244,7 @@ func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]Monitor
"neId": neId,
"name": name,
})
// 组装数据
var itemData MonitorData
for _, base := range rows {
itemData.Date = append(itemData.Date, base.CreateTime)
itemData.Value = append(itemData.Value, base)
}
backdatas["io"] = itemData
backDatas["io"] = rows
}
// 网络
@@ -274,14 +256,8 @@ func (s *MonitorImpl) SelectMonitorInfo(query map[string]any) map[string]Monitor
"neId": neId,
"name": name,
})
// 组装数据
var itemData MonitorData
for _, base := range rows {
itemData.Date = append(itemData.Date, base.CreateTime)
itemData.Value = append(itemData.Value, base)
}
backdatas["network"] = itemData
backDatas["network"] = rows
}
return backdatas
return backDatas
}