From 1b01a5a88ca0df726931a93a4fb68bd48046bb78 Mon Sep 17 00:00:00 2001
From: ArvinHuang <1095369685@qq.com>
Date: Thu, 28 Jul 2022 16:03:54 +0800
Subject: [PATCH 1/4] update dependency version for security fixing

Signed-off-by: ArvinHuang <1095369685@qq.com>
---
 pom.xml | 112 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 76 insertions(+), 36 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f565a07..5644b76b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fateboard</groupId>
     <artifactId>fateboard</artifactId>
-    <version>1.8.0</version>
+    <version>1.8.1</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.RELEASE</version>
+        <version>2.6.7</version>
         <relativePath/>
     </parent>
 
@@ -31,19 +31,18 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <pagehelper.version>1.2.3</pagehelper.version>
-        <log4j2.version>2.17.1</log4j2.version>
+        <log4j2.version>2.17.2</log4j2.version>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.5.12</version>
         </dependency>
-
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.12.0</version>
         </dependency>
 
 
@@ -55,32 +54,9 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-loader-tools</artifactId>
-            <version>2.1.5.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>5.3.18</version>
-        </dependency>
-
-        <dependency>
-
-            <groupId>org.springframework.boot</groupId>
-
             <artifactId>spring-boot-starter-actuator</artifactId>
-            <version>2.0.4.RELEASE</version>
-
         </dependency>
 
-
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
@@ -96,13 +72,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
-            <version>2.1.5.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.70</version>
+            <version>1.2.83</version>
             <exclusions>
                 <exclusion>
                     <artifactId>fastjson</artifactId>
@@ -114,7 +89,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
-            <version>2.0.4.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -164,10 +138,8 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
-            <version>2.0.3.RELEASE</version>
         </dependency>
 
-
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
@@ -295,7 +267,51 @@
             </extension>
         </extensions>
         <plugins>
-
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.9.1</version>
+                <executions>
+                    <!-- 检查是否安装node npm -->
+                    <execution>
+                        <id>install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                    </execution>
+                    <!-- npm install -->
+                    <execution>
+                        <id>npm install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                    <!-- build -->
+                    <execution>
+                        <id>npm run build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <nodeVersion>v16.15.1</nodeVersion>
+                    <npmVersion>8.11.0</npmVersion>
+                    <!-- node安装路径 -->
+                    <installDirectory>dist</installDirectory>
+                    <!-- 前端代码路径 -->
+                    <workingDirectory>resources-front-end</workingDirectory>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -304,6 +320,31 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution> <!-- 复制配置文件 -->
+                        <id>copy-resources</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>resources-front-end/dist</directory>
+                                    <includes>
+                                        <include>static/**</include>
+                                        <include>index.html</include>
+                                        <include>FATE_logo.png</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/classes/static</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -318,7 +359,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.0.4.RELEASE</version>
                 <configuration>
                     <fork>true</fork>
                     <mainClass>com.webank.ai.fate.board.bootstrap.Bootstrap</mainClass>

From ec46a619a0c6005e0ec1ff00ad92e6bfb9840fb3 Mon Sep 17 00:00:00 2001
From: ArvinHuang <1095369685@qq.com>
Date: Thu, 28 Jul 2022 16:05:21 +0800
Subject: [PATCH 2/4] bug fix

Signed-off-by: ArvinHuang <1095369685@qq.com>
---
 .../webank/ai/fate/board/bootstrap/Bootstrap.java  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/main/java/com/webank/ai/fate/board/bootstrap/Bootstrap.java b/src/main/java/com/webank/ai/fate/board/bootstrap/Bootstrap.java
index 4d7a3304..6d350a71 100644
--- a/src/main/java/com/webank/ai/fate/board/bootstrap/Bootstrap.java
+++ b/src/main/java/com/webank/ai/fate/board/bootstrap/Bootstrap.java
@@ -16,15 +16,11 @@
 package com.webank.ai.fate.board.bootstrap;
 
 
-import org.apache.catalina.Context;
-import org.apache.tomcat.websocket.server.WsSci;
 import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -44,14 +40,4 @@ public static void main(String[] args) {
             e.printStackTrace();
         }
     }
-
-    @Bean
-    public TomcatContextCustomizer tomcatContextCustomizer() {
-        return new TomcatContextCustomizer() {
-            @Override
-            public void customize(Context context) {
-                context.addServletContainerInitializer(new WsSci(), null);
-            }
-        };
-    }
 }

From dee4af98800207126714d8734105b3283d4e94aa Mon Sep 17 00:00:00 2001
From: ArvinHuang <1095369685@qq.com>
Date: Thu, 28 Jul 2022 16:06:23 +0800
Subject: [PATCH 3/4] version check

Signed-off-by: ArvinHuang <1095369685@qq.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5644b76b..03786bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fateboard</groupId>
     <artifactId>fateboard</artifactId>
-    <version>1.8.1</version>
+    <version>1.8.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

From da8592e903387d41fc7f6f93dd1a70ae718f0f3b Mon Sep 17 00:00:00 2001
From: ArvinHuang <1095369685@qq.com>
Date: Thu, 28 Jul 2022 16:27:11 +0800
Subject: [PATCH 4/4] version check

Signed-off-by: ArvinHuang <1095369685@qq.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 03786bbf..8dcaf9ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fateboard</groupId>
     <artifactId>fateboard</artifactId>
-    <version>1.8.0</version>
+    <version>1.8.0.1</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>