diff --git a/Dockerfile b/Dockerfile
index afe8cb1..46d5c10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,28 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
-
-MAINTAINER jeecgos@163.com
+FROM java:8
+RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' > /etc/timezone
-RUN mkdir -p /jimureport
+COPY ./target/*.jar ./epmet-jmreport.jar
-WORKDIR /jimureport
+EXPOSE 8082
-EXPOSE 8085
+ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]
-ADD ./target/jimureport-example-1.5.jar ./
-CMD java -DMYSQL-HOST=jimureport-mysql -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jimureport-example-1.5.jar
\ No newline at end of file
+#FROM anapsix/alpine-java:8_server-jre_unlimited
+#
+#MAINTAINER jeecgos@163.com
+#
+#RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+#
+#RUN mkdir -p /jimureport
+#
+#WORKDIR /jimureport
+#
+#EXPOSE 8085
+#
+#ADD ./target/jimureport-example-1.5.jar ./
+#
+#CMD java -DMYSQL-HOST=jimureport-mysql -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jimureport-example-1.5.jar
\ No newline at end of file
diff --git a/deploy/docker-compose-dev.yml b/deploy/docker-compose-dev.yml
new file mode 100644
index 0000000..f90777c
--- /dev/null
+++ b/deploy/docker-compose-dev.yml
@@ -0,0 +1,23 @@
+version: "3.7"
+services:
+ epmet-jmreport:
+ container_name: epmet-jmreport
+ image: 192.168.1.140:5000/epmet-cloud-dev/epmet-jmreport:version_placeholder
+ ports:
+ - "8118:8118"
+ network_mode: host # 使用现有网络
+ volumes:
+ - "/opt/epmet-cloud-logs/dev:/logs"
+ environment:
+ RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-jmreport.jar"
+ restart: "unless-stopped"
+ logging:
+ driver: local
+ options:
+ max-size: "10m"
+ max-file: "2"
+ deploy:
+ resources:
+ limits:
+ cpus: '0.1'
+ memory: 250M
\ No newline at end of file
diff --git a/deploy/docker-compose-prod.yml b/deploy/docker-compose-prod.yml
new file mode 100644
index 0000000..ba0dd38
--- /dev/null
+++ b/deploy/docker-compose-prod.yml
@@ -0,0 +1,23 @@
+version: "3.7"
+services:
+ epmet-admin-server:
+ container_name: epmet-admin-server-prod
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:version_placeholder
+ ports:
+ - "8082:8082"
+ network_mode: host # 使用现有网络
+ volumes:
+ - "/opt/epmet-cloud-logs/prod:/logs"
+ environment:
+ RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-admin.jar"
+ restart: "unless-stopped"
+ logging:
+ driver: local
+ options:
+ max-size: "10m"
+ max-file: "2"
+ deploy:
+ resources:
+ limits:
+ cpus: '0.1'
+ memory: 600M
diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml
new file mode 100644
index 0000000..7e83d1c
--- /dev/null
+++ b/deploy/docker-compose-test.yml
@@ -0,0 +1,23 @@
+version: "3.7"
+services:
+ epmet-admin-server:
+ container_name: epmet-admin-server-test
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:version_placeholder
+ ports:
+ - "8082:8082"
+ network_mode: host # 使用现有网络
+ volumes:
+ - "/opt/epmet-cloud-logs/test:/logs"
+ environment:
+ RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-admin.jar"
+ restart: "unless-stopped"
+ logging:
+ driver: local
+ options:
+ max-size: "10m"
+ max-file: "2"
+ deploy:
+ resources:
+ limits:
+ cpus: '0.1'
+ memory: 250M
\ No newline at end of file
diff --git a/src/main/resources/logback-base.xml b/src/main/resources/logback-base.xml
new file mode 100644
index 0000000..8b34bed
--- /dev/null
+++ b/src/main/resources/logback-base.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..3d27fa4
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+ ${appname}
+
+
+
+
+
+
+
+
+ debug
+
+
+ ${CONSOLE_LOG_PATTERN}
+
+ UTF-8
+
+
+
+
+
+
+
+ ${log.path}/debug.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+ ${log.path}/debug-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ debug
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/info.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+ ${log.path}/info-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ info
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/warn.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/warn-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ warn
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/error.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/error-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ ERROR
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/rocketmqclient.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+