diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..ee77193 Binary files /dev/null and b/.DS_Store differ diff --git a/Dockerfile b/Dockerfile index 46d5c10..5f635b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN export LANG="zh_CN.UTF-8" RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' > /etc/timezone -COPY ./target/*.jar ./epmet-jmreport.jar +COPY ./target/*.jar ./epmet-jmreport-server.jar EXPOSE 8082 diff --git a/deploy/docker-compose-dev.yml b/deploy/docker-compose-dev.yml index 83d666d..65e93bd 100644 --- a/deploy/docker-compose-dev.yml +++ b/deploy/docker-compose-dev.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/dev:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -Dspring.profiles.active=dev -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -Dspring.profiles.active=dev -jar ./epmet-jmreport-server.jar" restart: "unless-stopped" logging: driver: local diff --git a/deploy/docker-compose-prod.yml b/deploy/docker-compose-prod.yml index 524a7fd..1a751a6 100644 --- a/deploy/docker-compose-prod.yml +++ b/deploy/docker-compose-prod.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -Dspring.profiles.active=prod -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx512m -Dspring.profiles.active=prod -jar ./epmet-jmreport-server.jar" restart: "unless-stopped" logging: driver: local diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml index 5f502e4..dcc6a24 100644 --- a/deploy/docker-compose-test.yml +++ b/deploy/docker-compose-test.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/test:/logs" environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -Dspring.profiles.active=test -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms32m -Xmx200m -Dspring.profiles.active=test -jar ./epmet-jmreport-server.jar" restart: "unless-stopped" logging: driver: local diff --git a/deploy/docker-compose-yantai.yml b/deploy/docker-compose-yantai.yml index 3ef6671..319e913 100644 --- a/deploy/docker-compose-yantai.yml +++ b/deploy/docker-compose-yantai.yml @@ -9,7 +9,7 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -Dspring.profiles.active=yantai -jar ./epmet-jmreport.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx512m -Dspring.profiles.active=yantai -jar ./epmet-jmreport-server.jar" restart: "unless-stopped" logging: driver: local diff --git a/pom.xml b/pom.xml index 6c847e3..adc0488 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ epmet-jimureport com.epmet - epmet-jimureport + epmet-jmreport-server 1.5 http://www.jimureport.com