public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-20 02:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source 
# Conflicts:
#	frontend/src/views/chart/view/ChartEdit.vue
This commit is contained in:
wangjiahao
2021-05-06 23:42:18 +08:00
parent 53b021bbf7 1dabde6327
commit 20ce5bbb39
4 changed files with 78 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/auth/util/JWTUtils.java
View File

@@ -85,8 +85,10 @@ public class JWTUtils {
public static boolean loginExpire(String token){
if (Login_Interval==0) {
String property = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout");
int seconds = StringUtils.isNotEmpty(property) ? Integer.parseInt(property): (10*60);
Login_Interval = seconds * 1000;
// 默认超时时间是8h
int minute = StringUtils.isNotEmpty(property) ? Integer.parseInt(property): (8*60);
// 分钟换算成毫秒
Login_Interval = minute * 1000 * 60;
}
Long now = System.currentTimeMillis();
Long lastOperateTime = tokenLastOperateTime(token);