From 34d25a173e97b913bb9c358cf914906827ae787d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 9 Oct 2020 18:43:35 +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/ConsumerInterface.php | 11 ++--------
 Kafka/Kafka.php             | 11 +---------
 Kafka/Struct.php            | 42 +++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 Kafka/Struct.php

diff --git a/Kafka/ConsumerInterface.php b/Kafka/ConsumerInterface.php
index 477c91d3..c9437f80 100644
--- a/Kafka/ConsumerInterface.php
+++ b/Kafka/ConsumerInterface.php
@@ -13,17 +13,10 @@ interface ConsumerInterface
 
 
 	/**
-	 * @param int $offset
-	 * @param $part
-	 * @param int $crc
-	 * @param int $magic
-	 * @param int $attr
-	 * @param int $timestamp
-	 * @param string $key
-	 * @param string $value
+	 * @param Struct $struct
 	 * @return mixed
 	 */
-	public function onHandler(int $offset, $part, int $crc, int $magic, int $attr, int $timestamp, string $key, string $value);
+	public function onHandler(Struct $struct);
 
 
 }
diff --git a/Kafka/Kafka.php b/Kafka/Kafka.php
index 6fd33723..872d5e3e 100644
--- a/Kafka/Kafka.php
+++ b/Kafka/Kafka.php
@@ -43,16 +43,7 @@ class Kafka extends \Snowflake\Process\Process
 				}
 				$class = Snowflake::createObject($namespace);
 				if ($class instanceof ConsumerInterface) {
-					$class->onHandler(
-						$message['offset'],
-						$part,
-						$message['message']['crc'],
-						$message['message']['magic'],
-						$message['message']['attr'],
-						$message['message']['timestamp'],
-						$message['message']['key'],
-						$message['message']['value']
-					);
+					$class->onHandler(new Struct($topic, $part, $message));
 				}
 			} catch (\Throwable $exception) {
 				$this->application->error($exception->getMessage());
diff --git a/Kafka/Struct.php b/Kafka/Struct.php
new file mode 100644
index 00000000..60cc5020
--- /dev/null
+++ b/Kafka/Struct.php
@@ -0,0 +1,42 @@
+<?php
+
+
+namespace Kafka;
+
+
+class Struct
+{
+
+	public $offset;
+
+	public $part;
+	public $topic;
+
+	public $crc;
+	public $magic;
+	public $attr;
+	public $timestamp;
+	public $key;
+	public $value;
+
+
+	/**
+	 * Struct constructor.
+	 * @param $topic
+	 * @param $part
+	 * @param $message
+	 */
+	public function __construct($topic, $part, $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'];
+	}
+
+}