Revert "改名"

This reverts commit fdf58326

Base/Model.php

@@ -27,7 +27,7 @@ use Database\Traits\HasBase;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\ToArray;
 use ReflectionException;
 use ReturnTypeWillChange;

Connection.php

@@ -21,11 +21,11 @@ use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Annotation\Inject;
 use ReflectionException;
-use Server\Events\OnWorkerExit;
-use Server\Events\OnWorkerStop;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStop;
 
 /**
  * Class Connection

DatabasesProviders.php

@@ -9,8 +9,9 @@ use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Providers;
 use Kiri\Application;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Server\Events\OnWorkerStart;
+use Kiri;
+use Kiri\Server\Events\OnTaskerStart;
+use Kiri\Server\Events\OnWorkerStart;
 
 /**
  * Class DatabasesProviders
@@ -27,6 +28,7 @@ class DatabasesProviders extends Providers
 	public function onImport(Application $application)
 	{
 		$this->eventProvider->on(OnWorkerStart::class, [$this, 'createPool']);
+		$this->eventProvider->on(OnTaskerStart::class, [$this, 'createPool']);
 	}
 
 
@@ -45,7 +47,7 @@ class DatabasesProviders extends Providers
 	 * @throws ConfigException
 	 * @throws Exception
 	 */
-	public function createPool(OnWorkerStart $onWorkerStart)
+	public function createPool(OnWorkerStart|OnTaskerStart $onWorkerStart)
 	{
 		$databases = Config::get('databases.connections', []);
 		if (empty($databases)) {
@@ -56,7 +58,7 @@ class DatabasesProviders extends Providers
 		foreach ($databases as $key => $database) {
 			$database = $this->_settings($database);
 
-			$connection = Kiri::getDi()->create(Connection::class, $database);
+			$connection = Kiri::getDi()->create(Connection::class, [$database]);
 			$connection->fill();
 
 			$app->set($key, $connection);

Model.php

@@ -14,7 +14,7 @@ use Database\Base\Getter;
 use Database\Traits\HasBase;
 use Exception;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\ToArray;
 use ReflectionException;
 use Swoole\Coroutine;

Mysql/PDO.php

@@ -5,7 +5,7 @@ namespace Database\Mysql;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
 use PDOStatement;
 use Swoole\Timer;

Traits/Builder.php

@@ -12,7 +12,7 @@ use Database\Query;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 
 

Traits/QueryTrait.php

@@ -18,7 +18,7 @@ use Database\Query;
 use Database\SqlBuilder;
 use Exception;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 
 /**