Merge pull request #6 from gaobinzhan/2.1.x

up: adapting redis-pool

Author: Player626

README.md

@@ -1,4 +1,17 @@
 # Queue
+
+## 安装
+
+```bash
+composer require easyswoole/queue 2.1.x
+```
+
+版本要求：
+
+`easyswoole/redis-pool:~2.2.0`
+
+## 使用
+
 ```php
 <?php
 /**
@@ -12,16 +25,18 @@ include "./vendor/autoload.php";
 
 go(function (){
     //queue组件会自动强制进行序列化
-    \EasySwoole\RedisPool\Redis::getInstance()->register('queue',new \EasySwoole\Redis\Config\RedisConfig(
+    \EasySwoole\RedisPool\RedisPool::getInstance()->register(new \EasySwoole\Redis\Config\RedisConfig(
         [
             'host'      => '127.0.0.1',
             'port'      => '6379',
             'auth'      => 'easyswoole',
         ]
-    ));
-    $redisPool = \EasySwoole\RedisPool\Redis::getInstance()->get('queue');
+    ), 'queue');
+    $redisPool = \EasySwoole\RedisPool\RedisPool::getInstance()->getPool('queue');
     $driver = new \EasySwoole\Queue\Driver\Redis($redisPool,'queue');
     $queue = new EasySwoole\Queue\Queue($driver);
+
+    // 生产者
     go(function ()use($queue){
         while (1){
             $job = new \EasySwoole\Queue\Job();
@@ -32,14 +47,15 @@ go(function (){
             \co::sleep(3);
         }
     });
+    
+    // 消费者
     go(function ()use($queue){
         $queue->consumer()->listen(function (\EasySwoole\Queue\Job $job){
             echo "job1 data:".$job->getJobData().PHP_EOL;
         });
     });
 
 
-
     $driver = new \EasySwoole\Queue\Driver\Redis($redisPool,'queue2');
     $queue2 = new EasySwoole\Queue\Queue($driver);
     go(function ()use($queue2){

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "ext-swoole": ">=4.4.0",
         "easyswoole/component": "^2.0",
-        "easyswoole/redis-pool": "^2.0.7"
+        "easyswoole/redis-pool": "~2.2.0"
     },
     "require-dev": {
         "easyswoole/swoole-ide-helper": "^1.0"

src/Driver/Redis.php

@@ -7,14 +7,14 @@
 use EasySwoole\Queue\Job;
 use EasySwoole\Queue\QueueDriverInterface;
 use EasySwoole\Redis\Redis as Connection;
-use EasySwoole\RedisPool\RedisPool;
+use EasySwoole\RedisPool\Pool;
 
 class Redis implements QueueDriverInterface
 {
 
     protected $pool;
     protected $queueName;
-    public function __construct(RedisPool $pool,string $queueName = 'easy_queue')
+    public function __construct(Pool $pool,string $queueName = 'easy_queue')
     {
         $this->pool = $pool;
         $this->queueName = $queueName;