From ca8b10bc131657d221c2a58cedd1e7a46c14422d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 3 Jun 2021 13:07:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=94=B1=E4=BA=8E?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=BF=87=E6=9C=9F=E5=AF=BC=E8=87=B4=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=B6=85=E6=97=B6=E5=A4=B1=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/filter/JWTFilter.java    |  1 -
 .../java/io/dataease/auth/util/JWTUtils.java  | 13 ++----
 .../src/main/resources/ehcache/ehcache.xml    | 42 +++++++++----------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index 4729dcb089..768acc42dd 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -6,7 +6,6 @@ import io.dataease.auth.entity.TokenInfo;
 import io.dataease.auth.service.AuthUserService;
 import io.dataease.auth.util.JWTUtils;
 import io.dataease.commons.utils.CommonBeanFactory;
-import io.dataease.commons.utils.ServletUtils;
 import io.dataease.i18n.Translator;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.AuthenticationException;
diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
index f751689c6e..e71b2ab696 100644
--- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
@@ -84,24 +84,17 @@ public class JWTUtils {
      */
     public static boolean loginExpire(String token){
         if (Login_Interval==0) {
-            String property = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout");
-            // 默认超时时间是8h
-            int minute = StringUtils.isNotEmpty(property) ? Integer.parseInt(property): (8*60);
+            int minute = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout", Integer.class, 8*60);
             // 分钟换算成毫秒
             Login_Interval = minute * 1000 * 60;
         }
         Long now = System.currentTimeMillis();
         Long lastOperateTime = tokenLastOperateTime(token);
+        if (ObjectUtils.isEmpty(lastOperateTime)) return true;
         boolean isExpire = false;
         if (lastOperateTime != null) {
             isExpire = now - lastOperateTime > Login_Interval;
         }
-        if (isExpire) {
-//            System.out.println("-----------------------");
-//            System.out.println("-----上次操作时间是["+lastOperateTime+"]-----");
-//            System.out.println("-----当前操作时间是["+now+"]-----");
-//            System.out.println("-----------------------");
-        }
         return isExpire;
     }
 
@@ -116,7 +109,7 @@ public class JWTUtils {
     }
 
     /**
-     * 生成签名,5min后过期
+     * 生成签名,1min后过期
      * @param tokenInfo 用户信息
      * @param secret 用户的密码
      * @return 加密的token
diff --git a/backend/src/main/resources/ehcache/ehcache.xml b/backend/src/main/resources/ehcache/ehcache.xml
index ff551ec033..82848300e9 100644
--- a/backend/src/main/resources/ehcache/ehcache.xml
+++ b/backend/src/main/resources/ehcache/ehcache.xml
@@ -29,7 +29,7 @@
     <defaultCache
             eternal="false"
             maxElementsInMemory="1000"
-            overflowToDisk="false"
+            overflowToDisk="true"
             diskPersistent="false"
             timeToIdleSeconds="0"
             timeToLiveSeconds="600"
@@ -38,46 +38,46 @@
     <cache
             name="users_info"
             eternal="false"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="1000"
+            maxElementsInMemory="1000"
+            maxElementsOnDisk="0"
             overflowToDisk="true"
-            diskPersistent="true"
-            timeToIdleSeconds="1800"
-            timeToLiveSeconds="3600"
+            diskPersistent="false"
+            timeToIdleSeconds="28800"
+            timeToLiveSeconds="36000"
             memoryStoreEvictionPolicy="LRU"
     />
     <cache
             name="users_roles_info"
             eternal="false"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="1000"
+            maxElementsInMemory="1000"
+            maxElementsOnDisk="0"
             overflowToDisk="true"
-            diskPersistent="true"
-            timeToIdleSeconds="1800"
-            timeToLiveSeconds="3600"
+            diskPersistent="false"
+            timeToIdleSeconds="28800"
+            timeToLiveSeconds="36000"
             memoryStoreEvictionPolicy="LRU"
     />
     <cache
             name="users_permissions_info"
             eternal="false"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="1000"
+            maxElementsInMemory="1000"
+            maxElementsOnDisk="0"
             overflowToDisk="true"
-            diskPersistent="true"
-            timeToIdleSeconds="1800"
-            timeToLiveSeconds="3600"
+            diskPersistent="false"
+            timeToIdleSeconds="28800"
+            timeToLiveSeconds="36000"
             memoryStoreEvictionPolicy="LRU"
     />
 
     <cache
             name="tokens_expire"
             eternal="false"
-            maxElementsInMemory="100"
-            maxElementsOnDisk="1000"
+            maxElementsInMemory="1000"
+            maxElementsOnDisk="0"
             overflowToDisk="true"
-            diskPersistent="true"
-            timeToIdleSeconds="1800"
-            timeToLiveSeconds="3600"
+            diskPersistent="false"
+            timeToIdleSeconds="28800"
+            timeToLiveSeconds="36000"
             memoryStoreEvictionPolicy="LRU"
     />