From a6274261a9bf10f5e9db782802f8a239ce2633ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Mon, 26 Oct 2020 17:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Kafka/Kafka.php  |  1 -
 Kafka/Struct.php | 31 ++++++++++++-------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Kafka/Kafka.php b/Kafka/Kafka.php
index 70a7cd1f..56129b91 100644
--- a/Kafka/Kafka.php
+++ b/Kafka/Kafka.php
@@ -112,7 +112,6 @@ class Kafka extends \Snowflake\Process\Process
 	protected function handlerExecute($topic, $part, $message)
 	{
 		try {
-			var_dump($message);
 			$namespace = 'App\\Kafka\\' . ucfirst($topic) . 'Consumer';
 			if (!class_exists($namespace)) {
 				return;
diff --git a/Kafka/Struct.php b/Kafka/Struct.php
index 60cc5020..7d549605 100644
--- a/Kafka/Struct.php
+++ b/Kafka/Struct.php
@@ -4,21 +4,18 @@
 namespace Kafka;
 
 
+use RdKafka\Message;
+
 class Struct
 {
 
-	public $offset;
+	public int $offset;
 
-	public $part;
-	public $topic;
-
-	public $crc;
-	public $magic;
-	public $attr;
-	public $timestamp;
-	public $key;
-	public $value;
+	public Message $message;
+	public string $topic;
 
+	public string $value;
+	public string $part;
 
 	/**
 	 * Struct constructor.
@@ -26,17 +23,13 @@ class Struct
 	 * @param $part
 	 * @param $message
 	 */
-	public function __construct($topic, $part, $message)
+	public function __construct($topic, $part,Message $message)
 	{
 		$this->topic = $topic;
-		$this->offset = $message['offset'];
-		$this->part = $part;
-		$this->crc = $message['message']['crc'];
-		$this->magic = $message['message']['magic'];
-		$this->attr = $message['message']['attr'];
-		$this->timestamp = $message['message']['timestamp'];
-		$this->key = $message['message']['key'];
-		$this->value = $message['message']['value'];
+		$this->offset = $message->offset;
+		$this->part = $message->partition;
+		$this->message = $message;
+		$this->value = $message->payload;
 	}
 
 }