Skip to content

O
order-group
Commit 17dee171 by 李学兴
Options

Merge branch 'feature/20210830_礼品卡支付_wuping' 

# Conflicts:
#	call-back-service/src/main/resources/logback.xml
#	order-application-service/src/main/resources/logback.xml
#	shopping-cart-application-service/src/main/resources/logback.xml
parents aac66ea7 6bbdb7c8
Showing with 6 additions and 3 deletions
call-back-service/src/main/resources/logback.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" /> <conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" />
<conversionRule conversionWord="exception" converterClass="com.freemud.application.sdk.api.log.FmExceptionConverter" />
<!--配置变量--> <!--配置变量-->
<property resource="application.properties"/> <property resource="application.properties"/>
...@@ -12,7 +13,7 @@ ...@@ -12,7 +13,7 @@
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder"> <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout"> <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern> <pattern>
{ "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":"%exception" ,"printMessage":%m,"messageData":%replace(%X{messageData:-FM_D_M_D}){'FM_D_M_D','{}'}}%n { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":%exception ,"printMessage":%m,"messageData":%replace(%X{messageData:-FM_D_M_D}){'FM_D_M_D','{}'}}%n
</pattern> </pattern>
</layout> </layout>
</encoder> </encoder>
......
order-application-service/src/main/resources/logback.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" /> <conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" />
<conversionRule conversionWord="exception" converterClass="com.freemud.application.sdk.api.log.FmExceptionConverter" />
<!--配置变量--> <!--配置变量-->
<property resource="application.properties"/> <property resource="application.properties"/>
...@@ -12,7 +13,7 @@ ...@@ -12,7 +13,7 @@
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder"> <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout"> <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern> <pattern>
{ "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":"%exception" ,"printMessage":%m,"messageData":%replace(%X{messageData:-FM_D_M_D}){'FM_D_M_D','{}'}}%n { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":%exception ,"printMessage":%m,"messageData":%replace(%X{messageData:-FM_D_M_D}){'FM_D_M_D','{}'}}%n
</pattern> </pattern>
</layout> </layout>
</encoder> </encoder>
......
shopping-cart-application-service/src/main/resources/logback.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" /> <conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" />
<conversionRule conversionWord="exception" converterClass="com.freemud.application.sdk.api.log.FmExceptionConverter" />
<!--配置变量--> <!--配置变量-->
<property resource="application.properties"/> <property resource="application.properties"/>
...@@ -12,7 +13,7 @@ ...@@ -12,7 +13,7 @@
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder"> <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout"> <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
<pattern> <pattern>
{ "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":"%exception" ,"printMessage":%m,"messageData":%replace(%X{messageData:-FM_D_M_D}){'FM_D_M_D','{}'}}%n { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":%exception ,"printMessage":%m,"messageData":%replace(%X{messageData:-FM_D_M_D}){'FM_D_M_D','{}'}}%n
</pattern> </pattern>
</layout> </layout>
</encoder> </encoder>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment