diff --git a/modules/app/src/main/resources/db/upgrade/app/versions b/modules/app/src/main/resources/db/upgrade/app/versions index 5ede06dd..03a9f4eb 100644 --- a/modules/app/src/main/resources/db/upgrade/app/versions +++ b/modules/app/src/main/resources/db/upgrade/app/versions @@ -29,4 +29,5 @@ 5.11.1 5.12.0 5.12.1 -5.13.0 \ No newline at end of file +5.13.0 +5.13.1 \ No newline at end of file diff --git a/modules/cms/src/main/resources/db/upgrade/cms/versions b/modules/cms/src/main/resources/db/upgrade/cms/versions index 18987ef8..0b7fa6ed 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/versions +++ b/modules/cms/src/main/resources/db/upgrade/cms/versions @@ -37,4 +37,5 @@ 5.11.1 5.12.0 5.12.1 -5.13.0 \ No newline at end of file +5.13.0 +5.13.1 \ No newline at end of file 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 88debff4..0184bb37 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 @@ -67,7 +67,7 @@ public class OnlineController extends BaseController{ public String list(Model model) { return "modules/sys/onlineList"; } - + /** * 在线用户列表数据 * @author ThinkGem @@ -75,12 +75,12 @@ public class OnlineController extends BaseController{ @RequiresPermissions("sys:online:view") @RequestMapping(value = "listData") @ResponseBody - public List> listData(String isAllOnline, String isVisitor, String sessionId, + public List> listData(String isAllOnline, String isVisitor, String sessionId, String userCode, String userName, String userType, String orderBy) { List> list = ListUtils.newArrayList(); boolean excludeLeave = !Global.YES.equals(isAllOnline); boolean excludeVisitor = !Global.YES.equals(isVisitor); - Collection sessions = sessionDAO.getActiveSessions(excludeLeave, + Collection sessions = sessionDAO.getActiveSessions(excludeLeave, excludeVisitor, null, sessionId, userCode); long currentTime = System.currentTimeMillis(); for (Session session : sessions){ @@ -93,7 +93,7 @@ public class OnlineController extends BaseController{ Map map = MapUtils.newLinkedHashMap(); // 为了安全性,需要有权限的人才能看 if (UserUtils.getSubject().isPermitted("sys:online:edit")){ - map.put("id", session.getId().toString()); + map.put("id", session.getId().toString()); } map.put("startTimestamp", DateUtils.formatDateTime(session.getStartTimestamp())); map.put("lastAccessTime", DateUtils.formatDateTime(session.getLastAccessTime())); @@ -155,14 +155,12 @@ public class OnlineController extends BaseController{ onlineTickOutMap = MapUtils.newConcurrentMap(); } Object pc = session.getAttribute(DefaultSubjectContext.PRINCIPALS_SESSION_KEY); - if (pc != null && pc instanceof PrincipalCollection){ + if (pc instanceof PrincipalCollection){ Object pp = ((PrincipalCollection)pc).getPrimaryPrincipal(); - if (pp != null) { - if (pp instanceof LoginInfo){ - LoginInfo loginInfo = ((LoginInfo)pp); - String key = loginInfo.getId()+"_"+loginInfo.getParam("deviceType", "pc"); - onlineTickOutMap.put(key, StringUtils.EMPTY); - } + if (pp instanceof LoginInfo){ + LoginInfo loginInfo = ((LoginInfo)pp); + String key = loginInfo.getId()+"_"+loginInfo.getParam("deviceType", "pc"); + onlineTickOutMap.put(key, StringUtils.EMPTY); } } SysCacheUtils.put("onlineTickOutMap", onlineTickOutMap);