From 0d935436931449d8cc42d7b82bfcabec6908bf32 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Wed, 26 Oct 2022 22:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9jar=E5=8C=85=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=B8=BAepmet-jmreport-server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                        | Bin 0 -> 6148 bytes
 Dockerfile                       |   2 +-
 deploy/docker-compose-dev.yml    |   2 +-
 deploy/docker-compose-prod.yml   |   2 +-
 deploy/docker-compose-test.yml   |   2 +-
 deploy/docker-compose-yantai.yml |   2 +-
 pom.xml                          |   2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ee771938787a1bb39cadddab0eb4f7463f2ead2b
GIT binary patch
literal 6148
zcmeHKI|>3Z5S>vG!N$@uSMUZw^aOhW1;s`bM6I{-TprCgpGH?ZZR8D1UNV`NkXP*N
zh=|TFo0-T&L`HB!x!KS)+c)o6FCz+s<BYAGug&SOKOT0S?DqlV4&^LsImzyYZ+kQ<
zKn17(6`%rC;JXTBeI1Rzdn`|*0#x7+6tM3@fg9GuHqbvE7`z1l4iI+3+<OUNu>i0p
zwt<MiG^oI!YPJ{}bi_;M)x<V1=%U$tXx^;Zp{U=E^NXj8)<BL_fC@Y-(2wQB>i-h{
zq5pp-aYY5Fz+Wk#gGIBL<4IXtJCCzkTi`3W<=o+Bm^%f7mt&xpV=Sy3PdzE}ip{ZK
V6Wc(iBkpt{e+En!8Ws4p0uNe26{i3I

literal 0
HcmV?d00001

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 @@
 
     <name>epmet-jimureport</name>
     <groupId>com.epmet</groupId>
-    <artifactId>epmet-jimureport</artifactId>
+    <artifactId>epmet-jmreport-server</artifactId>
     <version>1.5</version>
 
     <url>http://www.jimureport.com</url>