Merge branch 'master' into dev

# Conflicts:
#	README.md
#	pom.xml
#	secoo-log-starter/pom.xml
#	secoo-log/pom.xml
#	secoo-log/src/main/resources/logback.xml

README.md

@@ -29,6 +29,13 @@
 <!-- &#124; 表示 |  -->
 
 
+版本升级说明
+V 1.0.5
+增加参数
+logFileSize 文件切割维度 M
+logMaxHistory  历史保留时间 D
+
+
 
 
 
@@ -78,5 +85,7 @@
 	
 	
 Version Update
-1.0.3
-update sky apm version
\ No newline at end of file
+1.0.5
+增加动态历史参数等变更
+1.0.6
+update sky apm version to 6.2.1
\ No newline at end of file

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.secoo.mall</groupId>
     <artifactId>secoo-log-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.6-SNAPSHOT</version>
     <modules>
         <module>secoo-log-starter</module>
         <module>secoo-log</module>

secoo-log-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secoo-log-parent</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

secoo-log-starter/src/test/java/SpringBootStartTest.java

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * spring boot start log test
@@ -7,7 +8,7 @@ import org.slf4j.LoggerFactory;
  * @author zhanghao
  * @date 2019-06-2714:29
  */
-//@SpringBootApplication
+@SpringBootApplication
 public class SpringBootStartTest {
 
     private static Logger logger = LoggerFactory.getLogger(SpringBootStartTest.class);

secoo-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secoo-log-parent</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

secoo-log/src/main/resources/logback.xml

@@ -5,7 +5,7 @@
 
     <property name="LOG_PATH" value="/data/logs" />
     <property name="LOG_DIR" value="${LOG_PATH}/${logName}/%d{yyyyMMdd}"/>
-    <property name="MAX_FILE_SIZE" value="128MB"/>
+    <property name="MAX_FILE_SIZE" value="${logFileSize}"/>
     <property name="MAX_HISTORY" value="${logMaxHistory}"/>
     <property name="PATTERN" value="-|%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%X{tid}|%thread|%logger{36}.%M:%L-%msg%n"/>
     <property name="CHARSET" value="UTF-8"/>