system-server移除zipkin，恢复trace-id

cf-module-system/cf-module-system-biz/pom.xml

@@ -224,15 +224,6 @@
             <artifactId>cf-spring-boot-starter-biz-pay</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sleuth</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
-        </dependency>
-
 
     </dependencies>
 

cf-module-system/cf-module-system-biz/src/main/resources/bootstrap.yaml

@@ -1,12 +1,6 @@
 spring:
   application:
     name: system-server
-  sleuth:
-    default-logging-pattern-enabled: false
-    sampler: #采样器
-      probability: 1.0 #采样率，采样率是采集Trace的比率，默认0.1
-    zipkin: #设置zipkin服务端地址
-      baseUrl: http://127.0.0.1:9411
 
   profiles:
     active: local

cf-module-system/cf-module-system-biz/src/main/resources/logback-spring.xml

@@ -5,7 +5,7 @@
     <springProperty scope="context" name="chenfeng.info.base-package" source="chenfeng.info.base-package"/>
     <!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
     <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
-    <property name="ERROR_PATTERN" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) %X{traceId:-} | %boldYellow(%thread) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+    <property name="ERROR_PATTERN" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) [%X{trace-id}] | %boldYellow(%thread) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
 
     <!-- 控制台 Appender -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">