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

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

@@ -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);

backend/src/main/resources/application.properties

@@ -62,10 +62,12 @@ spring.mvc.log-request-details=true
 pagehelper.PageRowBounds=true
 #excel等用户上传文件路径
 upload.file.path=/opt/dataease/data/upload/
+
+#初始密码和登录超时时间移到/opt/dataease/conf/dataease.properties
 #用户初始密码,如果不设置默认是DataEase123..
-dataease.init_password=DataEase123456
-#登录超时时间单位s 设置默认30分钟 如果雨不设置 默认10分钟也就是10*60
-dataease.login_timeout=1800
+#dataease.init_password=DataEase123456
+#登录超时时间单位min
+#dataease.login_timeout=480
 
 
 

frontend/src/views/chart/components/table/TableNormal.vue

@@ -113,7 +113,7 @@ export default {
       const that = this
       setTimeout(function() {
         const currentHeight = document.documentElement.clientHeight
-        const tableMaxHeight = currentHeight - 56 - 40 - 84 - that.$refs.title.offsetHeight - 8 * 2 - 20
+        const tableMaxHeight = currentHeight - 56 - 40 - 84 - that.$refs.title.offsetHeight - 20
         let tableHeight
         if (that.chart.data) {
           tableHeight = (that.chart.data.tableRow.length + 2) * 36