From 1853bf9086a7d8863120ce85a29490360f3901ef Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Mon, 10 Jul 2023 15:35:41 +0800
Subject: [PATCH] =?UTF-8?q?build=20=E9=83=A8=E7=BD=B2=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                      |  2 +-
 dax-start/src/main/resources/logback-spring.xml |  4 ++--
 docker-compose.yml                              | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 97089a03..effe44c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV TZ=Asia/Shanghai
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # jvm启动参数, 启动内存256M,最大内存1G,使用G1垃圾回收器
-ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom"
+ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom --Dlogging.config=./logback-spring.xml"
 
 # 工作目录
 WORKDIR /
diff --git a/dax-start/src/main/resources/logback-spring.xml b/dax-start/src/main/resources/logback-spring.xml
index b129aae3..6e9bb100 100644
--- a/dax-start/src/main/resources/logback-spring.xml
+++ b/dax-start/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration>
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
     <!--项目名称-->
-    <property name="appname" value="bootx-platform"/>
+    <property name="appname" value="dax-pay"/>
     <!--日志位置-->
     <property name="logdir" value="logs"/>
 
@@ -13,7 +13,7 @@
 
     <!-- plumelog Redis方式日志收集 -->
     <appender name="plumelog" class="com.plumelog.logback.appender.LiteAppender">
-        <appName>bootx-platform</appName>
+        <appName>${appname}</appName>
         <plumelogHost>127.0.0.1</plumelogHost>
     </appender>
 
diff --git a/docker-compose.yml b/docker-compose.yml
index c8233e91..94e65642 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,9 +4,9 @@ services:
     image: dax-start:latest
     restart: always
     ports:
-      - "8080:8080"
+      - "9898:9898"
     volumes:
-      # 宿主机目录:容器目录 日志映射
-      - /data/logs/dax-start:/logs
-      # 读取外部化配置文件
-      - ./:/
+      # 读取外部化配置文件(根据实际服务器环境做修改), 宿主机目录:容器目录
+      - /data/logs/dax-start:/logs # 日志
+      - /root/dax-pay/application-dev.yml:/application-dev.yml # 配置
+      - /root/dax-pay/logback-spring.xml:/logback-spring.xml # 日志框架