diff --git a/.gitignore b/.gitignore
index 14db654d1..3bd67ed60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,8 @@
*.iml
*.zip
+
+frontend/node
+lib
+logs
+files
diff --git a/Dockerfile b/Dockerfile
index 9dee90582..f230481a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8
+FROM amazoncorretto:8-alpine-jre
LABEL "author"="tl"
RUN mkdir /datart
COPY ./bin/ /datart/bin/
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..8e778b363
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,32 @@
+version: '3.7'
+services:
+ datart:
+ image: eoi/datart
+ container_name: eoi-datart
+ restart: always
+ volumes:
+ - datart-config-data:/datart/config
+ ports:
+ - 8765:8080
+ depends_on:
+ - selenium
+ networks:
+ datart_network:
+
+ selenium:
+ image: selenium/standalone-chrome
+ container_name: eoi-selenium
+ restart: always
+ ports:
+ - 4444
+ shm_size: 2147483648
+ networks:
+ datart_network:
+
+networks:
+ datart_network:
+
+volumes:
+ datart-config-data:
+ name: datart-config-data
+ driver: local
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 833a31b14..692c28179 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,43 +74,49 @@
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- true
-
-
-
- org.codehaus.mojo
- versions-maven-plugin
-
- false
-
-
-
- org.apache.maven.plugins
- maven-clean-plugin
-
-
-
- static
-
- **
-
-
-
- ${project.basedir}
-
- datart-server-*-install.zip
-
-
-
-
-
-
-
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ true
+
+
+
+ org.codehaus.mojo
+ versions-maven-plugin
+
+ false
+
+
+
+ org.apache.maven.plugins
+ maven-clean-plugin
+
+
+
+ lib
+
+ **
+
+
+
+ static
+
+ **
+
+
+
+ ${project.basedir}
+
+ datart-server-*-install.zip
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/pom.xml b/server/pom.xml
index 269bf5c53..537fae851 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -193,6 +193,9 @@
org.apache.maven.plugins
maven-jar-plugin
+
+ ${project.parent.basedir}/lib
+
datart.DatartServerApplication
@@ -208,136 +211,150 @@
org.apache.maven.plugins
- maven-assembly-plugin
- 3.0.0
+ maven-dependency-plugin
- dist
+ copy-dependencies
package
- single
+ copy-dependencies
-
- src/main/resources/assembly/assembly.xml
-
- ${project.parent.basedir}
+ ${project.parent.basedir}/lib
- org.apache.maven.plugins
- maven-surefire-plugin
+ maven-assembly-plugin
-
+
+ ${project.name}-${project.version}
+
+ true
+
+
+ src/main/resources/assembly/assembly.xml
+
+ ${project.parent.basedir}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 3.0.0
-
-
- exec-npm-install
- initialize
-
- exec
-
-
- npm
-
- run
- bootstrap
- --registry=https://registry.npm.taobao.org
-
- ${project.parent.basedir}/frontend
-
-
-
- exec-npm-run-build
- generate-resources
+ dist
+ package
- exec
+ single
-
- npm
-
- run
- build:all
-
- ${project.parent.basedir}/frontend
-
-
org.apache.maven.plugins
- maven-resources-plugin
-
-
- copy-resource
- compile
-
- copy-resources
-
-
- ${project.parent.basedir}/static
-
-
- ${project.parent.basedir}/frontend/build
-
-
-
-
-
+ maven-surefire-plugin
+
+
+
-
- com.coderplus.maven.plugins
- copy-rename-maven-plugin
- 1.0.1
-
-
- rename-file
- compile
-
- rename
-
-
- ${project.parent.basedir}/frontend/build/task/index.js
- ${project.basedir}/src/main/resources/javascript/parser.js
-
-
-
-
-
+
+
+ frontend
+
+ true
+
+
+
+
+ com.github.eirslett
+ frontend-maven-plugin
+ 1.13.4
+
+
+
+ install node and npm
+
+ install-node-and-npm
+
+ generate-resources
+
+
+
+ npm install
+
+ npm
+
+ generate-resources
+
+ install --registry=https://registry.npmmirror.com/
+
+
+
+
+ npm run build
+
+ npm
+
+ compile
+
+ run build:all
+
+
+
+
+
+ ${project.parent.basedir}/frontend
+ v14.21.3
+ 6.14.18
+ https://npmmirror.com/mirrors/node/
+ https://registry.npm.taobao.org/pnpm/-/
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ copy-resource
+ compile
+
+ copy-resources
+
+
+ ${project.parent.basedir}/static
+
+
+ ${project.parent.basedir}/frontend/build
+
+
+
+
+
+
+
+ com.coderplus.maven.plugins
+ copy-rename-maven-plugin
+ 1.0.1
+
+
+ rename-file
+ compile
+
+ rename
+
+
+ ${project.parent.basedir}/frontend/build/task/index.js
+ ${project.basedir}/src/main/resources/javascript/parser.js
+
+
+
+
+
+
+
+
+
+
diff --git a/server/src/main/resources/assembly/assembly.xml b/server/src/main/resources/assembly/assembly.xml
index d98c96004..695ca107d 100644
--- a/server/src/main/resources/assembly/assembly.xml
+++ b/server/src/main/resources/assembly/assembly.xml
@@ -6,9 +6,14 @@
false
${project.build.finalName}
+
${project.parent.basedir}/bin
bin
+ 0755
unix
datart-server.sh
@@ -17,6 +22,7 @@
${project.parent.basedir}/bin
bin
+ 0755
dos
datart-server.cmd
@@ -42,6 +48,7 @@
${project.parent.basedir}
./
+ docker-compose.yml
Dockerfile
LICENSE
README.md