Merge branch 'master' into upgrade-1.1

Author: limingxinleo

.env.example

@@ -11,6 +11,6 @@ DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
 
 REDIS_HOST=localhost
-REDIS_AUTH=
+REDIS_AUTH=(null)
 REDIS_PORT=6379
 REDIS_DB=0

app/Controller/Controller.php renamed to app/Controller/AbstractController.php

@@ -12,31 +12,28 @@
 
 namespace App\Controller;
 
+use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 use Psr\Container\ContainerInterface;
 
-abstract class Controller
+abstract class AbstractController
 {
     /**
+     * @Inject
      * @var ContainerInterface
      */
     protected $container;
 
     /**
+     * @Inject
      * @var RequestInterface
      */
     protected $request;
 
     /**
+     * @Inject
      * @var ResponseInterface
      */
     protected $response;
-
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-        $this->request = $container->get(RequestInterface::class);
-        $this->response = $container->get(ResponseInterface::class);
-    }
 }

app/Controller/IndexController.php

@@ -12,7 +12,7 @@
 
 namespace App\Controller;
 
-class IndexController extends Controller
+class IndexController extends AbstractController
 {
     public function index()
     {

config/autoload/redis.php

@@ -13,7 +13,7 @@
 return [
     'default' => [
         'host' => env('REDIS_HOST', 'localhost'),
-        'auth' => env('REDIS_AUTH', ''),
+        'auth' => env('REDIS_AUTH', null),
         'port' => (int) env('REDIS_PORT', 6379),
         'db' => (int) env('REDIS_DB', 0),
         'pool' => [