manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化，会话缓存超时时间，添加注释提示语

Browse Source
This commit is contained in:
thinkgem
2019-07-10 16:13:17 +08:00
parent 6299976368
commit 81d112645e
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@ import com.jeesite.common.collect.ListUtils;
import com.jeesite.common.collect.MapUtils; import com.jeesite.common.collect.MapUtils;
import com.jeesite.common.config.Global; import com.jeesite.common.config.Global;
import com.jeesite.common.lang.DateUtils; import com.jeesite.common.lang.DateUtils;
import com.jeesite.common.lang.ObjectUtils;
import com.jeesite.common.lang.StringUtils; import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.lang.TimeUtils; import com.jeesite.common.lang.TimeUtils;
import com.jeesite.common.shiro.realm.LoginInfo; import com.jeesite.common.shiro.realm.LoginInfo;
@@ -105,16 +104,10 @@ public class OnlineController extends BaseController{
map.put("startTimestamp", DateUtils.formatDateTime(session.getStartTimestamp())); map.put("startTimestamp", DateUtils.formatDateTime(session.getStartTimestamp()));
map.put("lastAccessTime", DateUtils.formatDateTime(session.getLastAccessTime())); map.put("lastAccessTime", DateUtils.formatDateTime(session.getLastAccessTime()));
map.put("timeout", TimeUtils.formatDateAgo(session.getTimeout()-(currentTime-session.getLastAccessTime().getTime()))); map.put("timeout", TimeUtils.formatDateAgo(session.getTimeout()-(currentTime-session.getLastAccessTime().getTime())));
Object pc = session.getAttribute(DefaultSubjectContext.PRINCIPALS_SESSION_KEY); map.put("userCode", session.getAttribute("userCode"));
if (pc != null && pc instanceof PrincipalCollection){ map.put("userName", session.getAttribute("userName"));
LoginInfo loginInfo = (LoginInfo)((PrincipalCollection)pc).getPrimaryPrincipal(); map.put("userType", session.getAttribute("userType"));
if (loginInfo != null){ map.put("deviceType", session.getAttribute("deviceType"));
map.put("userCode", session.getAttribute("userCode"));// principal.getId());
map.put("userName", session.getAttribute("userName"));// principal.getName());
map.put("userType", session.getAttribute("userType"));// ObjectUtils.toString(principal.getParam("userType")));
map.put("deviceType", ObjectUtils.toString(loginInfo.getParam("deviceType")));
}
}
map.put("host", session.getHost()); map.put("host", session.getHost());
list.add(map); list.add(map);
} }

1
modules/core/src/main/resources/config/jeesite-core.yml
View File

@@ -404,6 +404,7 @@ shiro:
session: session:
# 全局会话超时，单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms, 12h=43200000ms, 1day=86400000ms # 全局会话超时，单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms, 12h=43200000ms, 1day=86400000ms
# 注意：如果超时超过30m，你还需要同步修改 j2cache.properties 文件的 caffeine.region.sessionCache 超时时间，大于这个值。
sessionTimeout: 1800000 sessionTimeout: 1800000
# 手机APP设备会话超时参数设置，登录请求参数加 param_deviceType=mobileApp 时有效 # 手机APP设备会话超时参数设置，登录请求参数加 param_deviceType=mobileApp 时有效

1
modules/core/src/main/resources/views/modules/sys/onlineList.html
View File

@@ -38,7 +38,6 @@
</div> </div>
</#form:form> </#form:form>
<table id="dataGrid"></table> <table id="dataGrid"></table>
<div id="dataGridPage"></div>
</div> </div>
</div> </div>
</div> </div>

1
web/src/main/resources/config/application.yml
View File

@@ -413,6 +413,7 @@ logging:
#session: #session:
# #
# # 全局会话超时，单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms, 12h=43200000ms, 1day=86400000ms # # 全局会话超时，单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms, 12h=43200000ms, 1day=86400000ms
# # 注意：如果超时超过30m，你还需要同步修改 j2cache.properties 文件的 caffeine.region.sessionCache 超时时间，大于这个值。
# sessionTimeout: 1800000 # sessionTimeout: 1800000
# #
# # 手机APP设备会话超时参数设置，登录请求参数加 param_deviceType=mobileApp 时有效 # # 手机APP设备会话超时参数设置，登录请求参数加 param_deviceType=mobileApp 时有效

2
web/src/main/resources/config/j2cache.properties
View File

@@ -72,7 +72,7 @@ j2cache.serialization = fst
#caffeine.properties = /config/caffeine.properties #caffeine.properties = /config/caffeine.properties
caffeine.region.default = 10000, 1h caffeine.region.default = 10000, 1h
caffeine.region.sessionCache = 100000, 30m caffeine.region.sessionCache = 100000, 12h
######################################### #########################################
# Redis connection configuration # Redis connection configuration