Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'qa' of…

Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -11,7 +11,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}", "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":[%X{messageData}]}%n
                 </pattern>
             </layout>
         </encoder>

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

@@ -11,7 +11,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}", "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":[%X{messageData}]}%n
                 </pattern>
             </layout>
         </encoder>

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

@@ -11,7 +11,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}", "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":[%X{messageData}]}%n
                 </pattern>
             </layout>
         </encoder>