Merge branch 'dev'

# Conflicts:
#	tests/phpunit

Author: Yurunsoft

README.md

@@ -18,6 +18,8 @@
 - 消费超时机制
 - 失败/超时消息重新消费
 
+> 本仓库仅用于浏览，不接受 issue 和 Pull Requests，请前往：<https://github.com/Yurunsoft/imi>
+
 ## Composer
 
 本项目可以使用composer安装，遵循psr-4自动加载规则，在你的 `composer.json` 中加入下面的内容:
@@ -266,6 +268,6 @@ QQ群：17916227 [![点击加群](https://pub.idqqimg.com/wpa/images/group.png "
 
 ## 捐赠
 
-<img src="https://raw.githubusercontent.com/imiphp/imi-queue/master/res/pay.png"/>
+<img src="https://cdn.jsdelivr.net/gh/Yurunsoft/IMI@dev/res/pay.png"/>
 
 开源不求盈利，多少都是心意，生活不易，随缘随缘……

composer.json

@@ -3,35 +3,28 @@
     "type": "library",
     "license": "MIT",
     "description": "imi 框架的队列组件，使用 Redis 作为持久化",
-    "require": {
-        
-    },
+    "require": {},
     "require-dev": {
-        "yurunsoft/imi": "dev-dev",
-        "phpunit/phpunit": ">=7",
-        "yurunsoft/ide-helper": "~1.0"
+        "yurunsoft/ide-helper": "~1.0",
+        "swoole/ide-helper": "^4.6"
     },
     "autoload": {
-        "psr-4" : {
-            "Imi\\Queue\\" : "src/"
+        "psr-4": {
+            "Imi\\Queue\\": "src/"
         }
     },
     "autoload-dev": {
-        "psr-4" : {
-            "ImiApp\\" : "example/",
-            "Imi\\Queue\\Test\\" : "tests/"
+        "psr-4": {
+            "QueueApp\\": "example/",
+            "Imi\\Queue\\Test\\": "tests/"
         }
     },
-    "scripts": {
-        "test": "./vendor/bin/phpunit -c ./tests/phpunit.xml",
-        "install-test": "php --ri swoole && composer install composer test"
-    },
+    "scripts": {},
     "extra": {
         "ide-helper": {
             "list": [
-                "swoole",
                 "redis"
             ]
         }
     }
-}
+}

example/HttpServer/Main.php

@@ -1,5 +1,6 @@
 <?php
-namespace ImiApp\HttpServer;
+
+namespace QueueApp\HttpServer;
 
 use Imi\Main\BaseMain;
 
@@ -9,5 +10,4 @@ public function __init()
     {
         // 可以做一些初始化操作
     }
-
-}
+}

example/Main.php

@@ -1,5 +1,6 @@
 <?php
-namespace ImiApp;
+
+namespace QueueApp;
 
 use Imi\Main\AppBaseMain;
 
@@ -8,7 +9,5 @@ class Main extends AppBaseMain
     public function __init()
     {
         // 这里可以做一些初始化操作，如果需要的话
-        
     }
-
-}
+}

example/config/beans.php

@@ -3,40 +3,41 @@
 use Imi\Log\LogLevel;
 
 $rootPath = dirname(__DIR__) . '/';
+
 return [
-    'hotUpdate'    =>    [
+    'hotUpdate'    => [
         // 'status'    =>    false, // 关闭热更新去除注释，不设置即为开启，建议生产环境关闭
 
         // --- 文件修改时间监控 ---
         // 'monitorClass'    =>    \Imi\HotUpdate\Monitor\FileMTime::class,
-        'timespan'    =>    1, // 检测时间间隔，单位：秒
+        'timespan'    => 1, // 检测时间间隔，单位：秒
 
         // --- Inotify 扩展监控 ---
         // 'monitorClass'    =>    \Imi\HotUpdate\Monitor\Inotify::class,
         // 'timespan'    =>    1, // 检测时间间隔，单位：秒，使用扩展建议设为0性能更佳
 
         // 'includePaths'    =>    [], // 要包含的路径数组
-        'excludePaths'    =>    [
+        'excludePaths'    => [
             $rootPath . '.git',
             $rootPath . 'bin',
             $rootPath . 'logs',
         ], // 要排除的路径数组，支持通配符*
     ],
-    'Logger'    =>    [
-        'exHandlers'    =>    [
+    'Logger'    => [
+        'exHandlers'    => [
             // info 级别日志不输出trace
             [
-                'class'        =>    \Imi\Log\Handler\File::class,
-                'options'    =>    [
+                'class'        => \Imi\Log\Handler\File::class,
+                'options'      => [
                     'levels'        => [LogLevel::INFO],
                     'fileName'      => dirname(__DIR__) . '/.runtime/logs/{Y}-{m}-{d}.log',
-                    'format'        => "{Y}-{m}-{d} {H}:{i}:{s} [{level}] {message}",
+                    'format'        => '{Y}-{m}-{d} {H}:{i}:{s} [{level}] {message}',
                 ],
             ],
             // 指定级别日志输出trace
             [
-                'class'        =>    \Imi\Log\Handler\File::class,
-                'options'    =>    [
+                'class'        => \Imi\Log\Handler\File::class,
+                'options'      => [
                     'levels'        => [
                         LogLevel::ALERT,
                         LogLevel::CRITICAL,
@@ -49,57 +50,57 @@
                     'fileName'      => dirname(__DIR__) . '/.runtime/logs/{Y}-{m}-{d}.log',
                     'format'        => "{Y}-{m}-{d} {H}:{i}:{s} [{level}] {message}\n{trace}",
                     'traceFormat'   => '#{index}  {call} called at [{file}:{line}]',
-                    'traceMinimum'  =>  true,
+                    'traceMinimum'  => true,
                 ],
-            ]
+            ],
         ],
     ],
-    'AutoRunProcessManager' =>  [
-        'processes' =>  [
+    'AutoRunProcessManager' => [
+        'processes' => [
             // 加入队列消费进程，非必须，你也可以自己写进程消费
             'QueueConsumer',
         ],
     ],
-    'imiQueue'  =>  [
+    'imiQueue'  => [
         // 默认队列
-        'default'   =>  'test1',
+        'default'   => 'test1',
         // 队列列表
-        'list'  =>  [
+        'list'  => [
             // 队列名称
-            'test1' =>  [
+            'test1' => [
                 // 使用的队列驱动
-                'driver'        =>  'RedisQueueDriver',
+                'driver'        => 'RedisQueueDriver',
                 // 消费协程数量
-                'co'            =>  1,
+                'co'            => 1,
                 // 消费进程数量；可能会受进程分组影响，以同一组中配置的最多进程数量为准
-                'process'       =>  1,
+                'process'       => 1,
                 // 消费循环尝试 pop 的时间间隔，单位：秒
-                'timespan'      =>  0.1,
+                'timespan'      => 0.1,
                 // 进程分组名称
-                'processGroup'  =>  'a',
+                'processGroup'  => 'a',
                 // 自动消费
-                'autoConsumer'  =>  true,
+                'autoConsumer'  => true,
                 // 消费者类
-                'consumer'      =>  'AConsumer',
+                'consumer'      => 'AConsumer',
                 // 驱动类所需要的参数数组
-                'config'        =>  [
-                    'poolName'  =>  'redis',
-                    'prefix'    =>  'imi:queue:test:',
-                ]
+                'config'        => [
+                    'poolName'  => 'redis',
+                    'prefix'    => 'imi:queue:test:',
+                ],
             ],
-            'test2' =>  [
-                'driver'        =>  'RedisQueueDriver',
-                'co'            =>  1,
-                'process'       =>  1,
-                'timespan'      =>  0.1,
-                'processGroup'  =>  'b',
-                'autoConsumer'  =>  true,
-                'consumer'      =>  'BConsumer',
-                'config'        =>  [
-                    'poolName'  =>  'redis',
-                    'prefix'    =>  'imi:queue:test:',
-                ]
+            'test2' => [
+                'driver'        => 'RedisQueueDriver',
+                'co'            => 1,
+                'process'       => 1,
+                'timespan'      => 0.1,
+                'processGroup'  => 'b',
+                'autoConsumer'  => true,
+                'consumer'      => 'BConsumer',
+                'config'        => [
+                    'poolName'  => 'redis',
+                    'prefix'    => 'imi:queue:test:',
+                ],
             ],
         ],
     ],
-];
+];

example/config/config.php

@@ -4,44 +4,44 @@
 
 return [
     // 项目根命名空间
-    'namespace'    =>    'ImiApp',
+    'namespace'    => 'QueueApp',
 
     // 配置文件
-    'configs'    =>    [
-        'beans'        =>    __DIR__ . '/beans.php',
+    'configs'    => [
+        'beans'        => __DIR__ . '/beans.php',
     ],
 
     // 扫描目录
-    'beanScan'    =>    [
-        'ImiApp\Consumer',
-        'ImiApp\Listener',
+    'beanScan'    => [
+        'QueueApp\Consumer',
+        'QueueApp\Listener',
     ],
 
     // 组件命名空间
-    'components'    =>  [
-        'Queue'  =>  'Imi\Queue',
+    'components'    => [
+        'Queue'  => 'Imi\Queue',
     ],
 
     // 主服务器配置
-    'mainServer'    =>    [
-        'namespace'     =>    'ImiApp\HttpServer',
-        'type'          =>    Type::HTTP,
-        'host'          =>    '127.0.0.1',
-        'port'          =>    8080,
-        'configs'       =>    [
-            'worker_num'        =>  1,
+    'mainServer'    => [
+        'namespace'     => 'QueueApp\HttpServer',
+        'type'          => Type::HTTP,
+        'host'          => '127.0.0.1',
+        'port'          => 8080,
+        'configs'       => [
+            'worker_num'        => 1,
         ],
     ],
 
     // 连接池配置
-    'pools'    =>    [
-        'redis'    =>    [
+    'pools'    => [
+        'redis'    => [
             'pool' => [
                 // 同步池类名
-                'syncClass'     =>    \Imi\Redis\SyncRedisPool::class,
+                'syncClass'     => \Imi\Redis\SyncRedisPool::class,
                 // 协程池类名
-                'asyncClass'    =>    \Imi\Redis\CoroutineRedisPool::class,
-                'config' => [
+                'asyncClass'    => \Imi\Redis\CoroutineRedisPool::class,
+                'config'        => [
                     // 池子中最多资源数
                     'maxResources' => 10,
                     // 池子中最少资源数
@@ -64,41 +64,40 @@
             ],
             // 数组资源配置
             'resource' => [
-                'host'    =>    '127.0.0.1',
-                'port'    =>    6379,
+                'host'    => imiGetEnv('REDIS_SERVER_HOST', '127.0.0.1'),
+                'port'    => 6379,
                 // 是否自动序列化变量
-                'serialize'    =>    false,
+                'serialize'    => false,
                 // 密码
-                'password'    =>    null,
+                'password'    => null,
                 // 第几个库
-                'db'    =>    0,
+                'db'    => 0,
             ],
             // uri资源配置，以分号;分隔多个，参数使用query参数格式，特殊字符需要转码
         ],
     ],
 
     // 数据库配置
-    'db'    =>    [
+    'db'    => [
         // 数默认连接池名
-        'defaultPool'    =>    'maindb',
+        'defaultPool'    => 'maindb',
     ],
 
     // redis 配置
-    'redis' =>  [
+    'redis' => [
         // 数默认连接池名
-        'defaultPool'   =>  'redis',
+        'defaultPool'   => 'redis',
     ],
 
     // 锁
-    'lock'  =>[
-        'list'  =>  [
-            'redisConnectContextLock' =>  [
-                'class' =>  'RedisLock',
-                'options'   =>  [
-                    'poolName'  =>  'redis',
+    'lock'  => [
+        'list'  => [
+            'redisConnectContextLock' => [
+                'class'     => 'RedisLock',
+                'options'   => [
+                    'poolName'  => 'redis',
                 ],
             ],
         ],
     ],
-
-];
+];