diff --git a/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java b/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java
index c8cdc9214f..4767cda249 100644
--- a/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java
+++ b/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java
@@ -53,7 +53,8 @@ public class ShiroConfig {
/*filterMap.put("jwt", jwtFilter);*/
filterMap.put("logout", new F2CLogoutFilter());
factoryBean.setSecurityManager(securityManager);
- factoryBean.setUnauthorizedUrl("/permissionMiss");
+ factoryBean.setLoginUrl("/index.html");
+ factoryBean.setUnauthorizedUrl("/index.html");
factoryBean.setFilterChainDefinitionMap(shiroService.loadFilterChainDefinitionMap());
factoryBean.setFilters(filterMap);
return factoryBean;
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 b43ae98bd3..7219376e10 100644
--- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
@@ -20,9 +20,9 @@ public class JWTUtils {
// token过期时间1min (过期会自动刷新续命 目的是避免一直都是同一个token )
- private static final long EXPIRE_TIME = 1*60*1000/2;
+ private static final long EXPIRE_TIME = 5*60*1000;
// 登录间隔时间10min 超过这个时间强制重新登录
- private static final long Login_Interval = 20*60*1000;
+ private static final long Login_Interval = 30*60*1000;
/**
@@ -81,6 +81,7 @@ public class JWTUtils {
public static boolean loginExpire(String token){
Long now = System.currentTimeMillis();
Long lastOperateTime = tokenLastOperateTime(token);
+ if (lastOperateTime == null) return true;
return now - lastOperateTime > Login_Interval;
}
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index c80c8b4d4a..99313ac5b0 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -62,7 +62,10 @@ import { listDatasource, post } from '@/api/dataset/dataset'
export default {
name: 'AddDB',
props: {
- param: Object
+ param: {
+ type: Object,
+ default: null
+ }
},
data() {
return {
@@ -163,4 +166,8 @@ export default {
.el-checkbox.is-bordered + .el-checkbox.is-bordered {
margin-left: 0;
}
+
+ span{
+ font-size: 14px;
+ }
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index a6929a77a2..c999f3aa1f 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -14,7 +14,7 @@
-
+