Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into feature/1101-appversion

# Conflicts:
#	mec-application/src/main/resources/bootstrap-dev.properties

mec-application/src/main/resources/bootstrap-dev.properties

@@ -9,3 +9,4 @@ spring.cloud.nacos.config.prefix=app
 spring.cloud.nacos.config.file-extension=yaml
 #\u662F\u5426\u52A8\u6001\u5237\u65B0
 spring.cloud.nacos.config.enabled=true
+logging.config=classpath:logback-dev.xml

mec-application/src/main/resources/bootstrap-test.properties

@@ -9,3 +9,4 @@ spring.cloud.nacos.config.prefix=app
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
 spring.cloud.nacos.config.enabled=true
+logging.config=classpath:logback-test.xml

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="10 seconds">
+
+    <property name="LOG_HOME" value="/mdata/mec-test/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" />
+
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder charset="UTF-8">
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="file"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}</FileNamePattern>
+            <MaxHistory>90</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>20MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="com.ym.app" level="INFO" />
+<!--    <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="trace" />-->
+
+    <!--本地环境:打印控制台 -->
+    <root level="INFO">
+        <appender-ref ref="stdout" />
+        <appender-ref ref="file" />
+    </root>
+</configuration>