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

call-back-service/src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" />
 
     <!--配置变量-->
     <property resource="application.properties"/>
@@ -11,7 +12,7 @@
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
                 <pattern>
-                    { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":"%exception" ,"printMessage":"%m","messageData":[%X{messageData}]}%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>
             </layout>
         </encoder>

order-application-service/src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" />
 
     <!--配置变量-->
     <property resource="application.properties"/>
@@ -11,7 +12,7 @@
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
                 <pattern>
-                    { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":"%exception" ,"printMessage":"%m","messageData":[%X{messageData}]}%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>
             </layout>
         </encoder>

shopping-cart-application-service/src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <conversionRule conversionWord="m" converterClass="com.freemud.application.sdk.api.log.FmLogMsgJsonConverter" />
 
     <!--配置变量-->
     <property resource="application.properties"/>
@@ -11,7 +12,7 @@
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
                 <pattern>
-                    { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "stack":"%exception" ,"printMessage":"%m","messageData":[%X{messageData}]}%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>
             </layout>
         </encoder>