Merge branch 'goods_copy'

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()]);
         });
     }
 

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;

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' => [