Merge branch 'master' of https://github.com/swoft-cloud/swoft-framework

Author: stelin

src/Bootstrap/Server/AbstractServer.php

@@ -271,7 +271,7 @@ public function initSettings()
     protected function getListenTcpSetting(): array
     {
         $listenTcpSetting = $this->tcpSetting;
-        unset($listenTcpSetting['host'], $listenTcpSetting['port'], $listenTcpSetting['model'], $listenTcpSetting['type']);
+        unset($listenTcpSetting['host'], $listenTcpSetting['port'], $listenTcpSetting['mode'], $listenTcpSetting['type']);
         return $listenTcpSetting;
     }
 

test/Testing/Pool/ConsulEnvConfig.php

@@ -4,7 +4,7 @@
 
 use Swoft\Bean\Annotation\Bean;
 use Swoft\Bean\Annotation\Value;
-use Swoft\Pool\Provider\ProviderInterface;
+use Swoft\Sg\Provider\ProviderInterface;
 
 /**
  * the properties of config

test/config/server.php

@@ -10,15 +10,15 @@
     'tcp'     => [
         'host'               => env('TCP_HOST', '0.0.0.0'),
         'port'               => env('TCP_PORT', 8099),
-        'model'              => env('TCP_MODEL', SWOOLE_PROCESS),
+        'mode'              => env('TCP_MODE', SWOOLE_PROCESS),
         'type'               => env('TCP_TYPE', SWOOLE_SOCK_TCP),
         'package_max_length' => env('TCP_PACKAGE_MAX_LENGTH', 2048),
         'open_eof_check'     => env('TCP_OPEN_EOF_CHECK', false),
     ],
     'http'    => [
         'host'  => env('HTTP_HOST', '0.0.0.0'),
         'port'  => env('HTTP_PORT', 80),
-        'model' => env('HTTP_MODEL', SWOOLE_PROCESS),
+        'mode' => env('HTTP_MODE', SWOOLE_PROCESS),
         'type'  => env('HTTP_TYPE', SWOOLE_SOCK_TCP),
     ],
     'crontab' => [