Merge branch 'master' into lql

src/main/resources/bootstrap-master.yml

+spring:
+  application:
+    name: wangxiaolu-sfa-operation
+
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.0.0.170:8848
+        group: sfa
+        namespace: e2996044-6ddc-4988-8810-602e05d01ccf
+      config:
+        server-addr: 10.0.0.170:8848
+        file-extension: yaml
+        group: sfa
+        namespace: e2996044-6ddc-4988-8810-602e05d01ccf

src/main/resources/logback-spring.xml

@@ -15,7 +15,7 @@
         <property name="LOG_PATH" value="./logs/${APP_NAME}" />
     </springProfile>
 
-    <springProfile name="qa,live">
+    <springProfile name="qa,live,master">
         <property name="LOG_PATH" value="/var/logs/sfa/${APP_NAME}" />
     </springProfile>