diff --git a/Gii.php b/Gii.php
index edd4017..8f8815a 100644
--- a/Gii.php
+++ b/Gii.php
@@ -253,7 +253,7 @@ class Gii
 		}
 		foreach ($tables as $key => $val) {
 			if (empty($val)) continue;
-			$_tmp = Db::findAllBySql('SHOW FULL FIELDS FROM `' . $this->db->database . '`.' . $val, [], $this->db);
+			$_tmp = Db::connect($this->db)->query('SHOW FULL FIELDS FROM `' . $this->db->database . '`.' . $val, []);
 			if (empty($_tmp)) {
 				continue;
 			}
diff --git a/GiiModel.php b/GiiModel.php
index f9d287c..29ce2bc 100644
--- a/GiiModel.php
+++ b/GiiModel.php
@@ -17,62 +17,62 @@ use function logger;
 class GiiModel extends GiiBase
 {
 
-	public ?string $classFileName;
-	public ?array $visible;
-	public ?array $res;
-	public ?array $fields;
+    public ?string $classFileName;
+    public ?array  $visible;
+    public ?array  $res;
+    public ?array  $fields;
 
-	/**
-	 * GiiModel constructor.
-	 * @param string $classFileName
-	 * @param string $tableName
-	 * @param array $visible
-	 * @param array $res
-	 * @param array $fields
-	 */
-	public function __construct(string $classFileName, string $tableName, array $visible, array $res, array $fields)
-	{
-		$this->classFileName = $classFileName;
-		$this->tableName = $tableName;
-		$this->visible = $visible;
-		$this->res = $res;
-		$this->fields = $fields;
-	}
+    /**
+     * GiiModel constructor.
+     * @param string $classFileName
+     * @param string $tableName
+     * @param array $visible
+     * @param array $res
+     * @param array $fields
+     */
+    public function __construct(string $classFileName, string $tableName, array $visible, array $res, array $fields)
+    {
+        $this->classFileName = $classFileName;
+        $this->tableName = $tableName;
+        $this->visible = $visible;
+        $this->res = $res;
+        $this->fields = $fields;
+    }
 
-	/**
-	 * @throws ReflectionException
-	 * @throws Exception
-	 */
-	public function generate(): string
-	{
-		$class = '';
-		$modelPath = $this->getModelPath();
-		$managerName = $this->classFileName;
+    /**
+     * @throws ReflectionException
+     * @throws Exception
+     */
+    public function generate(): string
+    {
+        $class = '';
+        $modelPath = $this->getModelPath();
+        $managerName = $this->classFileName;
 
-		$namespace = rtrim($modelPath['namespace'], '\\');
+        $namespace = rtrim($modelPath['namespace'], '\\');
 
-		if (file_exists($modelPath['path'] . '/' . $managerName . '.php')) {
-			try {
-				$className = str_replace('\\\\', '\\', "{$modelPath['namespace']}\\{$managerName}");
+        if (file_exists($modelPath['path'] . '/' . $managerName . '.php')) {
+            try {
+                $className = str_replace('\\\\', '\\', "{$modelPath['namespace']}\\{$managerName}");
 
-				$class = Kiri::getDi()->getReflectionClass($className);
+                $class = Kiri::getDi()->getReflectionClass($className);
 
-				$html = '<?php
+                $html = '<?php
 namespace ' . $namespace . ';
 
 ';
-				$imports = $this->getImports($modelPath['path'] . '/' . $managerName . '.php', $class);
-				if (!empty($imports)) {
-					$html .= $imports . PHP_EOL;
-				}
-			} catch (\Throwable $e) {
-				error($e);
-			}
-		}
+                $imports = $this->getImports($modelPath['path'] . '/' . $managerName . '.php', $class);
+                if (!empty($imports)) {
+                    $html .= $imports . PHP_EOL;
+                }
+            } catch (\Throwable $e) {
+                error($e);
+            }
+        }
 
 
-		if (empty($html)) {
-			$html = '<?php
+        if (empty($html)) {
+            $html = '<?php
 namespace ' . $namespace . ';
 
 
@@ -81,16 +81,16 @@ use Kiri\Core\Json;
 use Database\Connection;
 use Database\Model;
 ' . PHP_EOL;
-		}
+        }
 
-		$createSql = $this->setCreateSql($this->tableName);
+        $createSql = $this->setCreateSql($this->tableName);
 
-		if (!str_contains($html, $createSql)) {
-			$html .= '
+        if (!str_contains($html, $createSql)) {
+            $html .= '
 ' . $this->setCreateSql($this->tableName);
-		}
+        }
 
-		$html .= '
+        $html .= '
 
 /**
  * Class ' . $managerName . '
@@ -102,54 +102,54 @@ class ' . $managerName . ' extends Model
 
 ';
 
-		if (!empty($class)) {
-			$html .= $this->getClassProperty($class);
-		}
+        if (!empty($class)) {
+            $html .= $this->getClassProperty($class);
+        }
 
-		$primary = $this->createPrimary($this->fields);
-		if (!empty($primary)) {
-			$html .= $primary . "\n";
-		}
+        $primary = $this->createPrimary($this->fields);
+        if (!empty($primary)) {
+            $html .= $primary . "\n";
+        }
 
-		$html .= $this->createTableName($this->tableName) . "\n";
+        $html .= $this->createTableName($this->tableName) . "\n";
 
-		$html .= $this->createDatabaseSource();
+        $html .= $this->createDatabaseSource();
 
-		$html .= $this->createRules($this->fields);
+        $html .= $this->createRules($this->fields);
 
-		if (is_object($class)) {
-			$html .= $this->getClassMethods($class, ['rules', 'tableName', 'attributes', 'getDb']);
-		} else {
-			$other = $this->generate_json_function($html, $this->fields);
-			if (!empty($other)) {
-				$html .= implode($other);
-			}
-		}
+        if (is_object($class)) {
+            $html .= $this->getClassMethods($class, ['rules', 'tableName', 'attributes', 'getDb']);
+        } else {
+            $other = $this->generate_json_function($html, $this->fields);
+            if (!empty($other)) {
+                $html .= implode($other);
+            }
+        }
 
-		$html .= '
+        $html .= '
 }';
 
-		$file = rtrim($modelPath['path'], '/') . '/' . $managerName . '.php';
-		if (file_exists($file)) {
-			unlink($file);
-		}
+        $file = rtrim($modelPath['path'], '/') . '/' . $managerName . '.php';
+        if (file_exists($file)) {
+            unlink($file);
+        }
 
-		Kiri::writeFile($file, $html);
-		return $managerName . '.php';
-	}
+        Kiri::writeFile($file, $html);
+        return $managerName . '.php';
+    }
 
 
-	/**
-	 * @param $html
-	 * @param $fields
-	 * @return array
-	 */
-	private function generate_json_function($html, $fields): array
-	{
-		$strings = [];
-		foreach ($fields as $field) {
-			if ($field['Type'] === 'json') {
-				$function = '
+    /**
+     * @param $html
+     * @param $fields
+     * @return array
+     */
+    private function generate_json_function($html, $fields): array
+    {
+        $strings = [];
+        foreach ($fields as $field) {
+            if ($field['Type'] === 'json') {
+                $function = '
 	/**
 	 * @param array|null $value
 	 * @return int|bool|string
@@ -164,7 +164,7 @@ class ' . $managerName . ' extends Model
 	}
 	';
 
-				$get_function = '
+                $get_function = '
 	/**
 	 * @param string|null $value
 	 * @return array|null|bool
@@ -178,87 +178,87 @@ class ' . $managerName . ' extends Model
 	}
 	';
 
-				if (!str_contains($html, 'set' . ucfirst($field['Field']) . 'Attribute')) {
-					$strings[] = $function;
-				}
+                if (!str_contains($html, 'set' . ucfirst($field['Field']) . 'Attribute')) {
+                    $strings[] = $function;
+                }
 
-				if (!str_contains($html, 'get' . ucfirst($field['Field']) . 'Attribute')) {
-					$strings[] = $get_function;
-				}
-			}
-		}
+                if (!str_contains($html, 'get' . ucfirst($field['Field']) . 'Attribute')) {
+                    $strings[] = $get_function;
+                }
+            }
+        }
 
-		return $strings;
-	}
+        return $strings;
+    }
 
 
-	/**
-	 * @param $field
-	 * @return string
-	 * 创建表名称
-	 */
-	private function createTableName($field): string
-	{
+    /**
+     * @param $field
+     * @return string
+     * 创建表名称
+     */
+    private function createTableName($field): string
+    {
 
-		$prefixed = $this->db->tablePrefix;
-		if (!empty($prefixed)) {
-			if (str_starts_with($field, $prefixed)) {
-				$field = str_replace($prefixed, '', $field);
-			}
-		}
+        $prefixed = $this->db->tablePrefix;
+        if (!empty($prefixed)) {
+            if (str_starts_with($field, $prefixed)) {
+                $field = str_replace($prefixed, '', $field);
+            }
+        }
 
-		return '
+        return '
     /**
      * @inheritdoc
      */
     protected string $table = \'' . $field . '\';
 ';
-	}
+    }
 
-	/**
-	 * @param $fields
-	 * @return string
-	 * 创建效验规则
-	 */
-	private function createRules($fields): string
-	{
-		$data = [];
-		foreach ($fields as $key => $val) {
-			if ($val['Extra'] == 'auto_increment') continue;
-			$type = preg_replace('/\(.*?\)|\s+\w+/', '', $val['Type']);
-			foreach ($this->type as $_key => $_val) {
-				if (in_array($type, $_val)) {
-					$type = lcfirst(str_replace('get', '', $_key));
-					break;
-				}
-			}
-			$data[$type][] = $val;
-		}
+    /**
+     * @param $fields
+     * @return string
+     * 创建效验规则
+     */
+    private function createRules($fields): string
+    {
+        $data = [];
+        foreach ($fields as $key => $val) {
+            if ($val['Extra'] == 'auto_increment') continue;
+            $type = preg_replace('/\(.*?\)|\s+\w+/', '', $val['Type']);
+            foreach ($this->type as $_key => $_val) {
+                if (in_array($type, $_val)) {
+                    $type = lcfirst(str_replace('get', '', $_key));
+                    break;
+                }
+            }
+            $data[$type][] = $val;
+        }
 
-		$_field_one = '';
-		$required = $this->getRequired($fields);
-		if (!empty($required)) {
-			$_field_one .= $required;
-		}
-		foreach ($data as $key => $val) {
-			$field = '[\'' . implode('\', \'', array_column($val, 'Field')) . '\']';
-			if (count($val) == 1) {
-				$field = '[\'' . current($val)['Field'] . '\']';
-			}
-			$_field_one .= '
+        $_field_one = '';
+        $required = $this->getRequired($fields);
+        if (!empty($required)) {
+            $_field_one .= $required;
+        }
+        foreach ($data as $key => $val) {
+            $field = '[\'' . implode('\', \'', array_column($val, 'Field')) . '\']';
+            if (count($val) == 1) {
+                $field = '[\'' . current($val)['Field'] . '\']';
+            }
+            $_field_one .= '
 			[' . $field . ', \'' . $key . '\'],';
-		}
-		foreach ($data as $key => $val) {
-			$length = $this->getLength($val);
-			if (!empty($length)) {
-				$_field_one .= $length . ',';
-			}
-		}
-		$required = $this->getUnique($fields);
-		if (!empty($required)) {
-			$_field_one .= $required;
-		}
-		return '
+        }
+        foreach ($data as $key => $val) {
+            $length = $this->getLength($val);
+            if (!empty($length)) {
+                $_field_one .= $length . ',';
+            }
+        }
+        $required = $this->getUnique($fields);
+        if (!empty($required)) {
+            $_field_one .= $required;
+        }
+        return '
 	/**
 	 * @return array
 	 */
@@ -268,139 +268,139 @@ class ' . $managerName . ' extends Model
         ];
     }
 ';
-	}
+    }
 
-	/**
-	 * @param $val
-	 * @return string
-	 */
-	public function getLength($val): string
-	{
-		$data = [];
-		foreach ($val as $key => $_val) {
-			$preg = preg_match('/(\w+)\((.*?)\)/', $_val['Type'], $results);
-			if ($preg && isset($results[2])) {
-				$results[] = $_val['Field'];
+    /**
+     * @param $val
+     * @return string
+     */
+    public function getLength($val): string
+    {
+        $data = [];
+        foreach ($val as $key => $_val) {
+            $preg = preg_match('/(\w+)\((.*?)\)/', $_val['Type'], $results);
+            if ($preg && isset($results[2])) {
+                $results[] = $_val['Field'];
 
-				$data[$results[2]][] = $results;
-			}
-		}
-		if (empty($data)) return '';
-		$string = [];
-		foreach ($data as $key => $_val) {
-			if (in_array($_val[0][1], $this->type['float'])) {
-				$e_x = explode(',', $key);
-				$key = '\'round\' => ' . $e_x[1] . ', \'maxLength\' => ' . ((int)$e_x[0] + 1);
-			} else if (is_string($key) && str_contains($key, ',')) {
-			} else {
-				$key = '\'maxLength\' => ' . $key;
-			}
-			$string[] = '
-			[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . ($_val[0][1] == 'enum' ? '\'enum\' => [' . $key .']' : $key) . ']';
-		}
-		return implode(',', $string);
-	}
+                $data[$results[2]][] = $results;
+            }
+        }
+        if (empty($data)) return '';
+        $string = [];
+        foreach ($data as $key => $_val) {
+            if (in_array($_val[0][1], $this->type['float'])) {
+                $e_x = explode(',', $key);
+                $key = '\'round\' => ' . $e_x[1] . ', \'maxLength\' => ' . ((int)$e_x[0] + 1);
+            } else if (is_string($key) && str_contains($key, ',')) {
+            } else {
+                $key = '\'maxLength\' => ' . $key;
+            }
+            $string[] = '
+			[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . ($_val[0][1] == 'enum' ? '\'enum\' => [' . $key . ']' : $key) . ']';
+        }
+        return implode(',', $string);
+    }
 
-	/**
-	 * @param $fields
-	 * @return string
-	 */
-	public function getUnique($fields): string
-	{
-		$data = [];
-		foreach ($fields as $_val) {
-			if ($_val['Extra'] == 'auto_increment') continue;
-			if (str_contains($_val['Type'], 'unique')) {
-				$data[] = $_val['Field'];
-			}
-		}
-		if (empty($data)) {
-			return '';
-		}
-		return '
+    /**
+     * @param $fields
+     * @return string
+     */
+    public function getUnique($fields): string
+    {
+        $data = [];
+        foreach ($fields as $_val) {
+            if ($_val['Extra'] == 'auto_increment') continue;
+            if (str_contains($_val['Type'], 'unique')) {
+                $data[] = $_val['Field'];
+            }
+        }
+        if (empty($data)) {
+            return '';
+        }
+        return '
 			[[\'' . implode('\', \'', $data) . '\'], \'unique\'],';
-	}
+    }
 
-	/**
-	 * @param $val
-	 * @return string
-	 */
-	public function getRequired($val): string
-	{
-		$data = [];
-		foreach ($val as $_key => $_val) {
-			if ($_val['Extra'] == 'auto_increment') continue;
-			if ($_val['Key'] == 'PRI' || $_val['Key'] == 'UNI' || $this->checkIsRequired($_val) === 'true') {
-				$data[] = $_val['Field'];
-			}
-		}
-		if (empty($data)) {
-			return '';
-		}
-		return '
+    /**
+     * @param $val
+     * @return string
+     */
+    public function getRequired($val): string
+    {
+        $data = [];
+        foreach ($val as $_key => $_val) {
+            if ($_val['Extra'] == 'auto_increment') continue;
+            if ($_val['Key'] == 'PRI' || $_val['Key'] == 'UNI' || $this->checkIsRequired($_val) === 'true') {
+                $data[] = $_val['Field'];
+            }
+        }
+        if (empty($data)) {
+            return '';
+        }
+        return '
 			[[\'' . implode('\', \'', $data) . '\'], \'required\'],';
-	}
+    }
 
-	/**
-	 * 用来生成文档的
-	 * 格式
-	 * @param $fields
-	 * @return null|string
-	 * array(
-	 *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
-	 *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
-	 *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
-	 *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
-	 *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
-	 *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
-	 * )
-	 */
-	private function createPrimary($fields): ?string
-	{
-		$field = $this->getPrimaryKey($fields);
-		if (empty($field)) {
-			return null;
-		}
-		return '
+    /**
+     * 用来生成文档的
+     * 格式
+     * @param $fields
+     * @return null|string
+     * array(
+     *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
+     *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
+     *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
+     *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
+     *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
+     *      'field' ,'字段類型' ,'是否必填' ,'字段长度' , '字段解释',
+     * )
+     */
+    private function createPrimary($fields): ?string
+    {
+        $field = $this->getPrimaryKey($fields);
+        if (empty($field)) {
+            return null;
+        }
+        return '
 	/**
 	 * @var string|null 
 	 */
 	protected ?string $primary = \'' . $field . '\';';
-	}
+    }
 
-	/**
-	 * @return string
-	 */
-	private function createDatabaseSource(): string
-	{
-		return '
+    /**
+     * @return string
+     */
+    private function createDatabaseSource(): string
+    {
+        return '
     /**
 	 * @var string
 	 */
     protected string $connection = \'' . $this->db->id . '\';
 ';
-	}
+    }
 
-	/**
-	 * @param $table
-	 * @return string
-	 * @throws Exception
-	 */
-	private function setCreateSql($table): string
-	{
-		if (isset(Gii::$createSqls[$table])) {
-			return Gii::$createSqls[$table];
-		}
+    /**
+     * @param $table
+     * @return string
+     * @throws Exception
+     */
+    private function setCreateSql($table): string
+    {
+        if (isset(Gii::$createSqls[$table])) {
+            return Gii::$createSqls[$table];
+        }
 
-		$text = Db::showCreateSql($table, $this->db)['Create Table'] ?? '';
+        $text = Db::connect($this->db)->one('SHOW CREATE TABLE `'.$this->db->database. '`.`' . $table.'`')['Create Table'] ?? '';
 
-		$_tmp = [];
-		foreach (explode(PHP_EOL, $text) as $val) {
-			$_tmp[] = '// ' . $val;
-		}
+        $_tmp = [];
+        foreach (explode(PHP_EOL, $text) as $val) {
+            $_tmp[] = '// ' . $val;
+        }
 
-		return Gii::$createSqls[$table] = implode(PHP_EOL, $_tmp);
-	}
+        return Gii::$createSqls[$table] = implode(PHP_EOL, $_tmp);
+    }
 
 
 }