Merge branch 'master' of http://121.40.98.15:3001/kym/charge-java

admin/src/main/resources/logback-spring.xml

@@ -4,11 +4,11 @@
     <!--引用默认日志配置-->
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
     <!--使用默认的控制台日志输出实现-->
-    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+<!--    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>-->
     <!--应用名称-->
     <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="springBoot"/>
     <!--日志文件保存路径-->
-    <property name="LOG_FILE_PATH" value="D:/Java Project/logs/admin"/>
+    <property name="LOG_FILE_PATH" value="/data/logs/admin"/>
 <!--    <property name="LOG_FILE_PATH" value="opt/logs/admin"/>   -->
     <!--LogStash访问host-->
     <!--    <springProperty name="LOG_STASH_HOST" scope="context" source="logstash.host" defaultValue="localhost"/>-->

miniapp/src/main/resources/logback-spring.xml

@@ -8,7 +8,7 @@
     <!--应用名称-->
     <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="springBoot"/>
     <!--日志文件保存路径-->
-    <property name="LOG_FILE_PATH" value="D:/Java Project/logs/miniapp"/>
+    <property name="LOG_FILE_PATH" value="/data/logs/miniapp"/>
 <!--    <property name="LOG_FILE_PATH" value="opt/logs/miniapp"/>   -->
     <!--LogStash访问host-->
     <!--    <springProperty name="LOG_STASH_HOST" scope="context" source="logstash.host" defaultValue="localhost"/>-->