From 824d7fbd2ea0f14687e1d6a44ba997bc19cb26b7 Mon Sep 17 00:00:00 2001
From: Ying <coolsec@foxmail.com>
Date: Thu, 22 Jun 2023 17:44:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dredis=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=BA=E5=88=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/redis.php    | 8 ++++----
 support/helpers.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/redis.php b/config/redis.php
index 21e3dcd..95562be 100644
--- a/config/redis.php
+++ b/config/redis.php
@@ -14,10 +14,10 @@
 
 return [
     'default' => [
-        'host'     => get_env('CACHE_HOSTNAME') ?? '127.0.0.1',
-        'password' => get_env('REDIS_PASSWORD'),
-        'port'     => get_env('CACHE_HOSTPORT') ?? 6379,
-        'database' => get_env('CACHE_SELECT') ?? 0,
+        'host'     => get_env('CACHE_HOSTNAME', '127.0.0.1'),
+        'password' => get_env('REDIS_PASSWORD', null),
+        'port'     => (int)get_env('CACHE_HOSTPORT',6379),
+        'database' => get_env('CACHE_SELECT', 0),
         'prefix'   => 'redis_',
         'expire'   => 0,
     ],
diff --git a/support/helpers.php b/support/helpers.php
index bc1094d..44be51e 100644
--- a/support/helpers.php
+++ b/support/helpers.php
@@ -140,7 +140,7 @@ if (!function_exists('get_env')) {
     /**
      * Get environment variable
      */
-    function get_env($var)
+    function get_env($var, $default = '')
     {
         $dir = str_replace('\\', '/', realpath(__DIR__ . '/../'));
         $env_path = $dir . '/.env';
@@ -148,7 +148,7 @@ if (!function_exists('get_env')) {
         if (is_file($env_path) && !$env_info) {
             $env_info = parse_ini_file($env_path, true);
         }
-        return $env_info[$var] ?? '';
+        return $env_info[$var] ?? $default;
     }
 }