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

build.sh

@@ -28,7 +28,7 @@ if [ ! -e "$BuildDir/report-ui/dist" ];then
 fi
 
 echo ""
-cp $BuildDir/report-ui/dist/* $BuildDir/report-core/src/main/resources/static/
+cp -r $BuildDir/report-ui/dist/* $BuildDir/report-core/src/main/resources/static/
 echo "build springboot"
 cd $BuildDir/report-core
 echo "mvn clean package"

report-core/pom.xml

@@ -236,6 +236,7 @@
                         <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
                     </nonFilteredFileExtensions>
                 </configuration>
+                <version>3.1.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>