center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'main' of https://github.com/dataease/dataease into main

Browse Source
This commit is contained in:
TaoJinlong 2021-03-15 21:50:05 +08:00
commit 029eb33e8c
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/auth/config/ShiroConfig.java
View File

@ -53,7 +53,8 @@ public class ShiroConfig {
/*filterMap.put("jwt", jwtFilter);*/ /*filterMap.put("jwt", jwtFilter);*/
filterMap.put("logout", new F2CLogoutFilter()); filterMap.put("logout", new F2CLogoutFilter());
factoryBean.setSecurityManager(securityManager); factoryBean.setSecurityManager(securityManager);
factoryBean.setUnauthorizedUrl("/permissionMiss"); factoryBean.setLoginUrl("/index.html");
factoryBean.setUnauthorizedUrl("/index.html");
factoryBean.setFilterChainDefinitionMap(shiroService.loadFilterChainDefinitionMap()); factoryBean.setFilterChainDefinitionMap(shiroService.loadFilterChainDefinitionMap());
factoryBean.setFilters(filterMap); factoryBean.setFilters(filterMap);
return factoryBean; return factoryBean;

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

@ -20,9 +20,9 @@ public class JWTUtils {
// token过期时间1min (过期会自动刷新续命 目的是避免一直都是同一个token ) // token过期时间1min (过期会自动刷新续命 目的是避免一直都是同一个token )
private static final long EXPIRE_TIME = 1*60*1000/2; private static final long EXPIRE_TIME = 5*60*1000;
// 登录间隔时间10min 超过这个时间强制重新登录 // 登录间隔时间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){ public static boolean loginExpire(String token){
Long now = System.currentTimeMillis(); Long now = System.currentTimeMillis();
Long lastOperateTime = tokenLastOperateTime(token); Long lastOperateTime = tokenLastOperateTime(token);
if (lastOperateTime == null) return true;
return now - lastOperateTime > Login_Interval; return now - lastOperateTime > Login_Interval;
} }

9
frontend/src/views/dataset/add/AddDB.vue
View File

@ -62,7 +62,10 @@ import { listDatasource, post } from '@/api/dataset/dataset'
export default { export default {
name: 'AddDB', name: 'AddDB',
props: { props: {
param: Object param: {
type: Object,
default: null
}
}, },
data() { data() {
return { return {
@ -163,4 +166,8 @@ export default {
.el-checkbox.is-bordered + .el-checkbox.is-bordered { .el-checkbox.is-bordered + .el-checkbox.is-bordered {
margin-left: 0; margin-left: 0;
} }
span{
font-size: 14px;
}
</style> </style>

2
frontend/src/views/system/user/index.vue
View File

@ -14,7 +14,7 @@
<fu-table-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" :label="$t('user.create')" @click="create" /> <fu-table-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" :label="$t('user.create')" @click="create" />
</template> </template>
<el-table-column type="selection" fix /> <!-- <el-table-column type="selection" fix /> -->
<el-table-column prop="username" label="ID" width="80" /> <el-table-column prop="username" label="ID" width="80" />
<el-table-column prop="nickName" :label="$t('commons.name')" width="140" /> <el-table-column prop="nickName" :label="$t('commons.name')" width="140" />
<el-table-column prop="gender" label="性别" width="50" /> <el-table-column prop="gender" label="性别" width="50" />