改名

Database/Db.php

@@ -261,7 +261,7 @@ class Db implements ISqlBuilder
 		if (empty($db)) {
 			$db = Snowflake::app()->get('db');
 		}
-		return $db->createCommand('DROP TABLE ' . $table)->delete();
+		return $db->createCommand('DROP TABLE `' . $db->database . '`.' . $table)->delete();
 	}
 
 	/**
@@ -277,7 +277,7 @@ class Db implements ISqlBuilder
 			$db = Snowflake::app()->get('db');
 		}
 
-		return $db->createCommand('TRUNCATE ' . $table)->exec();
+		return $db->createCommand('TRUNCATE `' . $db->database . '`.' . $table)->exec();
 	}
 
 	/**
@@ -298,7 +298,7 @@ class Db implements ISqlBuilder
 			return null;
 		}
 
-		return $db->createCommand('SHOW CREATE TABLE ' . $table)->one();
+		return $db->createCommand('SHOW CREATE TABLE `' . $db->database . '`.' . $table)->one();
 	}
 
 	/**
@@ -317,7 +317,7 @@ class Db implements ISqlBuilder
 			return null;
 		}
 
-		return $db->createCommand('SHOW FULL FIELDS FROM ' . $table)->all();
+		return $db->createCommand('SHOW FULL FIELDS FROM `' . $db->database . '`.' . $table)->all();
 	}
 
 

Gii/Gii.php

@@ -12,9 +12,6 @@ namespace Gii;
 use Database\Connection;
 use Database\Db;
 use Exception;
-use JetBrains\PhpStorm\ArrayShape;
-
-use Snowflake\Abstracts\Config;
 use Snowflake\Abstracts\Input;
 use Snowflake\Exception\ComponentException;
 use Snowflake\Exception\ConfigException;
@@ -42,6 +39,9 @@ class Gii
 	public string $controllerNamespace = 'App\\Http\\Controllers\\';
 
 
+	public static array $createSqls = [];
+
+
 	public array $keyword = [
 		'ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC', 'ASENSITIVE', 'BEFORE', 'BETWEEN', 'BIGINT', 'BINARY', 'BLOB', 'BOTH', 'BY', 'CALL', 'CASCADE', 'CASE', 'CHANGE', 'CHAR', 'CHARACTER', 'CHECK', 'COLLATE', 'COLUMN', 'CONDITION', 'CONNECTION', 'CONSTRAINT', 'CONTINUE', 'CONVERT', 'CREATE', 'CROSS', 'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER', 'CURSOR', 'DATABASE', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE', 'DETERMINISTIC', 'DISTINCT', 'DISTINCTROW', 'DIV', 'DOUBLE', 'DROP', 'DUAL', 'EACH', 'ELSE', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXISTS', 'EXIT', 'EXPLAIN', 'FALSE', 'FETCH', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FOR', 'FORCE', 'FOREIGN', 'FROM', 'FULLTEXT', 'GOTO', 'GRANT', 'GROUP', 'HAVING', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE', 'HOUR_SECOND', 'IF', 'IGNORE', 'IN', 'INDEX', 'INFILE', 'INNER', 'INOUT', 'INSENSITIVE', 'INSERT', 'INT', 'INT1', 'INT2', 'INT3', 'INT4', 'INT8', 'INTEGER', 'INTERVAL', 'INTO', 'IS', 'ITERATE', 'JOIN', 'KEY', 'KEYS', 'KILL', 'LABEL', 'LEADING', 'LEAVE', 'LEFT', 'LIKE', 'LIMIT', 'LINEAR', 'LINES', 'LOAD', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK', 'LONG', 'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT', 'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MOD', 'MODIFIES', 'NATURAL', 'NOT', 'NO_WRITE_TO_BINLOG', 'NULL', 'NUMERIC', 'ON', 'OPTIMIZE', 'OPTION', 'OPTIONALLY', 'OR', 'ORDER', 'OUT', 'OUTER', 'OUTFILE', 'PRECISION', 'PRIMARY', 'PROCEDURE', 'PURGE', 'RAID0', 'RANGE', 'READ', 'READS', 'REAL', 'REFERENCES', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REPLACE', 'REQUIRE', 'RESTRICT', 'RETURN', 'REVOKE', 'RIGHT', 'RLIKE', 'SCHEMA', 'SCHEMAS', 'SECOND_MICROSECOND', 'SELECT', 'SENSITIVE', 'SEPARATOR', 'SET', 'SHOW', 'SMALLINT', 'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS', 'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'TABLE', 'TERMINATED', 'THEN', 'TINYBLOB', 'TINYINT', 'TINYTEXT', 'TO', 'TRAILING', 'TRIGGER', 'TRUE', 'UNDO', 'UNION', 'UNIQUE', 'UNLOCK', 'UNSIGNED', 'UPDATE', 'USAGE', 'USE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', 'VALUES', 'VARBINARY', 'VARCHAR', 'VARCHARACTER', 'VARYING', 'WHEN', 'WHERE', 'WHILE', 'WITH', 'WRITE', 'X509', 'XOR', 'YEAR_MONTH', 'ZEROFILL'
 	];

Gii/GiiModel.php

@@ -22,12 +22,12 @@ class GiiModel extends GiiBase
 	public ?array $fields;
 
 	/**
-	 * ModelFile constructor.
+	 * GiiModel constructor.
-	 * @param $classFileName
+	 * @param string $classFileName
-	 * @param $tableName
+	 * @param string $tableName
-	 * @param $visible
+	 * @param array $visible
-	 * @param $res
+	 * @param array $res
-	 * @param $fields
+	 * @param array $fields
 	 */
 	public function __construct(string $classFileName, string $tableName, array $visible, array $res, array $fields)
 	{
@@ -308,16 +308,20 @@ use Database\ActiveRecord;
 		if (empty($data)) return '';
 		$string = [];
 		foreach ($data as $key => $_val) {
-			if (is_string($key) && str_contains($key, ',')) {
+			if (in_array($_val[0][1], $this->type['float'])) {
-				$key = '[' . $key . ']';
+				$e_x = explode(',', $key);
+				$key = '\'round\' => ' . $e_x[1] . ', \'maxLength\' => ' . ((int)$e_x[0] + 1);
+			} else if (is_string($key) && str_contains($key, ',')) {
+				$key = '\'between\' => [' . $key . ']';
+			} else {
+				$key = '\'maxLength\' => ' . $key;
 			}
 			if (count($_val) == 1) {
-				[$typeRule, $type, $rule, $field] = current($_val);
 				$_tmp = '
-			[\'' . $field . '\', \'' . ($type == 'enum' ? 'enum' : 'maxLength') . '\' => ' . $key . ']';
+			[\'' . $_val[0][3] . '\', ' . ($_val[0][1] == 'enum' ? '\'enum\' => ' . $key : $key) . ']';
 			} else {
 				$_tmp = '
-			[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], \'maxLength\' => ' . $key . ']';
+			[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . $key . ']';
 			}
 			$string[] = $_tmp;
 		}
@@ -412,6 +416,10 @@ use Database\ActiveRecord;
 	 */
 	private function setCreateSql($table): string
 	{
+		if (isset(Gii::$createSqls[$table])) {
+			return Gii::$createSqls[$table];
+		}
+
 		$text = Db::showCreateSql($table, $this->db)['Create Table'] ?? '';
 
 		$_tmp = [];
@@ -419,7 +427,7 @@ use Database\ActiveRecord;
 			$_tmp[] = '// ' . $val;
 		}
 
-		return implode(PHP_EOL, $_tmp);
+		return Gii::$createSqls[$table] = implode(PHP_EOL, $_tmp);
 	}
 
 

HttpServer/Abstracts/HttpService.php

@@ -22,7 +22,7 @@ abstract class HttpService extends Component
 	 * @param string $category
 	 * @throws Exception
 	 */
-	protected function write($message, $category = 'app')
+	protected function write($message, string $category = 'app')
 	{
 		$logger = Snowflake::app()->getLogger();
 		$logger->write($message, $category);

HttpServer/Http/Response.php

@@ -150,12 +150,12 @@ class Response extends HttpService
     }
 
 	/**
-	 * @param string|null $context
+	 * @param mixed $context
 	 * @param int $statusCode
 	 * @return bool
 	 * @throws Exception
 	 */
-    public function send(?string $context = '', int $statusCode = 200): mixed
+    public function send(mixed $context = '', int $statusCode = 200): mixed
     {
         $sendData = $this->parseData($context);
 

System/Application.php

@@ -35,7 +35,6 @@ use function Co\run;
  * @package Snowflake
  *
  * @property-read Config $config
- * @property-read WchatProviders $wchat
  */
 class Application extends BaseApplication
 {
@@ -62,6 +61,9 @@ class Application extends BaseApplication
     }
 
 
+
+
+
     /**
      * @param Closure|array $closure
      * @return $this

System/Jwt/Jwt.php

@@ -5,11 +5,12 @@ namespace Snowflake\Jwt;
 
 use Exception;
 use HttpServer\Http\HttpHeaders;
-use Snowflake\Cache\Redis;
+use Snowflake\Abstracts\Component;
 use Snowflake\Abstracts\Config;
+use Snowflake\Cache\Redis;
+use Snowflake\Core\Json;
 use Snowflake\Core\Str;
 use Snowflake\Exception\AuthException;
-use Snowflake\Abstracts\Component;
 use Snowflake\Exception\ConfigException;
 use Snowflake\Snowflake;
 
@@ -222,6 +223,25 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
 		return $this->create($this->user, $headers);
 	}
 
+
+	/**
+	 * @param array $headers
+	 * @return mixed
+	 * @throws AuthException
+	 */
+	public function getTokenUser(array $headers = []): int
+	{
+		$this->data = $headers;
+		if (!openssl_public_decrypt(base64_decode($headers['refresh']), $data, $this->public)) {
+			throw new AuthException('信息解码失败.');
+		}
+
+		$data = Json::decode($data, true);
+
+		return (int)$data['user'];
+	}
+
+
 	/**
 	 * @param array $param
 	 *

System/Pool/ClientsPool.php

@@ -81,6 +81,11 @@ class ClientsPool extends Component
 	{
 		if (env('state') == 'exit') {
 			Timer::clear($this->creates);
+			foreach (static::$_connections as $channel) {
+				$this->flush($channel, 0);
+				$channel->close();
+			}
+			static::$_connections = [];
 			$this->creates = -1;
 		} else {
 			$this->heartbeat_flush();
@@ -131,7 +136,6 @@ class ClientsPool extends Component
 	public function flush($channel, $retain_number)
 	{
 		$this->pop($channel, $retain_number);
-		static::$_connections = [];
 	}
 
 
@@ -180,12 +184,16 @@ class ClientsPool extends Component
 	 * @param $name
 	 * @return Channel
 	 * @throws ConfigException
+	 * @throws Exception
 	 */
 	private function getChannel($name): Channel
 	{
 		if (!isset(static::$_connections[$name])) {
 			static::$_connections[$name] = new Channel(Config::get('databases.pool.max', 10));
 		}
+		if (static::$_connections[$name]->errCode == SWOOLE_CHANNEL_CLOSED){
+			throw new Exception('Channel is Close.');
+		}
 		if ($this->creates === -1) {
 			$this->creates = Timer::tick(60000, [$this, 'Heartbeat_detection']);
 		}

System/Process/Process.php

@@ -42,7 +42,7 @@ abstract class Process extends \Swoole\Process implements SProcess
 
 		fire(Event::SERVER_WORKER_START);
 		if (Snowflake::getPlatform()->isLinux())  {
-			swoole_set_process_name($this->getProcessName());
+			name($this->pid, $this->getProcessName());
 		}
 		if (method_exists($this, 'before')) {
 			$this->before($process);

Validator/BaseValidator.php

@@ -46,7 +46,7 @@ abstract class BaseValidator
 	 * BaseValidator constructor.
 	 * @param array $config
 	 */
-	public function __construct($config = [])
+	public function __construct(array $config = [])
 	{
 		$this->regConfig($config);
 	}

Validator/LengthValidator.php

@@ -37,14 +37,11 @@ class LengthValidator extends BaseValidator
 		if (is_null($value)) {
 			return $this->addError('The param :attribute is null');
 		}
-		switch (strtolower($this->method)) {
+		return match (strtolower($this->method)) {
-			case self::MAX_LENGTH:
+			self::MAX_LENGTH => $this->maxLength($value),
-				return $this->maxLength($value);
+			self::MIN_LENGTH => $this->minLength($value),
-			case self::MIN_LENGTH:
+			default => $this->defaultLength($value),
-				return $this->minLength($value);
+		};
-			default:
-				return $this->defaultLength($value);
-		}
 	}
 
 	/**

Validator/RoundValidator.php

@@ -0,0 +1,34 @@
+<?php
+
+
+namespace validator;
+
+
+use Exception;
+
+/**
+ * Class RoundValidator
+ * @package validator
+ */
+class RoundValidator extends BaseValidator
+{
+
+
+	public ?int $value = null;
+
+
+	/**
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function trigger(): bool
+	{
+		$value = $this->model->getAttribute($this->field);
+		if ($value == null || round($value, $this->value) != $value) {
+			return $this->addError('The param :attribute length error');
+		}
+		return true;
+	}
+
+
+}

Validator/Validator.php

@@ -102,6 +102,9 @@ class Validator extends BaseValidator
 			'class'  => 'validator\LengthValidator',
 			'method' => 'default',
 		],
+		'round'    => [
+			'class'  => 'validator\RoundValidator',
+		],
 	];
 
 	/**