rollback: 登录超时bug

backend/src/main/java/io/dataease/auth/filter/JWTFilter.java

@@ -6,6 +6,7 @@ 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;
@@ -111,7 +112,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
         // JWTUtils.removeTokenExpire(token);
         String newToken = JWTUtils.sign(tokenInfo, password);
         // 记录新token操作时间
-         JWTUtils.addTokenExpire(newToken);
+        // JWTUtils.addTokenExpire(newToken);
 
         JWTToken jwtToken = new JWTToken(newToken);
         this.getSubject(request, response).login(jwtToken);

backend/src/main/java/io/dataease/auth/util/JWTUtils.java

@@ -24,7 +24,7 @@ public class JWTUtils {
     // token过期时间1min (过期会自动刷新续命 目的是避免一直都是同一个token )
     private static final long EXPIRE_TIME = 1*60*1000;
     // 登录间隔时间10min 超过这个时间强制重新登录
-     private static long Login_Interval;
+    private static long Login_Interval;
 
 
 
@@ -84,17 +84,24 @@ public class JWTUtils {
      */
     public static boolean loginExpire(String token){
         if (Login_Interval==0) {
-            int minute = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout", Integer.class, 8*60);
+            String property = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout");
+            // 默认超时时间是8h
+            int minute = StringUtils.isNotEmpty(property) ? Integer.parseInt(property): (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;
     }
 
@@ -109,7 +116,7 @@ public class JWTUtils {
     }
 
     /**
-     * 生成签名,1min后过期
+     * 生成签名,5min后过期
      * @param tokenInfo 用户信息
      * @param secret 用户的密码
      * @return 加密的token
@@ -158,12 +165,10 @@ public class JWTUtils {
         CacheManager cacheManager = CommonBeanFactory.getBean(CacheManager.class);
         Cache tokens_expire = cacheManager.getCache("tokens_expire");
         Long expTime = tokens_expire.get(token, Long.class);
-        // System.out.println("get-------"+token+"  :"+expTime);
         return expTime;
     }
 
     public static void removeTokenExpire(String token){
-        // System.out.println("remove----"+token);
         CacheManager cacheManager = CommonBeanFactory.getBean(CacheManager.class);
         Cache tokens_expire = cacheManager.getCache("tokens_expire");
         tokens_expire.evict(token);
@@ -173,7 +178,6 @@ public class JWTUtils {
         CacheManager cacheManager = CommonBeanFactory.getBean(CacheManager.class);
         Cache tokens_expire = cacheManager.getCache("tokens_expire");
         long now = System.currentTimeMillis();
-        // System.out.println("add-------"+token+"  :"+now);
         tokens_expire.put(token, now);
     }
 

backend/src/main/resources/ehcache/ehcache.xml

@@ -29,7 +29,7 @@
     <defaultCache
             eternal="false"
             maxElementsInMemory="1000"
-            overflowToDisk="true"
+            overflowToDisk="false"
             diskPersistent="false"
             timeToIdleSeconds="0"
             timeToLiveSeconds="600"
@@ -38,46 +38,46 @@
     <cache
             name="users_info"
             eternal="false"
-            maxElementsInMemory="1000"
+            maxElementsInMemory="100"
-            maxElementsOnDisk="0"
+            maxElementsOnDisk="1000"
             overflowToDisk="true"
-            diskPersistent="false"
+            diskPersistent="true"
-            timeToIdleSeconds="28800"
+            timeToIdleSeconds="1800"
-            timeToLiveSeconds="36000"
+            timeToLiveSeconds="3600"
             memoryStoreEvictionPolicy="LRU"
     />
     <cache
             name="users_roles_info"
             eternal="false"
-            maxElementsInMemory="1000"
+            maxElementsInMemory="100"
-            maxElementsOnDisk="0"
+            maxElementsOnDisk="1000"
             overflowToDisk="true"
-            diskPersistent="false"
+            diskPersistent="true"
-            timeToIdleSeconds="28800"
+            timeToIdleSeconds="1800"
-            timeToLiveSeconds="36000"
+            timeToLiveSeconds="3600"
             memoryStoreEvictionPolicy="LRU"
     />
     <cache
             name="users_permissions_info"
             eternal="false"
-            maxElementsInMemory="1000"
+            maxElementsInMemory="100"
-            maxElementsOnDisk="0"
+            maxElementsOnDisk="1000"
             overflowToDisk="true"
-            diskPersistent="false"
+            diskPersistent="true"
-            timeToIdleSeconds="28800"
+            timeToIdleSeconds="1800"
-            timeToLiveSeconds="36000"
+            timeToLiveSeconds="3600"
             memoryStoreEvictionPolicy="LRU"
     />
 
     <cache
             name="tokens_expire"
             eternal="false"
-            maxElementsInMemory="1000"
+            maxElementsInMemory="100"
-            maxElementsOnDisk="0"
+            maxElementsOnDisk="1000"
             overflowToDisk="true"
-            diskPersistent="false"
+            diskPersistent="true"
-            timeToIdleSeconds="28800"
+            timeToIdleSeconds="1800"
-            timeToLiveSeconds="36000"
+            timeToLiveSeconds="3600"
             memoryStoreEvictionPolicy="LRU"
     />