From 06fcb2afa2e362a37820333176f96e867661ec96 Mon Sep 17 00:00:00 2001
From: nobodyiam <nobodyiam@gmail.com>
Date: Sun, 10 Dec 2023 18:24:21 +0800
Subject: [PATCH] some misc fix

---
 .../src/main/resources/apollo-adminservice.conf               | 4 ++--
 .../src/main/resources/apollo-configservice.conf              | 4 ++--
 apollo-portal/src/assembly/assembly-descriptor.xml            | 1 +
 apollo-portal/src/main/resources/apollo-portal.conf           | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apollo-adminservice/src/main/resources/apollo-adminservice.conf b/apollo-adminservice/src/main/resources/apollo-adminservice.conf
index 563cd74ccf4..f5c2eeaf51c 100644
--- a/apollo-adminservice/src/main/resources/apollo-adminservice.conf
+++ b/apollo-adminservice/src/main/resources/apollo-adminservice.conf
@@ -2,7 +2,7 @@ MODE=service
 PID_FOLDER=.
 # console appender log file folder
 LOG_FOLDER=/opt/logs/
-# console appender file name
-LOG_FILENAME=console.log
+# console appender log file name
+LOG_FILENAME=apollo-adminservice.console.log
 # write application logs only to file appender
 export LOG_APPENDERS=FILE
\ No newline at end of file
diff --git a/apollo-configservice/src/main/resources/apollo-configservice.conf b/apollo-configservice/src/main/resources/apollo-configservice.conf
index a84d9189626..90d87652755 100644
--- a/apollo-configservice/src/main/resources/apollo-configservice.conf
+++ b/apollo-configservice/src/main/resources/apollo-configservice.conf
@@ -1,8 +1,8 @@
 MODE=service
 PID_FOLDER=.
 # console appender log file folder
-LOG_FOLDER=/opt/logs/100003171/
+LOG_FOLDER=/opt/logs/
 # console appender log file name
-LOG_FILENAME=console.log
+LOG_FILENAME=apollo-configservice.console.log
 # write application logs only to file appender
 export LOG_APPENDERS=FILE
\ No newline at end of file
diff --git a/apollo-portal/src/assembly/assembly-descriptor.xml b/apollo-portal/src/assembly/assembly-descriptor.xml
index b2c1aae3c17..992df9247b1 100644
--- a/apollo-portal/src/assembly/assembly-descriptor.xml
+++ b/apollo-portal/src/assembly/assembly-descriptor.xml
@@ -48,6 +48,7 @@
 			<includes>
 				<include>application-github.properties</include>
 				<include>apollo-env.properties</include>
+				<include>application.properties</include>
 			</includes>
 		</fileSet>
 		<!--artifact -->
diff --git a/apollo-portal/src/main/resources/apollo-portal.conf b/apollo-portal/src/main/resources/apollo-portal.conf
index 19d4b8ea0be..2a2dd96e564 100644
--- a/apollo-portal/src/main/resources/apollo-portal.conf
+++ b/apollo-portal/src/main/resources/apollo-portal.conf
@@ -1,8 +1,8 @@
 MODE=service
 PID_FOLDER=.
 # console appender log file folder
-LOG_FOLDER=/opt/logs/100003173/
+LOG_FOLDER=/opt/logs/
 # console appender log file name
-LOG_FILENAME=console.log
+LOG_FILENAME=apollo-portal.console.log
 # write application logs only to file appender
 export LOG_APPENDERS=FILE
\ No newline at end of file