From a4b454e83dbcb789cf749817eaffac408bce439b Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Wed, 23 Sep 2020 20:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE--=E5=8E=BB=E6=8E=89redis=E7=9A=84=E5=89=8D=E7=BC=80?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E9=9A=90=E8=97=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/GoodsActivityController.php | 2 +-
 app/Admin/Forms/v3/GoodsActivitySettingForm.php      | 2 +-
 config/database.php                                  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index 620c1aa..395a34b 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -89,7 +89,7 @@ class GoodsActivityController extends AdminController
             // 每页10条
             $grid->paginate(10);
 
-            $grid->tools([new GoodsActivitySetting()]);
+            // $grid->tools([new GoodsActivitySetting()]);
         });
     }
 
diff --git a/app/Admin/Forms/v3/GoodsActivitySettingForm.php b/app/Admin/Forms/v3/GoodsActivitySettingForm.php
index d4811df..d032dd3 100644
--- a/app/Admin/Forms/v3/GoodsActivitySettingForm.php
+++ b/app/Admin/Forms/v3/GoodsActivitySettingForm.php
@@ -43,7 +43,7 @@ class GoodsActivitySettingForm extends Form
      */
     public function form()
     {
-        $data = Redis::hgetall('activity_type_limit_nums');
+        $data = Redis::hgetall(RedisKey::ACTIVITY_TYPE_LIMIT_NUMS);
 
         $flashSale = isset($data['flash_sale'])?$data['flash_sale']:0;
         $groupBuy= isset($data['group_buy'])?$data['group_buy']:0;
diff --git a/config/database.php b/config/database.php
index ebef13f..079b4a5 100644
--- a/config/database.php
+++ b/config/database.php
@@ -143,7 +143,8 @@ return [
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
-            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+            // 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+            'prefix' => env('REDIS_PREFIX', ''),
         ],
 
         'default' => [