diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java index 0184bb37..974ee6ca 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java @@ -29,7 +29,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * 在线用户Controller @@ -51,6 +53,7 @@ public class OnlineController extends BaseController{ * @param response * @author ThinkGem */ + @RequiresPermissions("user") @RequestMapping(value = "count") @ResponseBody public Integer count(HttpServletRequest request, HttpServletResponse response) { @@ -158,7 +161,7 @@ public class OnlineController extends BaseController{ if (pc instanceof PrincipalCollection){ Object pp = ((PrincipalCollection)pc).getPrimaryPrincipal(); if (pp instanceof LoginInfo){ - LoginInfo loginInfo = ((LoginInfo)pp); + LoginInfo loginInfo = (LoginInfo)pp; String key = loginInfo.getId()+"_"+loginInfo.getParam("deviceType", "pc"); onlineTickOutMap.put(key, StringUtils.EMPTY); } diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuMsg.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuMsg.html index 1d7a2580..a899099f 100644 --- a/modules/core/src/main/resources/views/include/sysIndex/topMenuMsg.html +++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuMsg.html @@ -11,7 +11,6 @@ data-mergeMsgLimit="${@Global.getConfig('sys.msg.mergeMsgLimit', '5')}" data-mergeMsgTitle="${text('系统消息')}" data-mergeMsgContent="${text('您有 {0\} 条新消息,由于消息太多,这里为您合并,请点击查看按钮看详情。')}" - data-loginTimeout="${text('您当前的会话已超时,请重新登录。')}" data-pullMsgPollingInterval="1000*60" data-showMsgCloseTimeout="1000*60"> diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuOnline.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuOnline.html index a10b178f..f9c55862 100644 --- a/modules/core/src/main/resources/views/include/sysIndex/topMenuOnline.html +++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuOnline.html @@ -5,15 +5,32 @@