Skip to content

Commit 3d04551

Browse files
committed
5.13.1
1 parent 1c51398 commit 3d04551

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

modules/app/src/main/resources/db/upgrade/app/versions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@
2929
5.11.1
3030
5.12.0
3131
5.12.1
32-
5.13.0
32+
5.13.0
33+
5.13.1

modules/cms/src/main/resources/db/upgrade/cms/versions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@
3737
5.11.1
3838
5.12.0
3939
5.12.1
40-
5.13.0
40+
5.13.0
41+
5.13.1

modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,12 @@ public String kickOut(String sessionId) {
157157
onlineTickOutMap = MapUtils.newConcurrentMap();
158158
}
159159
Object pc = session.getAttribute(DefaultSubjectContext.PRINCIPALS_SESSION_KEY);
160-
if (pc != null && pc instanceof PrincipalCollection){
160+
if (pc instanceof PrincipalCollection){
161161
Object pp = ((PrincipalCollection)pc).getPrimaryPrincipal();
162-
if (pp != null) {
163-
if (pp instanceof LoginInfo){
164-
LoginInfo loginInfo = ((LoginInfo)pp);
165-
String key = loginInfo.getId()+"_"+loginInfo.getParam("deviceType", "pc");
166-
onlineTickOutMap.put(key, StringUtils.EMPTY);
167-
}
162+
if (pp instanceof LoginInfo){
163+
LoginInfo loginInfo = ((LoginInfo)pp);
164+
String key = loginInfo.getId()+"_"+loginInfo.getParam("deviceType", "pc");
165+
onlineTickOutMap.put(key, StringUtils.EMPTY);
168166
}
169167
}
170168
SysCacheUtils.put("onlineTickOutMap", onlineTickOutMap);

0 commit comments

Comments
 (0)