Merge branch 'master' of http://113.142.79.114:10080/root/ali-kafka

# Conflicts:
#	src/main/java/com/cxzx/db/Tidb.java

src/main/java/com/cxzx/Main.java

@@ -8,14 +8,11 @@ import com.cxzx.db.Tidb;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.consumer.OffsetAndMetadata;
-import org.apache.kafka.common.TopicPartition;
 
 import java.sql.Timestamp;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @Slf4j
 public class Main {