From 901cf8c760daa2784ef99c3858d53191b7cca80a Mon Sep 17 00:00:00 2001
From: Yurun <admin@yurunsoft.com>
Date: Mon, 23 Oct 2023 13:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8BaseInjectV?=
 =?UTF-8?q?alue=E4=BD=9C=E4=B8=BA=E6=B3=A8=E8=A7=A3=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kafka/example/Annotation/GetGroupId.php   | 39 -------------------
 ...estConsumer.php => TestConsumerSwoole.php} |  7 ++--
 .../Kafka/Test/TestConsumerWorkerman.php      | 29 ++++++++++++++
 .../example/Process/SwooleTestProcess.php     |  4 +-
 .../example/Process/WorkermanTestProcess.php  |  4 +-
 5 files changed, 36 insertions(+), 47 deletions(-)
 delete mode 100644 src/Components/kafka/example/Annotation/GetGroupId.php
 rename src/Components/kafka/example/Kafka/Test/{TestConsumer.php => TestConsumerSwoole.php} (77%)
 create mode 100644 src/Components/kafka/example/Kafka/Test/TestConsumerWorkerman.php

diff --git a/src/Components/kafka/example/Annotation/GetGroupId.php b/src/Components/kafka/example/Annotation/GetGroupId.php
deleted file mode 100644
index 1708731809..0000000000
--- a/src/Components/kafka/example/Annotation/GetGroupId.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace KafkaApp\Annotation;
-
-use Imi\Aop\Annotation\BaseInjectValue;
-use Imi\Bean\Annotation\Inherit;
-use Imi\Util\Imi;
-
-/**
- * @Inherit
- *
- * @Annotation
- *
- * @Target({"PROPERTY", "ANNOTATION"})
- *
- * @property callable $callable 回调
- */
-#[\Attribute]
-class GetGroupId extends BaseInjectValue
-{
-    /**
-     * 获取注入值的真实值
-     *
-     * @return mixed
-     */
-    public function getRealValue()
-    {
-        if (Imi::checkAppType('swoole'))
-        {
-            return 'test-consumer-swoole';
-        }
-        else
-        {
-            return 'test-consumer-workerman';
-        }
-    }
-}
diff --git a/src/Components/kafka/example/Kafka/Test/TestConsumer.php b/src/Components/kafka/example/Kafka/Test/TestConsumerSwoole.php
similarity index 77%
rename from src/Components/kafka/example/Kafka/Test/TestConsumer.php
rename to src/Components/kafka/example/Kafka/Test/TestConsumerSwoole.php
index 379a4a5b40..9dc894f9cc 100644
--- a/src/Components/kafka/example/Kafka/Test/TestConsumer.php
+++ b/src/Components/kafka/example/Kafka/Test/TestConsumerSwoole.php
@@ -8,15 +8,14 @@
 use Imi\Kafka\Annotation\Consumer;
 use Imi\Kafka\Base\BaseConsumer;
 use Imi\Redis\Redis;
-use KafkaApp\Annotation\GetGroupId;
 use longlang\phpkafka\Consumer\ConsumeMessage;
 
 /**
- * @Bean("TestConsumer")
+ * @Bean("TestConsumerSwoole")
  *
- * @Consumer(topic="queue-imi-1", groupId=@GetGroupId)
+ * @Consumer(topic="queue-imi-1", groupId="test-consumer-swoole")
  */
-class TestConsumer extends BaseConsumer
+class TestConsumerSwoole extends BaseConsumer
 {
     /**
      * 消费任务
diff --git a/src/Components/kafka/example/Kafka/Test/TestConsumerWorkerman.php b/src/Components/kafka/example/Kafka/Test/TestConsumerWorkerman.php
new file mode 100644
index 0000000000..5699c2087b
--- /dev/null
+++ b/src/Components/kafka/example/Kafka/Test/TestConsumerWorkerman.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KafkaApp\Kafka\Test;
+
+use Imi\Bean\Annotation\Bean;
+use Imi\Kafka\Annotation\Consumer;
+use Imi\Kafka\Base\BaseConsumer;
+use Imi\Redis\Redis;
+use longlang\phpkafka\Consumer\ConsumeMessage;
+
+/**
+ * @Bean("TestConsumerWorkerman")
+ *
+ * @Consumer(topic="queue-imi-1", groupId="test-consumer-workerman")
+ */
+class TestConsumerWorkerman extends BaseConsumer
+{
+    /**
+     * 消费任务
+     */
+    protected function consume(ConsumeMessage $message): void
+    {
+        $data = json_decode($message->getValue(), true);
+        var_dump(__CLASS__, $message->getValue());
+        Redis::set('imi-kafka:consume:1:' . $data['memberId'], $message->getValue());
+    }
+}
diff --git a/src/Components/kafka/example/Process/SwooleTestProcess.php b/src/Components/kafka/example/Process/SwooleTestProcess.php
index 08d04c97aa..8f8412b388 100644
--- a/src/Components/kafka/example/Process/SwooleTestProcess.php
+++ b/src/Components/kafka/example/Process/SwooleTestProcess.php
@@ -19,9 +19,9 @@
 class SwooleTestProcess extends BaseProcess
 {
     /**
-     * @Inject("TestConsumer")
+     * @Inject("TestConsumerSwoole")
      *
-     * @var \KafkaApp\Kafka\Test\TestConsumer
+     * @var \KafkaApp\Kafka\Test\TestConsumerSwoole
      */
     protected $testConsumer;
 
diff --git a/src/Components/kafka/example/Process/WorkermanTestProcess.php b/src/Components/kafka/example/Process/WorkermanTestProcess.php
index f3265a1ee0..93047f6baa 100644
--- a/src/Components/kafka/example/Process/WorkermanTestProcess.php
+++ b/src/Components/kafka/example/Process/WorkermanTestProcess.php
@@ -17,9 +17,9 @@
 class WorkermanTestProcess extends BaseProcess
 {
     /**
-     * @Inject("TestConsumer")
+     * @Inject("TestConsumerWorkerman")
      *
-     * @var \KafkaApp\Kafka\Test\TestConsumer
+     * @var \KafkaApp\Kafka\Test\TestConsumerWorkerman
      */
     protected $testConsumer;