marge: 合并代码

src/modules/common/common.go

@@ -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,
 		)
 	}

src/modules/monitor/service/monitor.go

@@ -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
 }

src/modules/monitor/service/monitor.impl.go

@@ -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
 }

src/modules/system/controller/sys_profile.go

@@ -120,8 +120,6 @@ func (s *SysProfileController) UpdateProfile(c *gin.Context) {
 			c.JSON(200, result.ErrMsg(msg))
 			return
 		}
-	} else {
-		body.PhoneNumber = "nil"
 	}
 
 	// 检查邮箱格式并判断是否唯一
@@ -138,8 +136,6 @@ func (s *SysProfileController) UpdateProfile(c *gin.Context) {
 			c.JSON(200, result.ErrMsg(msg))
 			return
 		}
-	} else {
-		body.Email = "nil"
 	}
 
 	// 用户基本资料

src/modules/system/repository/sys_menu.impl.go

@@ -387,9 +387,7 @@ func (r *SysMenuImpl) UpdateMenu(sysMenu model.SysMenu) int64 {
 	} else {
 		params["icon"] = "#"
 	}
-	if sysMenu.Remark != "" {
-		params["remark"] = sysMenu.Remark
-	}
+	params["remark"] = sysMenu.Remark
 	if sysMenu.UpdateBy != "" {
 		params["update_by"] = sysMenu.UpdateBy
 		params["update_time"] = time.Now().UnixMilli()

src/modules/system/repository/sys_role.impl.go

@@ -248,9 +248,7 @@ func (r *SysRoleImpl) UpdateRole(sysRole model.SysRole) int64 {
 	if sysRole.Status != "" {
 		params["status"] = sysRole.Status
 	}
-	if sysRole.Remark != "" {
-		params["remark"] = sysRole.Remark
-	}
+	params["remark"] = sysRole.Remark
 	if sysRole.UpdateBy != "" {
 		params["update_by"] = sysRole.UpdateBy
 		params["update_time"] = time.Now().UnixMilli()

src/modules/system/repository/sys_user.impl.go

@@ -476,23 +476,10 @@ func (r *SysUserImpl) UpdateUser(sysUser model.SysUser) int64 {
 	if sysUser.Avatar != "" {
 		params["avatar"] = sysUser.Avatar
 	}
-	if sysUser.Email != "" {
-		if sysUser.Email == "nil" {
-			params["email"] = ""
-		} else {
-			params["email"] = sysUser.Email
-		}
-	}
-	if sysUser.PhoneNumber != "" {
-		if sysUser.PhoneNumber == "nil" {
-			params["phonenumber"] = ""
-		} else {
-			params["phonenumber"] = sysUser.PhoneNumber
-		}
-	}
-	if sysUser.Sex != "" {
-		params["sex"] = sysUser.Sex
-	}
+
+	params["email"] = sysUser.Email
+	params["phonenumber"] = sysUser.PhoneNumber
+	params["sex"] = sysUser.Sex
 	if sysUser.Password != "" {
 		password := crypto.BcryptHash(sysUser.Password)
 		params["password"] = password
@@ -500,9 +487,7 @@ func (r *SysUserImpl) UpdateUser(sysUser model.SysUser) int64 {
 	if sysUser.Status != "" {
 		params["status"] = sysUser.Status
 	}
-	if sysUser.Remark != "" {
-		params["remark"] = sysUser.Remark
-	}
+	params["remark"] = sysUser.Remark
 	if sysUser.UpdateBy != "" {
 		params["update_by"] = sysUser.UpdateBy
 		params["update_time"] = time.Now().UnixMilli()