Merge remote-tracking branch 'origin/his/yiwufuyou_new' into his/yiwufuyou_new

pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.diagbot</groupId>
             <artifactId>common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/diagbot/MrqcSysApplication.java

@@ -1,6 +1,6 @@
 package com.diagbot;
 
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
+import com.diagbot.annotation.EnableMonitor;
 import com.diagbot.util.SocketServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -28,6 +28,11 @@ import org.springframework.context.ApplicationContext;
 @EnableHystrix
 @EnableCircuitBreaker
 @ConfigurationPropertiesScan
+@EnableMonitor(pointcut="execution(public * com.diagbot.web..*(..)) || execution(public * com.diagbot.facade..*(..)) ||" +
+        "execution(public * com.diagbot.service..*(..)) || execution(public * com.diagbot.mapper..*(..)) " +
+        "|| execution(public * com.diagbot.client..*(..)) " +
+        "|| execution(public * com.diagbot.util..*(..)) " +
+        "|| execution(public * com.diagbot.aop..*(..))")
 public class MrqcSysApplication {
 
     public static void main(String[] args) {

src/main/resources/logback-spring.xml

@@ -18,7 +18,7 @@
     <!--value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
     <!--包名输出缩进对齐-->
     <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- } %X{Trace-Id}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
     <!--  日志记录器，日期滚动记录
             ERROR 级别
@@ -112,7 +112,7 @@
             <fileNamePattern>${LOG_PATH}/${APPDIR}/info/${APPDIR}-info-%d{yyyy-MM-dd}.%i.log
             </fileNamePattern>
             <!--  保留日志天数 -->
-            <maxHistory>15</maxHistory>
+            <maxHistory>1</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-info-1992-11-06.0.log -->
             <timeBasedFileNamingAndTriggeringPolicy