From b75204e53eb3b104ea774527703cd5e7c4fac802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Wed, 5 Apr 2023 14:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Base/Model.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Base/Model.php b/Base/Model.php
index 89e4c69..942c334 100644
--- a/Base/Model.php
+++ b/Base/Model.php
@@ -108,13 +108,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 * @param array $config
 	 * @throws Exception
 	 */
-	public function __construct(array $config = [])
-	{
-		parent::__construct($config);
-
-		$this->overrideGetter = Kiri::getDi()->get(Getter::class);
-		$this->overrideSetter = Kiri::getDi()->get(Setter::class);
-	}
+//	public function __construct(array $config = [])
+//	{
+//		parent::__construct($config);
+//	}
 
 
 	/**
@@ -834,9 +831,9 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (method_exists($this, $method)) {
 			$this->{$method}($value);
 		} else {
-			$value = $this->overrideSetter->override($this, $name, $value);
+			$overrideSetter = Kiri::getDi()->get(Setter::class);
 
-			$this->_attributes[$name] = $value;
+			$this->_attributes[$name] = $overrideSetter->override($this, $name, $value);
 		}
 	}
 
@@ -868,7 +865,9 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 			$value = $this->_attributes[$name] ?? NULL;
 		}
 
-		return $this->overrideGetter->override($this, $name, $value);
+		$overrideGetter = Kiri::getDi()->get(Getter::class);
+
+		return $overrideGetter->override($this, $name, $value);
 	}