Revert "改名"

This reverts commit fdf58326

Annotation/Get.php

@@ -13,7 +13,7 @@ use Exception;
  * Class Get
  * @package Annotation\Model
  */
-#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Annotation\Attribute
+#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Kiri\Annotation\Attribute
 {
 
 

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,8 @@ 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\Events\OnBeforeCommandExecute;
 
 /**
  * Class DatabasesProviders
@@ -26,7 +26,7 @@ class DatabasesProviders extends Providers
 	 */
 	public function onImport(Application $application)
 	{
-		$this->eventProvider->on(OnWorkerStart::class, [$this, 'createPool']);
+		$this->eventProvider->on(OnBeforeCommandExecute::class, [$this, 'createPool']);
 	}
 
 
@@ -45,7 +45,7 @@ class DatabasesProviders extends Providers
 	 * @throws ConfigException
 	 * @throws Exception
 	 */
-	public function createPool(OnWorkerStart $onWorkerStart)
+	public function createPool(OnBeforeCommandExecute $onWorkerStart)
 	{
 		$databases = Config::get('databases.connections', []);
 		if (empty($databases)) {
@@ -56,7 +56,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

@@ -3,10 +3,11 @@
 namespace Database\Mysql;
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
-use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
+use Kiri\Events\EventProvider;
 use Kiri\Pool\StopHeartbeatCheck;
+use Kiri\Server\Events\OnWorkerExit;
 use PDOStatement;
 use Swoole\Timer;
 
@@ -38,6 +39,9 @@ class PDO implements StopHeartbeatCheck
 	public int $read_timeout;
 
 
+	private EventProvider $eventProvider;
+
+
 	public array $attributes = [];
 
 
@@ -57,9 +61,14 @@ class PDO implements StopHeartbeatCheck
 	}
 
 
-	public function init()
+	/**
+	 * @return void
+	 */
+	public function init(): void
 	{
 		$this->heartbeat_check();
+		$this->eventProvider = Kiri::getDi()->get(EventProvider::class);
+		$this->eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
 	}
 
 
@@ -72,14 +81,21 @@ class PDO implements StopHeartbeatCheck
 	}
 
 
+	/**
+	 * @param Kiri\Server\Events\OnWorkerExit $exit
+	 * @return void
+	 */
+	public function onWorkerExit(OnWorkerExit $exit)
+	{
+		$this->stopHeartbeatCheck();
+	}
+
+
 	/**
 	 *
 	 */
 	public function heartbeat_check(): void
 	{
-		if (env('state', 'start') == 'exit') {
-			return;
-		}
 		if ($this->_timer === -1) {
 			$this->_timer = Timer::tick(1000, fn() => $this->waite());
 		}
@@ -92,12 +108,14 @@ class PDO implements StopHeartbeatCheck
 	private function waite(): void
 	{
 		try {
-			if (env('state', 'start') == 'exit') {
-				Kiri::getDi()->get(Logger::class)->critical('timer end');
+			if ($this->_timer == -1) {
 				$this->stopHeartbeatCheck();
 			}
 			if (time() - $this->_last > (int)Config::get('databases.pool.tick', 60)) {
 				$this->stopHeartbeatCheck();
+
+				$this->eventProvider->off(OnWorkerExit::class, [$this, 'stopHeartbeatCheck']);
+
 				$this->pdo = null;
 			}
 		} catch (\Throwable $throwable) {
@@ -232,7 +250,7 @@ class PDO implements StopHeartbeatCheck
 				throw new Exception($this->_pdo()->errorInfo()[1]);
 			}
 			return $this->bindValue($statement, $params);
-		} catch (\PDOException | \Throwable $throwable) {
+		} catch (\PDOException|\Throwable $throwable) {
 			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
 				$this->pdo = null;
 
@@ -313,7 +331,7 @@ class PDO implements StopHeartbeatCheck
 		$link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 		$link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
 		$link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
-		if (!empty($this->attributes) && is_array($this->attributes)) {
+		if (!empty($this->attributes)) {
 			foreach ($this->attributes as $key => $attribute) {
 				$link->setAttribute($key, $attribute);
 			}

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;
 
 /**