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

backend/src/main/java/io/dataease/auth/server/AuthServer.java

@@ -107,7 +107,7 @@ public class AuthServer implements AuthApi {
     public String test() {
         SysUserEntity userById = authUserService.getUserById(4L);
         String nickName = userById.getNickName();
-        System.out.println(nickName);
+//        System.out.println(nickName);
        /* Map<String, DePluginXpackService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType(DePluginXpackService.class);
         for (Map.Entry entry : beansOfType.entrySet()) {
             Object key = entry.getKey();

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

@@ -97,10 +97,10 @@ public class JWTUtils {
             isExpire = now - lastOperateTime > Login_Interval;
         }
         if (isExpire) {
-            System.out.println("-----------------------");
-            System.out.println("-----上次操作时间是["+lastOperateTime+"]-----");
-            System.out.println("-----当前操作时间是["+now+"]-----");
-            System.out.println("-----------------------");
+//            System.out.println("-----------------------");
+//            System.out.println("-----上次操作时间是["+lastOperateTime+"]-----");
+//            System.out.println("-----当前操作时间是["+now+"]-----");
+//            System.out.println("-----------------------");
         }
         return isExpire;
     }

backend/src/main/java/io/dataease/commons/utils/DateUtils.java

@@ -96,19 +96,19 @@ public class DateUtils {
 
 
     public static void main(String[] args) throws Exception {
-        System.out.println("start:");
+//        System.out.println("start:");
         Date paramTime = getTime(getTimeString(new Long("1607672440731")));
 
         Map<String, Date> weekDate = getWeedFirstTimeAndLastTime(paramTime);
 
         for (Map.Entry<String, Date> entry :
                 weekDate.entrySet()) {
-            System.out.println(entry.getKey() + ":" + getTimeString(entry.getValue())+":"+entry.getValue().getTime());
+//            System.out.println(entry.getKey() + ":" + getTimeString(entry.getValue())+":"+entry.getValue().getTime());
         }
 
         long countTimeLong = new Long("1607672440731");
 
-        System.out.println(getTimeString(--countTimeLong));
+//        System.out.println(getTimeString(--countTimeLong));
 
     }
 

backend/src/main/java/io/dataease/commons/utils/DeFileUtils.java

@@ -48,7 +48,7 @@ public class DeFileUtils {
             // 检测是否存在目录
             if (!dest.getParentFile().exists()) {
                 if (!dest.getParentFile().mkdirs()) {
-                    System.out.println("was not successful.");
+//                    System.out.println("was not successful.");
                 }
             }
             // 文件写入

backend/src/main/java/io/dataease/commons/utils/ZipUtils.java

@@ -30,15 +30,12 @@ public class ZipUtils {
             while (ze != null) {
                 String fileName = ze.getName();
                 File newFile = new File(outputFolder + File.separator + fileName);
-                System.out.println("file unzip : " + newFile.getAbsoluteFile());
                 //大部分网络上的源码，这里没有判断子目录
                 if (ze.isDirectory()) {
                     if (!newFile.mkdirs()) {
-                        System.out.println("was not successful.");
                     }
                 } else {
                     if (!new File(newFile.getParent()).mkdirs()) {
-                        System.out.println("was not successful.");
                     }
                     FileOutputStream fos = new FileOutputStream(newFile);
                     int len;
@@ -51,7 +48,6 @@ public class ZipUtils {
             }
             zis.closeEntry();
             zis.close();
-            System.out.println("Done");
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -68,14 +64,12 @@ public class ZipUtils {
 
                 if (entry.isDirectory()) {
                     if (!file.mkdirs()) {
-                        System.out.println("was not successful.");
                     }
                 } else {
                     File parent = file.getParentFile();
 
                     if (!parent.exists()) {
                         if (!parent.mkdirs()) {
-                            System.out.println("was not successful.");
                         }
                     }
 
@@ -107,7 +101,6 @@ public class ZipUtils {
         File desDir = new File(folderPath);
         if (!desDir.exists()) {
             if (!desDir.mkdirs()) {
-                System.out.println("was not successful.");
             }
         }
         ZipFile zf = new ZipFile(zipFile);
@@ -120,7 +113,6 @@ public class ZipUtils {
                 File fileParentDir = desFile.getParentFile();
                 if (!fileParentDir.exists()) {
                     if (!fileParentDir.mkdirs()) {
-                        System.out.println("was not successful.");
                     }
                 }
             }

backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java

@@ -139,7 +139,7 @@ public class ModuleClassLoader extends URLClassLoader {
 
                 SpringContextUtil.getBeanFactory().registerBeanDefinition(beanName,beanDefinition);
                 registeredBean.add(beanName);
-                System.out.println("注册bean:"+beanName);
+//                System.out.println("注册bean:"+beanName);
             }
 
         }

backend/src/main/java/io/dataease/service/system/SystemParameterService.java

@@ -265,6 +265,6 @@ public class SystemParameterService {
     public static void main(String[] args) {
         String info="[{\"paramKey\":\"base.url\",\"paramValue\":null,\"type\":\"text\",\"sort\":1,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.title\",\"paramValue\":\"DataEase Title\",\"type\":\"text\",\"sort\":3,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.logo\",\"paramValue\":\"DataEase\",\"type\":\"text\",\"sort\":4,\"file\":null,\"fileName\":\"favicon.icon.png\"}]";
         List<SystemParameterDTO> temp = JSON.parseArray(info,SystemParameterDTO.class);
-        System.out.println("===>");
+//        System.out.println("===>");
     }
 }

backend/src/main/resources/application.properties

@@ -56,9 +56,9 @@ rsa.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD2
 spring.cache.type=ehcache
 spring.cache.ehcache.config=classpath:/ehcache/ehcache.xml
 #打印URL路径
-logging.level.org.springframework.web=trace
-logging.level.org.springframework.boot.web=trace
-spring.mvc.log-request-details=true
+#logging.level.org.springframework.web=trace
+#logging.level.org.springframework.boot.web=trace
+#spring.mvc.log-request-details=true
 pagehelper.PageRowBounds=true
 #excel等用户上传文件路径
 upload.file.path=/opt/dataease/data/kettle/

frontend/src/views/panel/list/SaveToTemplate.vue

@@ -74,7 +74,7 @@ export default {
     },
     save() {
       if (!this.templateInfo.pid) {
-        this.$warning(this.$t(panel.pls_select_belong_to_category))
+        this.$warning(this.$t('panel.pls_select_belong_to_category'))
         return false
       }
       if (!this.templateInfo.name) {