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

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;

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;
     }
 

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;
+  }
 </style>

frontend/src/views/system/user/index.vue

@@ -14,7 +14,7 @@
         <fu-table-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" :label="$t('user.create')" @click="create" />
       </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="nickName" :label="$t('commons.name')" width="140" />
       <el-table-column prop="gender" label="性别" width="50" />