1

2021-11-27 17:58:17 +08:00 · 2021-11-27 17:45:39 +08:00 · 2021-11-27 17:43:29 +08:00 · 2021-11-26 11:28:37 +08:00 · 2021-11-26 11:27:55 +08:00 · 2021-11-24 23:46:26 +08:00
12 changed files with 309 additions and 712 deletions
@@ -21,16 +21,17 @@
    "ext-xml": "*",
    "ext-curl": "*",
    "ext-openssl": "*",
-    "symfony/console": "^v5.3",
+    "symfony/console": "v5.3.10",
    "psr/log": "1.*",
    "ext-sockets": "*",
    "ext-pcntl": "*",
    "ext-posix": "*",
    "composer-runtime-api": "^2.0",
-    "swiftmailer/swiftmailer": "^6.0",
+    "swiftmailer/swiftmailer": "v6.3.*",
    "psr/container": "^2.0",
-    "psr/http-server-middleware": "^1.0",
-    "game-worker/kiri-event": "v1.0"
+    "psr/http-server-middleware": "1.0.1",
+    "game-worker/kiri-event": "v1.0",
+    "ext-inotify": "*"
  },
  "autoload": {
    "psr-4": {
@@ -445,9 +445,7 @@ if (!function_exists('fire')) {

 	/**
 	 * @param object $event
-	 * @throws NotFindClassException
-	 * @throws ReflectionException
-	 */
+     */
 	function fire(object $event)
 	{
 		di(EventDispatch::class)->dispatch($event);
@@ -541,8 +539,8 @@ if (!function_exists('trim_blank')) {

 if (!function_exists('get_file_extension')) {

-	function get_file_extension($filename)
-	{
+	function get_file_extension($filename): bool|int|string
+    {
 		$mime_types = [
 			'txt'  => 'text/plain',
 			'htm'  => 'text/html',
@@ -879,10 +877,11 @@ if (!function_exists('env')) {
 if (!function_exists('di')) {


-	/**
-	 * @param string $className
-	 * @return mixed
-	 */
+    /**
+     * @param string $className
+     * @return mixed
+     * @throws ReflectionException
+     */
 	function di(string $className): mixed
 	{
 		return Kiri::getDi()->get($className);
@@ -893,10 +892,11 @@ if (!function_exists('di')) {
 if (!function_exists('duplicate')) {


-	/**
-	 * @param string $className
-	 * @return mixed
-	 */
+    /**
+     * @param string $className
+     * @return mixed
+     * @throws ReflectionException
+     */
 	function duplicate(string $className): mixed
 	{
 		$class = di($className);
@@ -25,7 +25,6 @@ use Kiri\Error\Logger;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\InitException;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Jwt\Jwt;
 use Kiri\Kiri;
 use ReflectionException;
 use Server\ServerManager;
@@ -372,16 +371,6 @@ abstract class BaseApplication extends Component
 	}


-	/**
-	 * @return Jwt
-	 * @throws
-	 */
-	public function getJwt(): Jwt
-	{
-		return $this->get('jwt');
-	}
-
-
 	/**
 	 * @return Server
 	 * @throws
@@ -14,264 +14,270 @@ use Exception;
 class Str
 {

-	const STRING = 'abcdefghijklmnopqrstuvwxyz';
+    const STRING = 'abcdefghijklmnopqrstuvwxyz';

-	const NUMBER = '01234567890';
+    const NUMBER = '01234567890';

-	/**
-	 * @param int $length
-	 *
-	 * @return string
-	 * 获取随机字符串
-	 */
-	public static function rand(int $length = 20): string
-	{
-		$string = '';
-		if ($length < 1) $length = 20;
-		$default = self::STRING . strtoupper(self::STRING) . self::NUMBER;
-		$default = str_split($default);
-		$string .= str_repeat($default[array_rand($default)], $length);
-		return (string)$string;
-	}
+    /**
+     * @param int $length
+     *
+     * @return string
+     * 获取随机字符串
+     */
+    public static function rand(int $length = 20): string
+    {
+        $string = '';
+        if ($length < 1) $length = 20;
+        $default = self::STRING . strtoupper(self::STRING) . self::NUMBER;
+        $default = str_split($default);
+        for ($i = 0; $i < $length; $i++) {
+            shuffle($default);
+            $string .= $default[array_rand($default)];
+        }
+        return $string;
+    }

-	/**
-	 * @param int $length
-	 *
-	 * @return int|string 获取随机数字
-	 * 获取随机数字
-	 */
-	public static function random(int $length = 20): int|string
-	{
-		$number = '';
-		$default = str_split(self::NUMBER);
-		if ($length < 1) $length = 1;
-		$number .= str_repeat($default[array_rand($default)], $length);
-		return $number;
-	}
+    /**
+     * @param int $length
+     *
+     * @return int|string 获取随机数字
+     * 获取随机数字
+     */
+    public static function random(int $length = 20): int|string
+    {
+        $number = '';
+        $default = str_split(self::NUMBER);
+        if ($length < 1) $length = 1;
+        for ($i = 0; $i < $length; $i++) {
+            shuffle($default);
+            $number .= $default[array_rand($default)];
+        }
+        return $number;
+    }

-	/**
-	 * @param        $string
-	 * @param        $sullen
-	 * @param bool $strip_tags
-	 * @param string $append
-	 *
-	 * @return string
-	 */
-	public static function cut_str_utf8($string, $sullen, bool $strip_tags = true, string $append = '...'): string
-	{
-		if ($strip_tags) {
-			$string = strip_tags($string);
-		}//去掉签标
-		$pa = "/[\x01-\x7f]|[\xc2-\xdf][\x80-\xbf]|\xe0[\xa0-\xbf][\x80-\xbf]|[\xe1-\xef][\x80-\xbf][\x80-\xbf]|\xf0[\x90-\xbf][\x80-\xbf][\x80-\xbf]|[\xf1-\xf7][\x80-\xbf][\x80-\xbf][\x80-\xbf]/";
-		preg_match_all($pa, $string, $t_string);
-		$str = "";
-		for ($i = 0; $i < count($t_string[0]); $i++) {
-			$str .= $t_string[0][$i];
-			//转为gbk，一个汉字长度为2
-			if (strlen(@iconv('utf-8', 'gbk', $str)) >= $sullen) {
-				if ($i != count($t_string[0]) - 1) $str .= $append;
-				break;
-			}
-		}
-		return $str;
-	}
+    /**
+     * @param        $string
+     * @param        $sullen
+     * @param bool $strip_tags
+     * @param string $append
+     *
+     * @return string
+     */
+    public static function cut_str_utf8($string, $sullen, bool $strip_tags = TRUE, string $append = '...'): string
+    {
+        if ($strip_tags) {
+            $string = strip_tags($string);
+        }//去掉签标
+        $pa = "/[\x01-\x7f]|[\xc2-\xdf][\x80-\xbf]|\xe0[\xa0-\xbf][\x80-\xbf]|[\xe1-\xef][\x80-\xbf][\x80-\xbf]|\xf0[\x90-\xbf][\x80-\xbf][\x80-\xbf]|[\xf1-\xf7][\x80-\xbf][\x80-\xbf][\x80-\xbf]/";
+        preg_match_all($pa, $string, $t_string);
+        $str = "";
+        for ($i = 0; $i < count($t_string[0]); $i++) {
+            $str .= $t_string[0][$i];
+            //转为gbk，一个汉字长度为2
+            if (strlen(@iconv('utf-8', 'gbk', $str)) >= $sullen) {
+                if ($i != count($t_string[0]) - 1) $str .= $append;
+                break;
+            }
+        }
+        return $str;
+    }

-	/**
-	 * @param $data
-	 *
-	 * @param null $callback
-	 * @return bool
-	 * 判断是否为json字符串
-	 */
-	public static function isJson($data, $callback = null): bool
-	{
-		$json = !is_null(json_decode($data)) && !is_numeric($data);
-		if ($json && is_callable($callback, true)) {
-			return call_user_func($callback, $data);
-		}
-		return $json;
-	}
+    /**
+     * @param $data
+     *
+     * @param null $callback
+     * @return bool
+     * 判断是否为json字符串
+     */
+    public static function isJson($data, $callback = NULL): bool
+    {
+        $json = !is_null(json_decode($data)) && !is_numeric($data);
+        if ($json && is_callable($callback, TRUE)) {
+            return call_user_func($callback, $data);
+        }
+        return $json;
+    }

-	/**
-	 * @param $data
-	 *
-	 * @param null $callBack
-	 * @return bool
-	 * 判断是否序列化字符串
-	 */
-	public static function isSerialize($data, $callBack = null): bool
-	{
-		$false = !empty($data) && swoole_unserialize($data) !== false;
-		if ($false && is_callable($callBack, true)) {
-			return call_user_func($callBack, $data);
-		}
-		return $false;
-	}
+    /**
+     * @param $data
+     *
+     * @param null $callBack
+     * @return bool
+     * 判断是否序列化字符串
+     */
+    public static function isSerialize($data, $callBack = NULL): bool
+    {
+        $false = !empty($data) && swoole_unserialize($data) !== FALSE;
+        if ($false && is_callable($callBack, TRUE)) {
+            return call_user_func($callBack, $data);
+        }
+        return $false;
+    }

-	/**
-	 * @param     $string
-	 * @param int $length
-	 *
-	 * @param string $append
-	 * @return string
-	 */
-	public static function cut($string, int $length = 20, string $append = '...'): string
-	{
-		if (empty($string)) {
-			return '';
-		}
-		if ($length < 1) {
-			$length = 1;
-		}
-		$array = str_split($string);
-		if (count($array) <= $length) {
-			return implode('', $array);
-		}
-		$string = implode('', array_slice($array, 0, $length));
-		if (!empty($append)) {
-			$string .= $append;
-		}
-		return $string;
-	}
+    /**
+     * @param     $string
+     * @param int $length
+     *
+     * @param string $append
+     * @return string
+     */
+    public static function cut($string, int $length = 20, string $append = '...'): string
+    {
+        if (empty($string)) {
+            return '';
+        }
+        if ($length < 1) {
+            $length = 1;
+        }
+        $array = str_split($string);
+        if (count($array) <= $length) {
+            return implode('', $array);
+        }
+        $string = implode('', array_slice($array, 0, $length));
+        if (!empty($append)) {
+            $string .= $append;
+        }
+        return $string;
+    }

-	/**
-	 * @param        $str
-	 * @param int $number
-	 * @param string $key
-	 *
-	 * @return string
-	 */
-	public static function encrypt($str, int $number = 10, string $key = 'xshucai.com'): string
-	{
-		$res = [];
-		$add = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-		$len = strlen($key) < 0 ? 1 : (strlen($key) + 5 > strlen($add) ? strlen($add) - 5 : strlen($key));
-		if ($number < 1) $number = 10;
-		$array = str_split($str);
-		asort($array);
-		$str = implode('', $array);
-		for ($i = 0; $i < $number; $i++) {
-			$_tmp = md5($key) . md5($str) . mb_substr($add, $len, $len + 5, 'utf-8');
-			$res[] = md5($_tmp);
-		}
-		sort($res, SORT_STRING);
-		return hash('sha384', implode('', $res));
-	}
+    /**
+     * @param        $str
+     * @param int $number
+     * @param string $key
+     *
+     * @return string
+     */
+    public static function encrypt($str, int $number = 10, string $key = 'xshucai.com'): string
+    {
+        $res = [];
+        $add = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        $len = strlen($key) < 0 ? 1 : (strlen($key) + 5 > strlen($add) ? strlen($add) - 5 : strlen($key));
+        if ($number < 1) $number = 10;
+        $array = str_split($str);
+        asort($array);
+        $str = implode('', $array);
+        for ($i = 0; $i < $number; $i++) {
+            $_tmp = md5($key) . md5($str) . mb_substr($add, $len, $len + 5, 'utf-8');
+            $res[] = md5($_tmp);
+        }
+        sort($res, SORT_STRING);
+        return hash('sha384', implode('', $res));
+    }

-	/**
-	 * @param $file
-	 * @param $type
-	 * @return string
-	 */
-	public static function filename($file, $type): string
-	{
-		switch ($type) {
-			case 'image/png':
-				return md5_file($file) . '.png';
-			case 'image/jpeg':
-			case 'image/jpg':
-				return md5_file($file) . '.jpg';
-			case 'image/gif':
-				return md5_file($file) . '.gif';
-				break;
-		}
-		return md5_file($file);
-	}
+    /**
+     * @param $file
+     * @param $type
+     * @return string
+     */
+    public static function filename($file, $type): string
+    {
+        switch ($type) {
+            case 'image/png':
+                return md5_file($file) . '.png';
+            case 'image/jpeg':
+            case 'image/jpg':
+                return md5_file($file) . '.jpg';
+            case 'image/gif':
+                return md5_file($file) . '.gif';
+                break;
+        }
+        return md5_file($file);
+    }

-	/**
-	 * @param $endTime
-	 * @param int|null $startTime
-	 * @return array
-	 * 剩余天，带分秒
-	 */
-	public static function timeout($endTime, int $startTime = null): array
-	{
-		$endTime = $endTime - (!empty($startTime) ? $startTime : time());
+    /**
+     * @param $endTime
+     * @param int|null $startTime
+     * @return array
+     * 剩余天，带分秒
+     */
+    public static function timeout($endTime, int $startTime = NULL): array
+    {
+        $endTime = $endTime - (!empty($startTime) ? $startTime : time());

-		$day = intval($endTime / (3600 * 24));
+        $day = intval($endTime / (3600 * 24));

-		$hours = intval(($endTime - ($day * (3600 * 24))) / 3600);
+        $hours = intval(($endTime - ($day * (3600 * 24))) / 3600);

-		$minute = intval(($endTime - ($day * (3600 * 24) + $hours * 3600)) / 60);
+        $minute = intval(($endTime - ($day * (3600 * 24) + $hours * 3600)) / 60);

-		$scrod = intval(($endTime - ($day * (3600 * 24) + $hours * 3600 + $minute * 60)));
+        $scrod = intval(($endTime - ($day * (3600 * 24) + $hours * 3600 + $minute * 60)));

-		return [$day, $hours, $minute, $scrod];
-	}
+        return [$day, $hours, $minute, $scrod];
+    }


-	/**
-	 * @return false|int
-	 */
-	public static function get_sy_time(): bool|int
-	{
-		$time = strtotime('+1days', strtotime(date('Y-m-d')));
+    /**
+     * @return false|int
+     */
+    public static function get_sy_time(): bool|int
+    {
+        $time = strtotime('+1days', strtotime(date('Y-m-d')));

-		return $time - time();
-	}
+        return $time - time();
+    }

-	/**
-	 * @param string $string
-	 * @return string
-	 */
-	public static function encode(string $string): string
-	{
-		return addslashes($string);
-	}
+    /**
+     * @param string $string
+     * @return string
+     */
+    public static function encode(string $string): string
+    {
+        return addslashes($string);
+    }

-	/**
-	 * @param string $string
-	 * @return string|string[]|null
-	 * 清除标点符号
-	 */
-	public static function clear(string $string): array|string|null
-	{
-		$char = '。、！？：；﹑•＂…‘’“”〝〞∕¦‖—　〈〉﹞﹝「」‹›〖〗】【»«』『〕〔》《﹐¸﹕︰﹔！¡？¿﹖﹌﹏﹋＇´ˊˋ―﹫︳︴¯＿￣﹢﹦﹤‐˜﹟﹩﹠﹪﹡﹨﹍﹉﹎﹊ˇ︵︶︷︸︹︿﹀︺︽︾ˉ﹁﹂﹃﹄︻︼（）';
-		return preg_replace(array("/[[:punct:]]/i", '/[' . $char . ']/u', '/[ ]{2,}/'), '', $string);
-	}
+    /**
+     * @param string $string
+     * @return string|string[]|null
+     * 清除标点符号
+     */
+    public static function clear(string $string): array|string|null
+    {
+        $char = '。、！？：；﹑•＂…‘’“”〝〞∕¦‖—　〈〉﹞﹝「」‹›〖〗】【»«』『〕〔》《﹐¸﹕︰﹔！¡？¿﹖﹌﹏﹋＇´ˊˋ―﹫︳︴¯＿￣﹢﹦﹤‐˜﹟﹩﹠﹪﹡﹨﹍﹉﹎﹊ˇ︵︶︷︸︹︿﹀︺︽︾ˉ﹁﹂﹃﹄︻︼（）';
+        return preg_replace(["/[[:punct:]]/i", '/[' . $char . ']/u', '/[ ]{2,}/'], '', $string);
+    }


-	/**
-	 * @param int $user
-	 * @param array $param
-	 * @param null $requestTime
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public static function token(int $user, array $param = [], $requestTime = NULL): string
-	{
-		$str = '';
-		if (!$requestTime) {
-			$requestTime = microtime(true);
-		}
-		$_user = str_split(md5($user . md5((string)$user)));
-		ksort($_user);
-		foreach ($_user as $key => $val) {
-			$str .= md5(sha1($key . $val . 'www.xshucai.com'));
-		}
-		if (is_array($param)) {
-			foreach ($param as $key => $val) {
-				$str .= md5($str . sha1($key . md5($val)));
-			}
-		}
-		$str .= sha1(base64_encode((string)$requestTime));
+    /**
+     * @param int $user
+     * @param array $param
+     * @param null $requestTime
+     *
+     * @return string
+     * @throws Exception
+     */
+    public static function token(int $user, array $param = [], $requestTime = NULL): string
+    {
+        $str = '';
+        if (!$requestTime) {
+            $requestTime = microtime(TRUE);
+        }
+        $_user = str_split(md5($user . md5((string)$user)));
+        ksort($_user);
+        foreach ($_user as $key => $val) {
+            $str .= md5(sha1($key . $val . 'www.xshucai.com'));
+        }
+        if (is_array($param)) {
+            foreach ($param as $key => $val) {
+                $str .= md5($str . sha1($key . md5($val)));
+            }
+        }
+        $str .= sha1(base64_encode((string)$requestTime));

-		$md5 = md5($str . $user);
+        $md5 = md5($str . $user);

-		return preg_replace('/(\w{10})(\w{3})(\w{4})(\w{9})(\w{6})/', '$1-$2-$3-$4-$5', $md5);
-	}
+        return preg_replace('/(\w{10})(\w{3})(\w{4})(\w{9})(\w{6})/', '$1-$2-$3-$4-$5', $md5);
+    }


-	/**
-	 * @param string $str
-	 * @param bool $unfairest
-	 * @return string
-	 */
-	public static function convertUnderline(string $str, bool $unfairest = true): string
-	{
-		$str = ucwords(str_replace('_', ' ', $str));
-		$str = str_replace(' ', '', lcfirst($str));
-		return $unfairest ? ucfirst($str) : $str;
-	}
+    /**
+     * @param string $str
+     * @param bool $unfairest
+     * @return string
+     */
+    public static function convertUnderline(string $str, bool $unfairest = TRUE): string
+    {
+        $str = ucwords(str_replace('_', ' ', $str));
+        $str = str_replace(' ', '', lcfirst($str));
+        return $unfairest ? ucfirst($str) : $str;
+    }
 }
@@ -21,6 +21,7 @@ use ReflectionException;
 use ReflectionFunction;
 use ReflectionMethod;
 use ReflectionProperty;
+use Psr\Container\ContainerInterface;

 /**
 * Class Container
@@ -61,26 +62,39 @@ class Container extends BaseObject implements ContainerInterface
 	];


-	/**
-	 * @param       $class
-	 * @param array $constrict
-	 * @param array $config
-	 *
-	 * @return mixed
-	 * @throws
-	 */
-	public function get($class, array $constrict = [], array $config = []): mixed
+    /**
+     * @param string $id
+     * @return mixed
+     * @throws ReflectionException
+     */
+	public function get(string $id): mixed
 	{
-		if ($this->isInterface($class)) {
-			$class = $this->_interfaces[$class];
-		}
-		if (!isset($this->_singletons[$class])) {
-			$this->_singletons[$class] = $this->resolve($class, $constrict, $config);
-		}
-		return $this->_singletons[$class];
+		return $this->make($id, [], []);
 	}


+
+    /**
+     * @param $class
+     * @param array $constrict
+     * @param array $config
+     * @return mixed
+     * @throws ReflectionException
+     * @throws Exception
+     */
+    public function make($class, array $constrict = [], array $config = []): mixed
+    {
+        if ($this->isInterface($class)) {
+            $class = $this->_interfaces[$class];
+        }
+        if (!isset($this->_singletons[$class])) {
+            $this->_singletons[$class] = $this->resolve($class, $constrict, $config);
+        }
+        return $this->_singletons[$class];
+    }
+
+
+
 	/**
 	 * @param string $interface
 	 * @param string $class
@@ -435,4 +449,13 @@ class Container extends BaseObject implements ContainerInterface
 		}
 		return $old;
 	}
+
+    /**
+     * @param string $id
+     * @return bool
+     */
+    public function has(string $id): bool
+    {
+        return isset($this->_singletons[$id]) || isset($this->_interfaces[$id]);
+    }
 }
@@ -1,12 +0,0 @@
-<?php
-
-namespace Kiri\Di;
-
-
-/**
- * @mixin Container
- */
-interface ContainerInterface
-{
-
-}
@@ -72,9 +72,9 @@ class HotReload extends Command
 		$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
 		swoole_async_set(['enable_coroutine' => false]);
 		if (!extension_loaded('inotify')) {
-			$this->driver = Kiri::getDi()->get(Scaner::class, [$this->dirs, $this]);
+			$this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
 		} else {
-			$this->driver = Kiri::getDi()->get(Inotify::class, [$this->dirs, $this]);
+			$this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
 		}
 		if (Kiri::getPlatform()->isLinux()) {
 			swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
@@ -1,57 +0,0 @@
-<?php
-declare(strict_types=1);
-
-
-namespace Kiri\Jwt;
-
-
-use Annotation\Inject;
-use Exception;
-use Http\Message\ServerRequest;
-use Kiri\Kiri;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Server\Constrict\ResponseInterface;
-
-/**
- * Class CoreMiddleware
- * @package Kiri\Kiri\Route
- * 跨域中间件
- */
-class JWTAuthMiddleware implements MiddlewareInterface
-{
-
-
-	/** @var int */
-	public int $zOrder = 0;
-
-
-	#[Inject(ResponseInterface::class)]
-	public ResponseInterface $response;
-
-
-	/**
-	 * @param ServerRequest $request
-	 * @param RequestHandlerInterface $handler
-	 * @return \Psr\Http\Message\ResponseInterface
-	 * @throws Exception
-	 */
-	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): \Psr\Http\Message\ResponseInterface
-	{
-		$authorization = $request->getHeaderLine('Authorization');
-		if (empty($authorization)) {
-			return $this->response->json(['code' => 401, 'JWT voucher cannot be empty.']);
-		}
-		if (!str_starts_with($authorization, 'Bearer ')) {
-			return $this->response->json(['code' => 401, 'JWT Voucher Format Error.']);
-		}
-		$authorization = str_replace('Bearer ', '', $authorization);
-		$jwt = Kiri::app()->getJwt();
-		if (!$jwt->validator($authorization)) {
-			return $this->response->json(['code' => 401, 'JWT Validator fail.']);
-		}
-		return $handler->handle($request);
-	}
-
-}
@@ -1,27 +0,0 @@
-<?php
-
-namespace Kiri\Jwt;
-
-
-use JetBrains\PhpStorm\Pure;
-use Throwable;
-
-/**
- *
- */
-class JWTAuthTokenException extends \Exception
-{
-
-
-	/**
-	 * @param string $message
-	 * @param int $code
-	 * @param Throwable|null $previous
-	 */
-	#[Pure] public function __construct($message = "", $code = 4001, Throwable $previous = null)
-	{
-		parent::__construct($message, 4001, $previous);
-	}
-
-
-}
@@ -1,201 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Kiri\Jwt;
-
-use Annotation\Inject;
-use Exception;
-use Http\Constrict\RequestInterface;
-use Kiri\Abstracts\Component;
-use Kiri\Abstracts\Config;
-use Kiri\Core\Json;
-use Kiri\Exception\ConfigException;
-
-
-/**
- * Class Jwt
- * @package Kiri\Jwt
- */
-class Jwt extends Component
-{
-
-	use JwtHelper;
-
-
-	#[Inject(RequestInterface::class)]
-	private RequestInterface $request;
-
-
-	/**
-	 * @param RequestInterface $request
-	 */
-	public function setRequest(RequestInterface $request): void
-	{
-		$this->request = $request;
-	}
-
-
-	/**
-	 * @throws ConfigException
-	 * @throws Exception
-	 * 'jwt' => [
-	 * 'scene' => 'application',
-	 * 'timeout' => 7200,
-	 * 'encrypt' => '',
-	 * 'iv'      => '',
-	 * 'key'     => '',
-	 * ]
-	 */
-	public function init()
-	{
-		$this->request = di(RequestInterface::class);
-
-		$this->public = Config::get('ssl.public', $this->public);
-		$this->private = Config::get('ssl.private', $this->private);
-		$this->timeout = Config::get('jwt.timeout', 7200);
-
-		$jwt = Config::get('jwt', []);
-		if ($jwt) {
-			$this->setScene($jwt['scene'] ?? 'application');
-			$this->setKey($jwt['key'] ?? get_called_class());
-			$length = openssl_cipher_iv_length($this->encrypt);
-			if ($length > 0) {
-				$defaultIv = openssl_random_pseudo_bytes($length);
-				$this->setIv($jwt['iv'] ?? $defaultIv);
-			}
-		}
-	}
-
-	/**
-	 * @param int $unionId
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function create(int $unionId): string
-	{
-		$this->user = $unionId;
-		$this->config['time'] = time();
-		$this->data = $this->request->getHeaders();
-		if (!isset($this->data['source'])) {
-			$this->data['source'] = 'browser';
-		}
-		return $this->createEncrypt($unionId);
-	}
-
-
-	/**
-	 * @return string
-	 */
-	private function jwtHeader(): string
-	{
-		$string = openssl_encrypt(
-			json_encode(['type' => 'openssl', 'encrypt' => $this->encrypt]),
-			$this->encrypt,
-			$this->key,
-			0,
-			$this->iv
-		);
-		return str_replace('=', '', $string);
-	}
-
-
-	/**
-	 * @param $unionId
-	 * @return string
-	 * @throws Exception
-	 */
-	private function jwtBody($unionId): string
-	{
-		$json = json_encode(['unionId' => $unionId, 'createTime' => time(), 'expire_at' => time() + $this->timeout]);
-		openssl_private_encrypt($json, $encode, $this->private);
-		return base64_encode($encode);
-	}
-
-
-	/**
-	 * @param $unionId
-	 * @return string
-	 * @throws Exception
-	 */
-	private function createEncrypt($unionId): string
-	{
-		$params[] = $this->jwtHeader();
-		$params[] = $this->jwtBody($unionId);
-
-		$params[] = hash('sha256', $params[0] . $params[1]);
-		return implode('.', $params);
-	}
-
-
-	/**
-	 * @param $token
-	 * @return string|int
-	 * @throws JWTAuthTokenException
-	 */
-	public function getUnionId($token): string|int
-	{
-		$unpack = $this->unpack($token);
-		if (!$this->_validator($unpack)) {
-			throw new JWTAuthTokenException('JWT certificate has expired.');
-		}
-		return $unpack['unionId'];
-	}
-
-
-	/**
-	 * @param $token
-	 * @return bool
-	 * @throws JWTAuthTokenException
-	 */
-	public function validator($token): bool
-	{
-		return $this->_validator($this->unpack($token));
-	}
-
-
-	/**
-	 * @param $unpack
-	 * @return bool
-	 */
-	private function _validator($unpack): bool
-	{
-		if ($unpack['expire_at'] < time()) {
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	 * @param $token
-	 * @return string
-	 * @throws JWTAuthTokenException
-	 * @throws Exception
-	 */
-	public function refresh($token): string
-	{
-		return $this->create($this->unpack($token)['unionId']);
-	}
-
-
-	/**
-	 * @param string $token
-	 * @return mixed
-	 * @throws JWTAuthTokenException
-	 */
-	private function unpack(string $token): array
-	{
-		if (count($explode = explode('.', $token)) != 3) {
-			throw new JWTAuthTokenException('JWT Voucher Format Error.');
-		}
-		if (hash('sha256', $explode[0] . $explode[1]) != $explode[2]) {
-			throw new JWTAuthTokenException('JWT Sign Validator Fail.');
-		}
-		if (!openssl_public_decrypt(base64_decode($explode[1]), $decode, $this->public)) {
-			throw new JWTAuthTokenException('JWT Voucher Unpack Error.');
-		}
-		return Json::decode($decode, true);
-	}
-
-}
@@ -1,134 +0,0 @@
-<?php
-
-namespace Kiri\Jwt;
-
-trait JwtHelper
-{
-
-
-	/** @var int $user */
-	private int $user;
-
-	private array $data;
-
-	private array $source = ['browser', 'android', 'iphone', 'pc', 'mingame'];
-
-	private array $config = ['token' => ''];
-
-	private ?int $timeout = 7200;
-
-	private string $key = 'www.xshucai.com';
-
-
-	private string $secret = '';
-
-
-	private string $scene = 'default';
-
-
-	private string $encrypt = 'aes-128-ecb';
-
-
-	private string $iv = '';
-
-
-	private ?string $public = '-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BuML3gtLGde7QKNuNST
-UCB9gdHC7XIpOc7Wx2I64Esj3UxWHTgp3URj0ge8zpy7A3FfBdppR7d1nwoD6Xad
-jqfjEWpTy4WwGYsOfH0tFl3wAmse0lebF4NFsS9pzrikQT6c9qsVm88pCjvg4i5t
-WhTMEnpTFDYoDR0KXlLXltQMudBBUHFaVwP0wKJ/cGX7R1Mrv35K4MXwQFOuGZkP
-hsp2rO9x5LjtSKIXbexy7WhUu6QMjD/XzgsXr9UF+ExYmBGXRVWgNFLMkiaCZ2Uz
-WlQhpQrA5/wKd76dCzjvqw9M32OiZl2lCKT73cV8GUvt7BNsM1SiPhqfY7nhO6y3
-cwIDAQAB
-----END PUBLIC KEY-----';
-
-	private ?string $private = '-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA6BuML3gtLGde7QKNuNSTUCB9gdHC7XIpOc7Wx2I64Esj3UxW
-HTgp3URj0ge8zpy7A3FfBdppR7d1nwoD6XadjqfjEWpTy4WwGYsOfH0tFl3wAmse
-0lebF4NFsS9pzrikQT6c9qsVm88pCjvg4i5tWhTMEnpTFDYoDR0KXlLXltQMudBB
-UHFaVwP0wKJ/cGX7R1Mrv35K4MXwQFOuGZkPhsp2rO9x5LjtSKIXbexy7WhUu6QM
-jD/XzgsXr9UF+ExYmBGXRVWgNFLMkiaCZ2UzWlQhpQrA5/wKd76dCzjvqw9M32Oi
-Zl2lCKT73cV8GUvt7BNsM1SiPhqfY7nhO6y3cwIDAQABAoIBADPihJHP8XktmmCs
-43Vfv5Z3zNaKR2LA1Eph3E0xviuJYHkFqXJarbESqqW2qRQeoQeB/lXWnxYzAo4M
-tRcpNss+6FlqRVUHi3gKR7C4Yq3PTemcfIVUpAy7gYa8LJDTYZRcJMZXNDtiMbBh
-9kFZU4SBhaTTx2KLQKS9yyWOqzbBvyLXN+1+Wy477M9+MXXTKw79dO+pML6cR0yl
-pNfVR5FX5L/GB5vOtQB/Aqg/CKT8NC5MzWPnKY+TPCCHZyoZuB9dLDuWOlqsN4QX
-Y4B8fFca5yRwzHra5aGoqdaT/zGctt+I6V/f/KNQCo36f9LPxeXg1+FHvvtTj5WZ
-N8CGPzECgYEA9R7lRMXzrHE4rK0DhxQXIFbIKKtxrimqZQdbwOUeYYD2R6CDSItK
-z88RSYElmd6wiS7fYIaheXNqJ8Yu6SQFBF/yshBwjQVl9NJG94LJlgx1XnVZEju6
-OZjMUOhHXBymtXnLo16pDRl8odc4MFLRH25/vLtwChUr+Qoyt54GzFUCgYEA8mjL
-jdh94JAmcdnDXsKgjNOGyNWGDVvWoFmy8lEQsMXY1JJnEd3YfDM2prmv3vaoiXzi
-YkSETl6ZUtJqh78MnHCBY1vI6EAcKQAF/kvP2TataRCXNcGNQwn2mtq+B+heTta6
-Di8jjAdmdUAYHbmOQryBudiRYG7JEF038elzvKcCgYEAq81ByFguGBkrLev94vkz
-1Fi+5bJ0dSuC4Fit+J8eEhz/gOiB26C1iL2LUkeQgS5R8XTG37K9DpDUQJhpXMMA
-OTa+tgtLt6um8FdJokUq4V5ODSyWh28RcTklSzfifC8gsWVyU0kPl7zbW9uq6EPD
-ixI5uaBuQMLiFSUOsx+xiBkCgYEAtqXHWeVZUy7KCNavomK7XeCzmfdovgAIw2FS
-t8nk7YzlR6XYC1pAl7Ru5Ujb/v+TFaUHXkuJ9RLKK+Fna0jEU8thcl/iDTzg+vON
-kIHG5j+Qga2CgXqI2Y5URXGz5XlsNbMNFUrnWcbpqEbW5O6/BgHLLSDEyQgwbygN
-0zS3g9kCgYEAhssb7kOljdIul4lY5MXc67Zf1dp6S2bucLOxsG6cRW07b3pBz7QF
-5aPE7ZwnkzTnA4HuGGauKj+qKGAR7ve55XClAq/XipiVFrjwV/t3LC6j5DoqTJYR
-mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
-----END RSA PRIVATE KEY-----';
-
-
-
-
-	/**
-	 * @param string $publicKey
-	 */
-	public function setPublic(string $publicKey)
-	{
-		$this->public = $publicKey;
-	}
-
-	/**
-	 * @param int $timeout
-	 */
-	public function setTimeout(int $timeout)
-	{
-		$this->timeout = $timeout;
-	}
-
-
-	public function setScene(string $scene)
-	{
-		$this->scene = $scene;
-	}
-
-
-	/**
-	 * @param string $timeout
-	 */
-	public function setKey(string $timeout)
-	{
-		$this->key = $timeout;
-	}
-
-	/**
-	 * @param string $privateKey
-	 */
-	public function setPrivate(string $privateKey)
-	{
-		$this->private = $privateKey;
-	}
-
-
-	/**
-	 * @param string $privateKey
-	 */
-	public function setIv(string $privateKey)
-	{
-		$this->iv = $privateKey;
-	}
-
-
-	/**
-	 * @param string $privateKey
-	 */
-	public function setEncrypt(string $privateKey)
-	{
-		$this->encrypt = $privateKey;
-	}
-
-
-}
@@ -13,7 +13,7 @@ use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Json;
 use Kiri\Di\Container;
-use Kiri\Di\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use ReflectionException;
 use Server\ServerManager;
 use Swoole\Coroutine;
@@ -229,6 +229,15 @@ class Kiri
 	}


+	/**
+	 * @return Container
+	 */
+	public static function di(): Container
+	{
+		return static::$container;
+	}
+
+
 	/**
 	 * @param $workerId
 	 * @return mixed
Author	SHA1	Message	Date
as2252258	95ae1fe999	1	2021-11-27 17:58:17 +08:00
as2252258	9668830ee2	1	2021-11-27 17:45:39 +08:00
as2252258	f26539c41f	1	2021-11-27 17:43:29 +08:00
as2252258	3ead688d5f	Merge remote-tracking branch 'origin/master'	2021-11-26 11:28:37 +08:00
as2252258	157c233ed6	改名	2021-11-26 11:27:55 +08:00
as2252258	40b4c2a4c9	1	2021-11-24 23:46:26 +08:00
as2252258	a7db58d7e4	改名	2021-11-24 17:07:35 +08:00
as2252258	87e4bfdbec	改名	2021-11-24 17:07:13 +08:00