From c569b8d55b5bcb10c8c25b509dd072ba6e04aedd Mon Sep 17 00:00:00 2001
From: "jian.wang" <824612544@qq.com>
Date: Mon, 29 Jul 2024 15:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96token=E9=A2=91=E7=B9=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E5=92=8C?=
 =?UTF-8?q?jsp=E8=87=AA=E5=8A=A8=E6=B8=85=E7=90=86=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jspf/webSocket.jspf | 21 +++++++++++++--------
 src/main/webapp/WEB-INF/web.xml             | 11 +++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jspf/webSocket.jspf b/src/main/webapp/WEB-INF/jspf/webSocket.jspf
index 01ed4c5..a07c68c 100644
--- a/src/main/webapp/WEB-INF/jspf/webSocket.jspf
+++ b/src/main/webapp/WEB-INF/jspf/webSocket.jspf
@@ -44,22 +44,27 @@
     //每隔1分钟轮询一次未通知数量
     setInterval(function () {
         getNoticeCount();
-    }, 60*1000);
+    }, 30*60*1000);
     //每隔1秒钟轮询一次session所剩时间
+    let countdown = 10; // 设置倒计时为10秒
     var  r = setInterval(function () {
         $.get(path+'/getSessionRemainingTime',function(data){
             if(data != null){
                 data /= 1000
-                if(data < 11 && data > 10){
-                    toastr.warning("还有10秒将登录超时,将退出登录!")
-                }else if(data < 6 && data > 5){
-                    toastr.warning("还有5秒将登录超时,将退出登录!")
-                }else if(data < 0){
-                    window.location.href = powerUrlHead + '/login'
+                if(data < 0){
+                    const intervalId = setInterval(() => {
+                        if (countdown > 0) {
+                            toastr.warning('即将登录超时,'+ countdown + '秒后将退出登录！');
+                            countdown--;
+                        } else {
+                            clearInterval(intervalId); // 倒计时结束，清除定时器
+                            window.location.href = powerUrlHead + '/login'; // 跳转到登录页面
+                        }
+                    }, 1000);
                 }
             }
         },'json');
-    }, 1000);
+    }, 30*60*1000);
     //跳转到通知
     function noticeManage1(noticeId){
         //noticeId = 'emr_record'为跳转病案管理系统的病案未审批页面
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 034e594..00e2609 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -76,4 +76,15 @@
     <filter-name>urlFilter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
+
+  <filter>
+    <filter-name>NoCacheFilter</filter-name>
+    <filter-class>com.emr.controller.NoCacheFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>NoCacheFilter</filter-name>
+    <url-pattern>*.css</url-pattern>
+    <url-pattern>*.jsp</url-pattern>
+    <url-pattern>*.js</url-pattern>
+  </filter-mapping>
 </web-app>
\ No newline at end of file