Merge branches 'develop' and 'feature/20210407_券码灰度修改_wuping' of…

Merge branches 'develop' and 'feature/20210407_券码灰度修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -8,11 +8,10 @@
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <charset>UTF-8</charset>
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>%d %p [%thread] (%file:%line\) - [${spring.application.name}, %tid] %m%n</pattern>
+                <pattern>%d %p [%thread] (%file:%line\) - [${PROJECT_NAME:-}, ${eureka.instance.metadataMap.version} , %tid] %m%n  </pattern>
             </layout>
         </encoder>
     </appender>
-
     <springProfile name="default">
         <logger name="cn.freemud" level="debug" additivity="false">
             <appender-ref ref="STDOUT" />