废弃 AMQP Connection 注解

doc/base/version/2.1-3.0.md

@@ -2,8 +2,6 @@
 
 [toc]
 
-imi v3.0 是一个全新版本，与 imi v2.1 差异较大，以下是更新内容。
-
 ## 不兼容的更改
 
 ### 框架核心
@@ -12,6 +10,8 @@ imi v3.0 是一个全新版本，与 imi v2.1 差异较大，以下是更新内
 
 ### imi-amqp
 
-* 废弃 `Imi\AMQP\Swoole\AMQPSwooleConnection` 类
-
 * 连接配置项有所增改，参考 [连接配置项](https://doc.imiphp.com/v3.0/components/mq/amqp.html#%E8%BF%9E%E6%8E%A5%E9%85%8D%E7%BD%AE%E9%A1%B9)
+
+* 废弃 `Imi\AMQP\Swoole\AMQPSwooleConnection` 客户端类
+
+* 废弃 `Imi\AMQP\Annotation\Connection` 注解类

src/Components/amqp/example/AMQP/Test/TestConsumer.php

@@ -4,7 +4,6 @@
 
 namespace AMQPApp\AMQP\Test;
 
-use Imi\AMQP\Annotation\Connection;
 use Imi\AMQP\Annotation\Consumer;
 use Imi\AMQP\Annotation\Queue;
 use Imi\AMQP\Base\BaseConsumer;
@@ -14,13 +13,11 @@
 use Imi\Redis\Redis;
 
 /**
- * 启动一个新连接消费.
+ * 使用连接池中的连接消费.
  *
  * @Bean("TestConsumer")
  *
- * @Connection(host=AMQP_SERVER_HOST, port=5672, user="guest", password="guest")
- *
- * @Consumer(tag="tag-imi", queue="queue-imi-1", message=\AMQPApp\AMQP\Test\TestMessage::class)
+ * @Consumer(tag="tag-imi", queue="queue-imi-2", message=\AMQPApp\AMQP\Test\TestMessage::class)
  */
 class TestConsumer extends BaseConsumer
 {

src/Components/amqp/example/AMQP/Test/TestMessage.php

@@ -15,10 +15,17 @@ class TestMessage extends Message
      */
     private $memberId;
 
+    /**
+     * 内容.
+     *
+     * @var string
+     */
+    private $content;
+
     public function __construct()
     {
         parent::__construct();
-        $this->routingKey = 'imi-1';
+        $this->routingKey = 'imi-2';
         $this->format = \Imi\Util\Format\Json::class;
     }
 
@@ -42,6 +49,7 @@ public function getBodyData()
     {
         return [
             'memberId'  => $this->memberId,
+            'content'   => $this->content,
         ];
     }
 
@@ -68,4 +76,28 @@ public function setMemberId(int $memberId)
 
         return $this;
     }
+
+    /**
+     * Get 内容.
+     *
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * Set 内容.
+     *
+     * @param string $content 内容
+     *
+     * @return self
+     */
+    public function setContent(string $content)
+    {
+        $this->content = $content;
+
+        return $this;
+    }
 }

src/Components/amqp/example/AMQP/Test/TestPublisher.php

@@ -4,7 +4,6 @@
 
 namespace AMQPApp\AMQP\Test;
 
-use Imi\AMQP\Annotation\Connection;
 use Imi\AMQP\Annotation\Exchange;
 use Imi\AMQP\Annotation\Publisher;
 use Imi\AMQP\Annotation\Queue;
@@ -14,11 +13,9 @@
 /**
  * @Bean("TestPublisher")
  *
- * @Connection(host=AMQP_SERVER_HOST, port=5672, user="guest", password="guest")
+ * @Publisher(tag="tag-imi", queue="queue-imi-2", exchange="exchange-imi", routingKey="imi-2")
  *
- * @Publisher(tag="tag-imi", queue="queue-imi-1", exchange="exchange-imi", routingKey="imi-1")
- *
- * @Queue(name="queue-imi-1", routingKey="imi-1")
+ * @Queue(name="queue-imi-2", routingKey="imi-2")
  *
  * @Exchange(name="exchange-imi")
  */

src/Components/amqp/example/ApiServer/Controller/IndexController.php

@@ -6,7 +6,6 @@
 
 use AMQPApp\AMQP\QueueTest\QueueTestMessage;
 use AMQPApp\AMQP\Test\TestMessage;
-use AMQPApp\AMQP\Test2\TestMessage2;
 use Imi\Controller\HttpController;
 use Imi\Queue\Facade\Queue;
 use Imi\Queue\Model\Message;
@@ -44,15 +43,10 @@ public function publish(int $memberId = 19260817)
     {
         $message = new TestMessage();
         $message->setMemberId($memberId);
+        $message->setContent('memberId:' . $memberId);
         // @phpstan-ignore-next-line
         $r1 = RequestContext::getBean('TestPublisher')->publish($message);
 
-        $message2 = new TestMessage2();
-        $message2->setMemberId($memberId);
-        $message2->setContent('memberId:' . $memberId);
-        // @phpstan-ignore-next-line
-        $r2 = RequestContext::getBean('TestPublisher2')->publish($message2);
-
         $queueTestMessage = new QueueTestMessage();
         $queueTestMessage->setMemberId($memberId);
         $message = new Message();
@@ -61,7 +55,6 @@ public function publish(int $memberId = 19260817)
 
         return [
             'r1'    => $r1,
-            'r2'    => $r2,
         ];
     }
 
@@ -75,17 +68,15 @@ public function publish(int $memberId = 19260817)
     public function consume($memberId)
     {
         $r1 = Redis::get($key1 = 'imi-amqp:consume:1:' . $memberId);
-        $r2 = Redis::get($key2 = 'imi-amqp:consume:2:' . $memberId);
-        $r3 = Redis::get($key3 = 'imi-amqp:consume:QueueTest:' . $memberId);
-        if (false !== $r1 && false !== $r2 && false !== $r3)
+        $r2 = Redis::get($key2 = 'imi-amqp:consume:QueueTest:' . $memberId);
+        if (false !== $r1 && false !== $r2)
         {
-            Redis::del($key1, $key2, $key3);
+            Redis::del($key1, $key2);
         }
 
         return [
             'r1' => $r1,
             'r2' => $r2,
-            'r3' => $r3,
         ];
     }
 }

src/Components/amqp/example/Process/SwooleTestProcess.php

@@ -4,6 +4,7 @@
 
 namespace AMQPApp\Process;
 
+use AMQPApp\AMQP\Test\TestConsumer;
 use Imi\AMQP\Contract\IConsumer;
 use Imi\Aop\Annotation\Inject;
 use Imi\Event\Event;
@@ -20,30 +21,19 @@ class SwooleTestProcess extends BaseProcess
 {
     /**
      * @Inject("TestConsumer")
-     *
-     * @var \AMQPApp\AMQP\Test\TestConsumer
      */
-    protected $testConsumer;
-
-    /**
-     * @Inject("TestConsumer2")
-     *
-     * @var \AMQPApp\AMQP\Test2\TestConsumer2
-     */
-    protected $testConsumer2;
+    protected TestConsumer $testConsumer;
 
     private bool $running = false;
 
     public function run(\Swoole\Process $process): void
     {
         $this->running = true;
         $this->runConsumer($this->testConsumer);
-        $this->runConsumer($this->testConsumer2);
         $channel = new \Swoole\Coroutine\Channel();
         Event::on('IMI.PROCESS.END', function () use ($channel) {
             $this->running = false;
             $this->testConsumer->close();
-            $this->testConsumer2->close();
             $channel->push(1);
         }, ImiPriority::IMI_MAX);
         $channel->pop();