Merge branch 'master' into sim

# Conflicts:
#	src/main/resources/application.yml

src/main/resources/application.yml

@@ -1,3 +1,9 @@
-spring:
-  profiles:
-    active: sim
+# 对应 apollo 配置中心的应用名
+app:
+  id: biz-service-ebtp-extend
+
+# Apollo 配置信息
+apollo:
+  bootstrap:
+    enabled: true
+    namespace: application

src/main/resources/logback.xml

@@ -2,7 +2,7 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="true">
 
     <property name="logback.logdir" value="/log" />
-    <property name="logback.appname" value="biz_service_ebtp_extend" />
+    <property name="logback.appname" value="${APP_NAME}" />
 
     <contextName>${logback.appname}</contextName>