Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/self/TraineeBusiness.java

@@ -37,6 +37,7 @@ import org.dromara.common.core.domain.model.ErrorInfo;
 import org.dromara.common.core.enums.CardStatusEnum;
 import org.dromara.common.core.enums.ResultCodeEnum;
 import org.dromara.common.core.enums.RoomCardTypeEnum;
+import org.dromara.common.message.kafka.constant.KafkaTopicConstants;
 import org.dromara.common.message.kafka.domain.KafkaHeader;
 import org.dromara.common.message.kafka.domain.KafkaMessage;
 import org.dromara.common.redis.utils.RedisUtils;
@@ -412,7 +413,7 @@ public class TraineeBusiness {
         message.setHeader(header);
         message.setBody(traineeCheckIn);
 
-        kafkaProducer.sendKafkaMessage(CloudMqTopicConstants.OLD_YKT_TEST,message);
+        kafkaProducer.sendKafkaMessage(KafkaTopicConstants.OLD_SYNC_TOPIC,message);
     }
 
     public YcLockCardVo queryLockCardInfo(Map<String, Object> mapQuery){

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/consumer/KafkaLocalConsumer.java

@@ -12,7 +12,6 @@ import org.dromara.common.message.kafka.domain.KafkaHeader;
 import org.dromara.common.message.kafka.domain.KafkaMessage;
 import org.dromara.server.base.service.yktOperation.SyncRemoteSendMessageRecordService;
 import org.dromara.server.mq.event.kafka.IYktEventStrategy;
-import org.dromara.server.mq.event.kafka.YktEventStrategyContext;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.kafka.annotation.KafkaListener;
@@ -29,7 +28,6 @@ import static org.dromara.common.message.kafka.constant.KafkaTopicConstants.SYNC
 @ConditionalOnExpression("'local'.equals('${locationFlag}')")
 public class KafkaLocalConsumer {
     private final SyncRemoteSendMessageRecordService syncRemoteSendMessageRecordService;
-    private final YktEventStrategyContext yktEventStrategyContext;
 
     @Value("${spring.system.tenantId}")
     private String tenantId;