Merge pull request #1 from ruesin/change_config

Change config

Author: ruesin

.gitignore

@@ -2,8 +2,5 @@
 vendor/
 composer.lock
 runtime/*
-config/constants.php
-config/redis.php
-config/secrets.php
-config/server.php
+config/*.php
 test.php

README.md

@@ -1,4 +1,4 @@
-# delay-queue
+# delay-server-single
 基于 Redis 实现的延时队列，只提供简单的延时能力，不负责业务相关队列，需要在创建队列时提供业务队列的连接信息，消息到期时自动将消息移动到业务队列。
 
 ## 依赖
@@ -15,7 +15,7 @@ $ composer create-project --prefer-dist ruesin/delay-server-single
 
 ## 配置
 拷贝`./config/samples/*.php`到`./config/`，并按需修改：
-- `constants.php` 常量定义
+- `queue.php` 队列定义
 - `redis.php` Redis服务器配置
 - `secrets.php` 验证签名的密钥对
 - `server.php` 服务启动的配置文件，参考[swover](https://github.com/ruesin/swover)

app/Handle.php

@@ -27,7 +27,6 @@ public function __construct($request)
      * 创建队列
      *
      * @return string
-     * @throws \Exception
      */
     public function createQueue()
     {
@@ -56,7 +55,6 @@ public function createQueue()
     /**
      * 删除队列
      * @return bool
-     * @throws \Exception
      */
     public function dropQueue()
     {
@@ -71,7 +69,6 @@ public function dropQueue()
     /**
      * 发送消息
      * @return bool|string
-     * @throws \Exception
      */
     public function addMessage()
     {

app/Utils/Config.php

@@ -1,20 +1,22 @@
 <?php
 namespace App\Utils;
 
+use Swover\Utils\Config;
+
 class Queue
 {
     public static function queueListName()
     {
-        return QUEUE_LIST;
+        return Config::get('queue.list_name');
     }
 
     public static function queueInfoName()
     {
-        return QUEUE_INFO;
+        return Config::get('queue.info_name');
     }
 
     public static function delayName($queue_name)
     {
-        return $queue_name.DELAY_SUFFIX;
+        return $queue_name.Config::get('queue.delay_suffix');
     }
 }

app/Utils/Queue.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Utils;
 
 /**
@@ -59,7 +60,7 @@ public static function instance($config = [])
     public static function close($config = [])
     {
         $config = self::getConfig($config);
-        $name   = self::configToName($config);
+        $name = self::configToName($config);
 
         if (isset(self::$_instance[$name])) {
             self::$_instance[$name]->quit();
@@ -71,10 +72,10 @@ public static function close($config = [])
 
     private static function getConfig($config)
     {
-        if(!empty($config)) {
+        if (!empty($config)) {
             return $config;
         }
-        return Config::get('redis');
+        return \Swover\Utils\Config::get('redis');
     }
 
     private static function configToName($config)

app/Utils/Redis.php

@@ -40,7 +40,7 @@ public static function verify($request)
 
     private static function secret($secretId)
     {
-        $secrets = Config::get('secrets');
+        $secrets = \Swover\Utils\Config::get('secrets');
         return isset($secrets[$secretId]) ? $secrets[$secretId] : false;
     }
 }

app/Utils/Sign.php

@@ -0,0 +1,4 @@
+<?php
+(function () {
+    \Swover\Utils\Config::loadPath(ROOT_DIR.'/config/');
+})();

common/helpers.php

@@ -11,15 +11,18 @@
         }
     ],
     "require": {
-        "ruesin/swover": "^1.0",
+        "ruesin/swover": "^1.1",
         "predis/predis": "1.1.1",
         "php": ">=7.0",
         "ext-json" : "*"
     },
     "autoload": {
         "psr-4": {
             "App\\": "app/"
-        }
+        },
+        "files": [
+            "common/helpers.php"
+        ]
     },
     "prefer-stable": true,
     "scripts": {