marge: 合并代码

src/modules/monitor/controller/sys_user_online.go

@@ -34,6 +34,7 @@ type SysUserOnlineController struct {
 //
 // GET /list
 func (s *SysUserOnlineController) List(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
 	ipaddr := c.Query("ipaddr")
 	userName := c.Query("userName")
 
@@ -69,6 +70,7 @@ func (s *SysUserOnlineController) List(c *gin.Context) {
 
 		onlineUser := s.sysUserOnlineService.LoginUserToUserOnline(loginUser)
 		if onlineUser.TokenID != "" {
+			onlineUser.LoginLocation = i18n.TKey(language, onlineUser.LoginLocation)
 			userOnlines = append(userOnlines, onlineUser)
 		}
 	}