From d52945c946d606c4ee22d9a402ba6ea1fd02717b Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 20 Nov 2023 18:54:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=9B=91=E6=8E=A7=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/monitor/controller/monitor.go | 5 ++++- src/modules/monitor/controller/sys_cache.go | 14 +++++++++---- .../monitor/controller/sys_user_online.go | 5 ++++- src/modules/monitor/monitor.go | 20 +++++++++---------- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/modules/monitor/controller/monitor.go b/src/modules/monitor/controller/monitor.go index 2c2d2e27..6f714b0f 100644 --- a/src/modules/monitor/controller/monitor.go +++ b/src/modules/monitor/controller/monitor.go @@ -1,6 +1,8 @@ package controller import ( + "ems.agt/src/framework/i18n" + "ems.agt/src/framework/utils/ctx" "ems.agt/src/framework/vo/result" "ems.agt/src/modules/monitor/service" @@ -24,6 +26,7 @@ type MonitorController struct { // // GET /load func (s *MonitorController) Load(c *gin.Context) { + language := ctx.AcceptLanguage(c) var querys struct { // 数据类型all/load/cpu/memory/io/network Type string `form:"type" binding:"required,oneof=all load cpu memory io network"` @@ -40,7 +43,7 @@ func (s *MonitorController) Load(c *gin.Context) { } err := c.ShouldBindQuery(&querys) if err != nil { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } diff --git a/src/modules/monitor/controller/sys_cache.go b/src/modules/monitor/controller/sys_cache.go index b4815b49..9d4395d0 100644 --- a/src/modules/monitor/controller/sys_cache.go +++ b/src/modules/monitor/controller/sys_cache.go @@ -2,7 +2,9 @@ package controller import ( "ems.agt/src/framework/constants/cachekey" + "ems.agt/src/framework/i18n" "ems.agt/src/framework/redis" + "ems.agt/src/framework/utils/ctx" "ems.agt/src/framework/vo/result" "ems.agt/src/modules/monitor/model" @@ -48,9 +50,10 @@ func (s *SysCacheController) Names(c *gin.Context) { // // GET /getKeys/:cacheName func (s *SysCacheController) Keys(c *gin.Context) { + language := ctx.AcceptLanguage(c) cacheName := c.Param("cacheName") if cacheName == "" { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } caches := []model.SysCache{} @@ -68,10 +71,11 @@ func (s *SysCacheController) Keys(c *gin.Context) { // // GET /getValue/:cacheName/:cacheKey func (s *SysCacheController) Value(c *gin.Context) { + language := ctx.AcceptLanguage(c) cacheName := c.Param("cacheName") cacheKey := c.Param("cacheKey") if cacheName == "" || cacheKey == "" { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } @@ -88,9 +92,10 @@ func (s *SysCacheController) Value(c *gin.Context) { // // DELETE /clearCacheName/:cacheName func (s *SysCacheController) ClearCacheName(c *gin.Context) { + language := ctx.AcceptLanguage(c) cacheName := c.Param("cacheName") if cacheName == "" { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } @@ -111,10 +116,11 @@ func (s *SysCacheController) ClearCacheName(c *gin.Context) { // // DELETE /clearCacheKey/:cacheName/:cacheKey func (s *SysCacheController) ClearCacheKey(c *gin.Context) { + language := ctx.AcceptLanguage(c) cacheName := c.Param("cacheName") cacheKey := c.Param("cacheKey") if cacheName == "" || cacheKey == "" { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } diff --git a/src/modules/monitor/controller/sys_user_online.go b/src/modules/monitor/controller/sys_user_online.go index dcd0107f..1c9232c2 100644 --- a/src/modules/monitor/controller/sys_user_online.go +++ b/src/modules/monitor/controller/sys_user_online.go @@ -6,7 +6,9 @@ import ( "strings" "ems.agt/src/framework/constants/cachekey" + "ems.agt/src/framework/i18n" "ems.agt/src/framework/redis" + "ems.agt/src/framework/utils/ctx" "ems.agt/src/framework/vo" "ems.agt/src/framework/vo/result" "ems.agt/src/modules/monitor/model" @@ -110,9 +112,10 @@ func (s *SysUserOnlineController) List(c *gin.Context) { // // DELETE /:tokenId func (s *SysUserOnlineController) ForceLogout(c *gin.Context) { + language := ctx.AcceptLanguage(c) tokenId := c.Param("tokenId") if tokenId == "" || tokenId == "*" { - c.JSON(400, result.CodeMsg(400, "parameter error")) + c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } diff --git a/src/modules/monitor/monitor.go b/src/modules/monitor/monitor.go index 80a3663a..737809da 100644 --- a/src/modules/monitor/monitor.go +++ b/src/modules/monitor/monitor.go @@ -80,18 +80,18 @@ func Setup(router *gin.Engine) { ) sysJobLogGroup.DELETE("/:jobLogIds", middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:remove"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task Log", collectlogs.BUSINESS_TYPE_DELETE)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJobLog", collectlogs.BUSINESS_TYPE_DELETE)), controller.NewSysJobLog.Remove, ) sysJobLogGroup.DELETE("/clean", repeat.RepeatSubmit(5), middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:remove"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task Log", collectlogs.BUSINESS_TYPE_CLEAN)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJobLog", collectlogs.BUSINESS_TYPE_CLEAN)), controller.NewSysJobLog.Clean, ) sysJobLogGroup.POST("/export", middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:export"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task Log", collectlogs.BUSINESS_TYPE_EXPORT)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJobLog", collectlogs.BUSINESS_TYPE_EXPORT)), controller.NewSysJobLog.Export, ) } @@ -109,39 +109,39 @@ func Setup(router *gin.Engine) { ) sysJobGroup.POST("", middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:add"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task", collectlogs.BUSINESS_TYPE_INSERT)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJob", collectlogs.BUSINESS_TYPE_INSERT)), controller.NewSysJob.Add, ) sysJobGroup.PUT("", middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:edit"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task", collectlogs.BUSINESS_TYPE_UPDATE)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJob", collectlogs.BUSINESS_TYPE_UPDATE)), controller.NewSysJob.Edit, ) sysJobGroup.DELETE("/:jobIds", middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:remove"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task", collectlogs.BUSINESS_TYPE_DELETE)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJob", collectlogs.BUSINESS_TYPE_DELETE)), controller.NewSysJob.Remove, ) sysJobGroup.PUT("/changeStatus", repeat.RepeatSubmit(5), middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:changeStatus"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task", collectlogs.BUSINESS_TYPE_UPDATE)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJob", collectlogs.BUSINESS_TYPE_UPDATE)), controller.NewSysJob.Status, ) sysJobGroup.PUT("/run/:jobId", repeat.RepeatSubmit(10), middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:changeStatus"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task", collectlogs.BUSINESS_TYPE_UPDATE)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJob", collectlogs.BUSINESS_TYPE_UPDATE)), controller.NewSysJob.Run, ) sysJobGroup.PUT("/resetQueueJob", middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:changeStatus"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task", collectlogs.BUSINESS_TYPE_CLEAN)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJob", collectlogs.BUSINESS_TYPE_CLEAN)), controller.NewSysJob.ResetQueueJob, ) sysJobGroup.POST("/export", middleware.PreAuthorize(map[string][]string{"hasPerms": {"monitor:job:export"}}), - collectlogs.OperateLog(collectlogs.OptionNew("Scheduling Task", collectlogs.BUSINESS_TYPE_EXPORT)), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sysJob", collectlogs.BUSINESS_TYPE_EXPORT)), controller.NewSysJob.Export, ) }