冲突修复

common/config/redis-local.php

@@ -8,12 +8,8 @@ return [
 //    'database' => 0,
 //    'password' => 'redis12078',
 
-//    'hostname'	=> '139.196.43.170',
-//    'port' => 6378,
-//    'database' => 0,
-//    'password' => 'airent-redis~123',
-    'hostname'	=> '127.0.0.1',
-    'port' => 6379,
+    'hostname'	=> '139.196.43.170',
+    'port' => 6378,
     'database' => 0,
-    'password' => 'redis',
+    'password' => 'airent-redis~123',
 ];