Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/resources/logback.xml

@@ -61,7 +61,7 @@
         <destination>116.62.158.92:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
-            <customFields>{"server_name":"mall-miniapp"}</customFields>
+            <customFields>{"server_name":"jsm-mall-miniapp"}</customFields>
         </encoder>
     </appender>
 

mall-server-api/src/main/resources/logback.xml

@@ -53,7 +53,7 @@
             <destination>116.62.158.92:5044</destination>
             <!-- encoder必须配置,有多种可选 -->
             <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
-                <customFields>{"server_name":"mall-manager-service"}</customFields>
+                <customFields>{"server_name":"jsm-mall-manager-service"}</customFields>
             </encoder>
         </appender>