diff --git a/pom.xml b/pom.xml index 8f565a07..8dcaf9ac 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ 4.0.0 fateboard fateboard - 1.8.0 + 1.8.0.1 org.springframework.boot spring-boot-starter-parent - 2.2.0.RELEASE + 2.6.7 @@ -31,19 +31,18 @@ UTF-8 1.8 1.2.3 - 2.17.1 + 2.17.2 org.springframework.boot spring-boot-starter-web - 2.5.12 - + org.apache.commons commons-lang3 - 3.8.1 + 3.12.0 @@ -55,32 +54,9 @@ org.springframework.boot - spring-boot-loader-tools - 2.1.5.RELEASE - - - org.springframework - spring-core - - - - - - org.springframework - spring-core - 5.3.18 - - - - - org.springframework.boot - spring-boot-starter-actuator - 2.0.4.RELEASE - - commons-fileupload commons-fileupload @@ -96,13 +72,12 @@ org.springframework.boot spring-boot-starter-thymeleaf - 2.1.5.RELEASE com.alibaba fastjson - 1.2.70 + 1.2.83 fastjson @@ -114,7 +89,6 @@ org.springframework.boot spring-boot-starter-websocket - 2.0.4.RELEASE @@ -164,10 +138,8 @@ org.springframework.boot spring-boot-test - 2.0.3.RELEASE - com.lmax disruptor @@ -295,7 +267,51 @@ - + + com.github.eirslett + frontend-maven-plugin + 1.9.1 + + + + install node and npm + + install-node-and-npm + + generate-resources + + + + npm install + + npm + + generate-resources + + install + + + + + npm run build + + npm + + generate-resources + + run build + + + + + v16.15.1 + 8.11.0 + + dist + + resources-front-end + + org.apache.maven.plugins maven-compiler-plugin @@ -304,6 +320,31 @@ 1.8 + + maven-resources-plugin + + + copy-resources + compile + + copy-resources + + + + + resources-front-end/dist + + static/** + index.html + FATE_logo.png + + + + ${project.build.directory}/classes/static + + + + org.apache.maven.plugins maven-jar-plugin @@ -318,7 +359,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.0.4.RELEASE true com.webank.ai.fate.board.bootstrap.Bootstrap 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); - } - }; - } }