解决冲突

.env

@@ -24,3 +24,9 @@ SYSTEM_NAME=IC业务助手福利中心服务
 //laravels监听IP和端口
 //laravels监听IP和端口
 LARAVELS_LISTEN_IP=0.0.0.0
 LARAVELS_LISTEN_IP=0.0.0.0
 LARAVELS_LISTEN_PORT=61009
 LARAVELS_LISTEN_PORT=61009
+<<<<<<< HEAD
+
+REDIS_HOST=192.168.1.235
+REDIS_PASSWORD=icDb29mLy2s
+REDIS_PORT=6379
+

config/database.php

@@ -138,15 +138,21 @@ return [
 
 
     'redis' => [
     'redis' => [
 
 
-        'client' => 'predis',
-
+        'cluster' => env('REDIS_CLUSTER', false),
         'default' => [
         'default' => [
-            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'host'     => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', 6379),
-            'database' => 0,
+            'port'     => env('REDIS_PORT', 6379),
+            'database' => 0
         ],
         ],
+        'read' =>[
+            'host'     => env('REDIS_READ_HOST', ''),
+            'password' => env('REDIS_READ_PASSWORD', null),
+            'port'     => env('REDIS_READ_PORT', 6379),
+            'database' => 0
+        ]
 
 
     ],
     ],
 
 
+
 ];
 ];