Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-equipment/cx-equipment-server/src/main/resources/logback-spring.xml

@@ -4,7 +4,7 @@
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss} [%X{traceId}] [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -13,24 +13,40 @@
         <Prudent>true</Prudent>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>
-                icequipmentlog/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.log
+                cx-equipment-log/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.%i.log
             </FileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>5MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
+        <!-- 追加方式记录日志 -->
+        <append>true</append>
         <layout class="ch.qos.logback.classic.PatternLayout">
             <Pattern>
-                %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level -%msg%n
+                %d{yyyy-MM-dd HH:mm:ss} [%X{traceId}] [%thread] %-5level -%msg%n
             </Pattern>
         </layout>
     </appender>
 
-    <logger name="com.bootdo" additivity="false">
-        <appender-ref ref="console"/>
-        <appender-ref ref="logFile" />
-    </logger>
+    <springProfile name="prod">
+        <logger name="com.bootdo" additivity="false" level="error">
+            <appender-ref ref="logFile" />
+        </logger>
 
-    <root level="error">
-        <appender-ref ref="console"/>
-        <appender-ref ref="logFile" />
-    </root>
+        <root level="error">
+            <appender-ref ref="logFile" />
+        </root>
+    </springProfile>
 
+    <springProfile name="dev">
+        <logger name="com.bootdo" additivity="false" level="error">
+            <appender-ref ref="console"/>
+            <appender-ref ref="logFile" />
+        </logger>
+
+        <root level="error">
+            <appender-ref ref="console"/>
+            <appender-ref ref="logFile" />
+        </root>
+    </springProfile>
 </configuration>