调整ｌｏｇ和设备号绑定

src/main/java/com/tidecloud/dataacceptance/service/HexBinaryAcceptanceHandlerAdapter.java

@@ -4,6 +4,7 @@ import javax.xml.bind.DatatypeConverter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
@@ -38,8 +39,10 @@ public abstract class HexBinaryAcceptanceHandlerAdapter extends AcceptanceInboun
 		byte[] dataByteArray = new byte[dataByteBuf.readableBytes()];
 		dataByteBuf.readBytes(dataByteArray);
 		String printHexBinary = DatatypeConverter.printHexBinary(dataByteArray);
-		if (channelDeviceMap.get(ctx.channel())!=null)
+		if (channelDeviceMap.get(ctx.channel())!=null) {
+			MDC.put(MDC_DEVICEID, channelDeviceMap.get(ctx.channel()));
 			logger.info("设备: [{}] 传入数据为 : {}", channelDeviceMap.get(ctx.channel()), printHexBinary);
+		}
 		else {
 			logger.info("设备传入数据为 : {}", printHexBinary);
 		}

src/main/resources/logback.xml

@@ -4,7 +4,7 @@
 	<property name="CONSOLE_PATTERN"
 		value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) -- [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />
 	<property name="FILE_PATTERN"
-		value="%d{MM-dd HH:mm:ss.SSS} %-5level -- [%thread] %logger{26}:[%X{deviceId}] %msg%n" />
+		value="%d{MM-dd HH:mm:ss.SSS} %level -- [%thread]:%logger{26}:%line:[%X{deviceId}] %msg%n" />
 	<springProperty scope="context" name="logPath"
 		source="spring.profiles.active" />
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
@@ -92,7 +92,7 @@
 	</appender>
 	
 	 <root level="INFO">
-        <appender-ref ref="ASYNC_CONSOLE"/>
+        <appender-ref ref="CONSOLE"/>
         <appender-ref ref="ASYNC_INFO_FILE"/>
         <appender-ref ref="ASYNC_ERROR_FILE"/>
     </root>