Merge branch 'dev' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/resources/logback-dev.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-    <property name="LOG_HOME" value="/mdata/mec-dev/logs/app-%d{yyyy-MM-dd_HH}-%i.log" />
+    <!--Spring读取配置参数-->
+    <springProperty scope="context" name="LOG_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOG_HOME" source="spring.application.name"/>
+    <property name="FILE_NAME" value="app" />
+
+    <property name="FILE_LOG_HOME" value="/mdata/mec-dev/logs/app-%d{yyyy-MM-dd_HH}-%i.log" />
     <property name="CONSOLE_LOG_PATTERN"
               value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
@@ -14,7 +19,7 @@
     <appender name="file"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_HOME}</FileNamePattern>
+            <FileNamePattern>${FILE_LOG_HOME}</FileNamePattern>
             <MaxHistory>90</MaxHistory>
             <TimeBasedFileNamingAndTriggeringPolicy
                     class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
@@ -27,6 +32,19 @@
         </encoder>
     </appender>
 
+    <appender name="FeignAccessFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH}/${LOG_HOME}/${FILE_NAME}-feign.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/${LOG_HOME}/%d{yyyyMM,aux}/feign-%d{yyyyMMdd}-%i.log.gz</fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+            <maxFileSize>20 MB</maxFileSize>
+        </rollingPolicy>
+        <encoder charset="UTF-8">
+            <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] %p %c{0} %m%n</pattern>
+        </encoder>
+    </appender>
+
     <logger name="com.ym.app" level="INFO" />
 <!--    <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="trace" />-->
 
@@ -35,4 +53,9 @@
         <appender-ref ref="stdout" />
         <appender-ref ref="file" />
     </root>
+
+    <!--总控平台Feign接口日志-->
+    <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+        <appender-ref ref="FeignAccessFile" />
+    </logger>
 </configuration>

mec-application/src/main/resources/logback-spring.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
+    <!--Spring读取配置参数-->
+    <springProperty scope="context" name="LOG_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOG_HOME" source="spring.application.name"/>
+    <property name="FILE_NAME" value="app" />
+
 <!--    <property name="LOG_HOME" value="${LOG_HOME}"/>-->
     <property name="CONSOLE_LOG_PATTERN"
               value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n"/>
@@ -60,18 +65,13 @@
     </appender>
 
     <appender name="FeignAccessFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_HOME}/app-feign.log</file>
+        <file>${LOG_PATH}/${LOG_HOME}/${FILE_NAME}-feign.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/%d{yyyyMM,aux}/feign-%d{yyyyMMdd}-%i.log.gz</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${LOG_HOME}/%d{yyyyMM,aux}/feign-%d{yyyyMMdd}-%i.log.gz</fileNamePattern>
             <maxHistory>30</maxHistory>
             <totalSizeCap>1GB</totalSizeCap>
             <maxFileSize>20 MB</maxFileSize>
         </rollingPolicy>
-        <!--<filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>DENY</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>-->
         <encoder charset="UTF-8">
             <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] %p %c{0} %m%n</pattern>
         </encoder>
@@ -113,7 +113,7 @@
             <appender-ref ref="stdout"/>
             <appender-ref ref="file"/>
         </root>
-        <logger name="com.cooleshow.edu.core.openfeign" level="DEBUG" additivity="false">
+        <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
             <appender-ref ref="FeignAccessFile" />
         </logger>
     </springProfile>
@@ -123,7 +123,7 @@
             <appender-ref ref="stdout"/>
             <appender-ref ref="file"/>
         </root>
-        <logger name="com.cooleshow.edu.core.openfeign" level="DEBUG" additivity="false">
+        <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
             <appender-ref ref="FeignAccessFile" />
         </logger>
     </springProfile>
@@ -133,7 +133,7 @@
             <appender-ref ref="stdout"/>
             <appender-ref ref="file"/>
         </root>
-        <logger name="com.cooleshow.edu.core.openfeign" level="DEBUG" additivity="false">
+        <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
             <appender-ref ref="FeignAccessFile" />
         </logger>
     </springProfile>
@@ -147,7 +147,7 @@
         <Logger name="org.redisson" level="INFO" additivity="false">
             <appender-ref ref="file" level="INFO" />
         </Logger>
-        <logger name="com.cooleshow.edu.core.openfeign" level="DEBUG" additivity="false">
+        <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
             <appender-ref ref="FeignAccessFile" />
         </logger>
     </springProfile>
@@ -157,7 +157,7 @@
             <appender-ref ref="file"/>
             <appender-ref ref="plumelog"/>
         </root>
-        <logger name="com.cooleshow.edu.core.openfeign" level="DEBUG" additivity="false">
+        <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
             <appender-ref ref="FeignAccessFile" />
         </logger>
     </springProfile>