Merge branch 'patch-1' into 'master'

Update global-autoconfig.properties



See merge request !1

@@ -269,8 +269,9 @@ rabbit_user = yoho
 rabbit_password = yoho
 rabbit_vhost = yoho
 
-
-
-
 trace.exporter.enable = true
+
+###push log name,keep ${} in logback.xml
+android_pushlog_name  = android_push.${local_ip}
+ios_pushlog_name  = ios_push.${local_ip}