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 ccd3049c..4b1d7053 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
@@ -28,7 +28,6 @@ import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.DateUtils;
-import com.jeesite.common.lang.ObjectUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.lang.TimeUtils;
 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("lastAccessTime", DateUtils.formatDateTime(session.getLastAccessTime()));
 			map.put("timeout", TimeUtils.formatDateAgo(session.getTimeout()-(currentTime-session.getLastAccessTime().getTime())));
-			Object pc = session.getAttribute(DefaultSubjectContext.PRINCIPALS_SESSION_KEY);
-			if (pc != null && pc instanceof PrincipalCollection){
-				LoginInfo loginInfo = (LoginInfo)((PrincipalCollection)pc).getPrimaryPrincipal();
-				if (loginInfo != null){
-					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("userCode", session.getAttribute("userCode"));
+			map.put("userName", session.getAttribute("userName"));
+			map.put("userType", session.getAttribute("userType"));
+			map.put("deviceType", session.getAttribute("deviceType"));
 			map.put("host", session.getHost());
 			list.add(map);
 		}
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 41c43ca6..2c95562b 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -404,6 +404,7 @@ shiro:
 session:
 
   # 全局会话超时，单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms, 12h=43200000ms, 1day=86400000ms
+  # 注意：如果超时超过30m，你还需要同步修改 j2cache.properties 文件的 caffeine.region.sessionCache 超时时间，大于这个值。
   sessionTimeout: 1800000
   
   # 手机APP设备会话超时参数设置，登录请求参数加 param_deviceType=mobileApp 时有效
diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html
index e65687c4..570cce7b 100644
--- a/modules/core/src/main/resources/views/modules/sys/onlineList.html
+++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html
@@ -38,7 +38,6 @@
 				</div>
 			</#form:form>			
 			<table id="dataGrid"></table>
-			<div id="dataGridPage"></div>
 		</div>
 	</div>
 </div>
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index cf705e6e..224dd729 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -413,6 +413,7 @@ logging:
 #session:
 #
 #  # 全局会话超时，单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms, 12h=43200000ms, 1day=86400000ms
+#  # 注意：如果超时超过30m，你还需要同步修改 j2cache.properties 文件的 caffeine.region.sessionCache 超时时间，大于这个值。
 #  sessionTimeout: 1800000
 #  
 #  # 手机APP设备会话超时参数设置，登录请求参数加 param_deviceType=mobileApp 时有效
diff --git a/web/src/main/resources/config/j2cache.properties b/web/src/main/resources/config/j2cache.properties
index 5619e40d..e0a3736b 100644
--- a/web/src/main/resources/config/j2cache.properties
+++ b/web/src/main/resources/config/j2cache.properties
@@ -72,7 +72,7 @@ j2cache.serialization = fst
 
 #caffeine.properties = /config/caffeine.properties
 caffeine.region.default = 10000, 1h
-caffeine.region.sessionCache = 100000, 30m
+caffeine.region.sessionCache = 100000, 12h
 
 #########################################
 # Redis connection configuration