wangliang пре 5 година
родитељ
комит
58efa7a08e

+ 7 - 6
themis-business/src/main/java/com/qmth/themis/business/listener/RocketSessionConsumer.java

@@ -61,19 +61,20 @@ public class RocketSessionConsumer implements
     @Override
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
         try {
         try {
+            long threadId = Thread.currentThread().getId();
+            String threadName = Thread.currentThread().getName();
             for (MessageExt messageExt : msgs) {
             for (MessageExt messageExt : msgs) {
-                long threadId = Thread.currentThread().getId();
-                log.info(":{} sessionConsumer 重试次数:{}", threadId, messageExt.getReconsumeTimes());
+                log.info(":{}-:{} sessionConsumer 重试次数:{}", threadId, threadName, messageExt.getReconsumeTimes());
                 MqDto mqDto = (MqDto) toJavaObject(parseObject(new String(messageExt.getBody(), Constants.CHARSET)), MqDto.class);
                 MqDto mqDto = (MqDto) toJavaObject(parseObject(new String(messageExt.getBody(), Constants.CHARSET)), MqDto.class);
-                log.info(":{} sessionConsumer 接受到的消息:{}", threadId, JSONObject.toJSONString(mqDto));
-                log.info(":{} sessionConsumer mqDto sequence:{},tag:{}", threadId, mqDto.getSequence(), mqDto.getTag());
+                log.info(":{}-:{} sessionConsumer 接受到的消息:{}", threadId, threadName, JSONObject.toJSONString(mqDto));
+                log.info(":{}-:{} sessionConsumer mqDto sequence:{},tag:{}", threadId, threadName, mqDto.getSequence(), mqDto.getTag());
                 if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE) {
                 if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE) {
-                    log.info(":{} 更新db", threadId);
+                    log.info(":{}-:{} 更新db", threadId, threadName);
                     tbSessionService.saveSessionInfo(toJavaObject((JSON) mqDto.getBody(), TBSession.class), mqDto.getTimestamp());
                     tbSessionService.saveSessionInfo(toJavaObject((JSON) mqDto.getBody(), TBSession.class), mqDto.getTimestamp());
                     redisUtil.deleteSessionTopicList(SystemConstant.SESSION_TOPIC_BUFFER_LIST, mqDto.getId());
                     redisUtil.deleteSessionTopicList(SystemConstant.SESSION_TOPIC_BUFFER_LIST, mqDto.getId());
                     return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                     return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                 } else {
                 } else {
-                    log.info(":{} 消息ack未确认,重发", threadId);
+                    log.info(":{}-:{} 消息ack未确认,重发", threadId, threadName);
                     return ConsumeConcurrentlyStatus.RECONSUME_LATER;//重试
                     return ConsumeConcurrentlyStatus.RECONSUME_LATER;//重试
                 }
                 }
             }
             }

+ 7 - 5
themis-business/src/main/java/com/qmth/themis/business/listener/RocketUserLogConsumer.java

@@ -50,18 +50,20 @@ public class RocketUserLogConsumer implements MessageListenerConcurrently {
     @Override
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
         try {
         try {
+            long threadId = Thread.currentThread().getId();
+            String threadName = Thread.currentThread().getName();
             for (MessageExt messageExt : msgs) {
             for (MessageExt messageExt : msgs) {
-                log.info("userLogConsumer重试次数:{}", messageExt.getReconsumeTimes());
+                log.info(":{}-:{} userLogConsumer重试次数:{}", threadId, threadName, messageExt.getReconsumeTimes());
                 MqDto mqDto = (MqDto) toJavaObject(parseObject(new String(messageExt.getBody(), Constants.CHARSET)), MqDto.class);
                 MqDto mqDto = (MqDto) toJavaObject(parseObject(new String(messageExt.getBody(), Constants.CHARSET)), MqDto.class);
-                log.info("userLogConsumer接受到的消息:{}", JSONObject.toJSONString(mqDto));
-                log.info("userLogConsumer mqDto sequence:{},tag:{}", mqDto.getSequence(), mqDto.getTag());
+                log.info(":{}-:{} userLogConsumer接受到的消息:{}", threadId, threadName, JSONObject.toJSONString(mqDto));
+                log.info(":{}-:{} userLogConsumer mqDto sequence:{},tag:{}", threadId, threadName, mqDto.getSequence(), mqDto.getTag());
                 if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE) {
                 if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE) {
-                    log.info("插入用户轨迹日志");
+                    log.info(":{}-:{} 插入用户轨迹日志", threadId, threadName);
                     teUserLogService.saveUserLogInfo(mqDto.getTimestamp(), mqDto.getObjId(), MqEnum.valueOf(String.valueOf(mqDto.getType())).getId(), SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(), JSONObject.toJSONString(mqDto));
                     teUserLogService.saveUserLogInfo(mqDto.getTimestamp(), mqDto.getObjId(), MqEnum.valueOf(String.valueOf(mqDto.getType())).getId(), SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(), JSONObject.toJSONString(mqDto));
                     redisUtil.deleteSessionTopicList(SystemConstant.USERLOG_TOPIC_BUFFER_LIST, mqDto.getId());
                     redisUtil.deleteSessionTopicList(SystemConstant.USERLOG_TOPIC_BUFFER_LIST, mqDto.getId());
                     return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                     return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                 } else {
                 } else {
-                    log.info("消息ack未确认,重发");
+                    log.info(":{}-:{} 消息ack未确认,重发", threadId, threadName);
                     return ConsumeConcurrentlyStatus.RECONSUME_LATER;//重试
                     return ConsumeConcurrentlyStatus.RECONSUME_LATER;//重试
                 }
                 }
             }
             }