修改merge的问题

src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
-#spring.profiles.active: dev
-spring.profiles.active: test
+spring.profiles.active: dev
+#spring.profiles.active: test
 #spring.profiles.active: prod
 
 spring:

src/main/resources/logback.xml

@@ -4,8 +4,8 @@
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/back_end/logs/crowdsource-backend.log.%d{yyyy-MM-dd}.log</fileNamePattern>
-<!--            <fileNamePattern>./logs/crowdsource-backend.log.%d{yyyy-MM-dd}.log</fileNamePattern>-->
+            <!--<fileNamePattern>/back_end/logs/crowdsource-backend.log.%d{yyyy-MM-dd}.log</fileNamePattern>-->
+            <fileNamePattern>./logs/crowdsource-backend.log.%d{yyyy-MM-dd}.log</fileNamePattern>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
         <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
@@ -19,8 +19,8 @@
 
     <appender name="recommendAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/back_end/logs/recommend.log.%d{yyyy-MM-dd}.log</fileNamePattern>
-<!--            <fileNamePattern>./logs/recommend.log.%d{yyyy-MM-dd}.log</fileNamePattern>-->
+            <!--<fileNamePattern>/back_end/logs/recommend.log.%d{yyyy-MM-dd}.log</fileNamePattern>-->
+            <fileNamePattern>./logs/recommend.log.%d{yyyy-MM-dd}.log</fileNamePattern>
         </rollingPolicy>
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{5} - %msg%n</pattern>