Merge branch 'master' of https://gitee.com/anji-plus/report

report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java

@@ -37,6 +37,7 @@ public class TokenFilter implements Filter {
         String uri = request.getRequestURI();
 
         if (!uri.startsWith("/login")
+                && !uri.startsWith("/favicon.ico")
                 && !uri.startsWith("/static")
                 && !uri.startsWith("/file/download/")
                 && !uri.contains("index.html")) {

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/user/controller/LoginController.java

@@ -38,9 +38,4 @@ public class LoginController {
         return ResponseBean.builder().build();
     }
 
-
-    @RequestMapping({"/", "index.html"})
-    public String index() {
-        return "/index";
-    }
 }

report-core/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <property name="LOG_HOME" value="./logs"/>
-    <property name="LOG_NAME" value="ai-report"/>
+    <property name="LOG_NAME" value="aj-report"/>
 
     <!--控制台-->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -26,9 +26,6 @@
         </layout>
     </appender>
 
-    <!--    nacos心跳日志关闭    -->
-    <logger name="com.alibaba.nacos.client.config.impl.ClientWorker" level="off" />
-
     <root level="INFO">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="LOGFILE" />

report-core/src/test/java/FileTest.java

@@ -0,0 +1,33 @@
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * Created by raodeming on 2021/7/2.
+ */
+public class FileTest {
+
+
+    @Test
+    public void test1() throws IOException {
+        String sql = "INSERT INTO `aj_report`.`gaea_file` (`id`, `file_id`, `file_type`, `file_path`, `url_path`, `file_instruction`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES (default, '%s', 'png', '/app/aj-report/image/%s', 'https://report.anji-plus.com/file/download/%s', '%s', 'admin', '2021-07-02 10:04:55', 'admin', '2021-07-02 10:04:55', '1');\n";
+
+        File paFile = new File("D:\\anji\\盖亚\\大屏设计\\png");
+        PrintWriter pw = new PrintWriter(new FileWriter("D:\\anji\\盖亚\\大屏设计\\fileSql.sql", true));
+        File[] files = paFile.listFiles();
+        for (File file : files) {
+            String name = file.getName();
+            String fileName = name.split("\\.")[0];
+            //System.out.println(fileName);
+
+            String format = String.format(sql, fileName, name, fileName, fileName);
+            System.out.println(format);
+            pw.print(format);
+        }
+        pw.flush();
+        pw.close();
+    }
+}