From 9cf813dcd6fc7297d5210d778ffbb41c51ef2089 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 18 Jan 2021 00:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=BC=9A=E8=AF=9D=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=99=E6=8F=90=E9=86=92=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E8=B6=85=E6=97=B6=EF=BC=8C=E8=AF=B7=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E7=99=BB=E5=BD=95=E7=9A=84=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/views/include/sysIndex/topMenuMsg.html    | 5 ++++-
 .../src/main/resources/views/modules/sys/switchSkin.html     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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 56a6a132..1d7a2580 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/topMenuMsg.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuMsg.html
@@ -10,7 +10,10 @@
 			<ul class="menu" id="msgList"
 				data-mergeMsgLimit="${@Global.getConfig('sys.msg.mergeMsgLimit', '5')}"
 				data-mergeMsgTitle="${text('系统消息')}"
-				data-mergeMsgContent="${text('您有 {0\} 条新消息，由于消息太多，这里为您合并，请点击查看按钮看详情。')}"></ul>
+				data-mergeMsgContent="${text('您有 {0\} 条新消息，由于消息太多，这里为您合并，请点击查看按钮看详情。')}"
+				data-loginTimeout="${text('您当前的会话已超时，请重新登录。')}"
+				data-pullMsgPollingInterval="1000*60"
+				data-showMsgCloseTimeout="1000*60"></ul>
 		</li>
 		<li class="footer"><a href="javascript:" data-href="${ctx}/msg/list"
 			data-title="${text('查看全部消息')}" class="addTabPage">${text('查看全部消息')}</a></li>
diff --git a/modules/core/src/main/resources/views/modules/sys/switchSkin.html b/modules/core/src/main/resources/views/modules/sys/switchSkin.html
index 9a30dc0e..87005b5d 100644
--- a/modules/core/src/main/resources/views/modules/sys/switchSkin.html
+++ b/modules/core/src/main/resources/views/modules/sys/switchSkin.html
@@ -170,7 +170,7 @@ $('#formLayerModel')
 	$('#tabPageModel').iCheck('uncheck');
 }).on('ifClicked', function(){
 	setTimeout(function(){
-		top.location.reload();
+		top.location.reload(true);
 	},500);
 });
 
@@ -183,7 +183,7 @@ $('#tabPageModel')
 	js.cookie('tabPageModel', 'false');
 }).on('ifClicked', function(){
 	setTimeout(function(){
-		top.location.reload();
+		top.location.reload(true);
 	},500);
 });
 </script>
\ No newline at end of file