diff --git a/function.php b/function.php
index 0bfa67ae..55e10b06 100644
--- a/function.php
+++ b/function.php
@@ -22,10 +22,10 @@ interface Arrayable
{
- /**
- * @return array
- */
- public function toArray(): array;
+ /**
+ * @return array
+ */
+ public function toArray(): array;
}
@@ -33,111 +33,111 @@ interface Arrayable
if (!function_exists('json_validate')) {
- /**
- * @param string $data
- * @return bool
- */
- function json_validate(string $data): bool
- {
- return is_array(json_decode($data, true));
- }
+ /**
+ * @param string $data
+ * @return bool
+ */
+ function json_validate(string $data): bool
+ {
+ return is_array(json_decode($data, true));
+ }
}
if (!function_exists('application')) {
- /**
- * @param Kernel $Kernel
- * @return Application
- */
- function application(Kernel $Kernel): Application
- {
- $application = Kiri::getDi()->get(Application::class);
- $application->commands($Kernel);
- return $application;
- }
+ /**
+ * @param Kernel $Kernel
+ * @return Application
+ */
+ function application(Kernel $Kernel): Application
+ {
+ $application = Kiri::getDi()->get(Application::class);
+ $application->commands($Kernel);
+ return $application;
+ }
}
if (!function_exists('task')) {
- /**
- * @param string $handler
- * @param mixed $data
- * @param int $dstWorkerId
- * @param callable|null $finishFinishCallback
- * @return void
- * @throws Exception
- */
- function task(string $handler, mixed $data, int $dstWorkerId = -1, ?callable $finishFinishCallback = null): void
- {
- $execute = Kiri::getDi()->get(TaskExecute::class);
- $execute->task($handler, $data, $dstWorkerId, $finishFinishCallback);
- }
+ /**
+ * @param string $handler
+ * @param mixed $data
+ * @param int $dstWorkerId
+ * @param callable|null $finishFinishCallback
+ * @return void
+ * @throws Exception
+ */
+ function task(string $handler, mixed $data, int $dstWorkerId = -1, ?callable $finishFinishCallback = null): void
+ {
+ $execute = Kiri::getDi()->get(TaskExecute::class);
+ $execute->task($handler, $data, $dstWorkerId, $finishFinishCallback);
+ }
}
if (!function_exists('taskWait')) {
- /**
- * @param string $handler
- * @param mixed $data
- * @param float $timeout
- * @param int $dstWorkerId
- * @return mixed
- * @throws Exception
- */
- function taskWait(string $handler, mixed $data, float $timeout = 0.5, int $dstWorkerId = -1): mixed
- {
- $execute = Kiri::getDi()->get(TaskExecute::class);
- return $execute->taskWait($handler, $data, $timeout, $dstWorkerId);
- }
+ /**
+ * @param string $handler
+ * @param mixed $data
+ * @param float $timeout
+ * @param int $dstWorkerId
+ * @return mixed
+ * @throws Exception
+ */
+ function taskWait(string $handler, mixed $data, float $timeout = 0.5, int $dstWorkerId = -1): mixed
+ {
+ $execute = Kiri::getDi()->get(TaskExecute::class);
+ return $execute->taskWait($handler, $data, $timeout, $dstWorkerId);
+ }
}
if (!function_exists('taskCo')) {
- /**
- * @param array $tasks
- * @param float $timeout
- * @return false|array
- */
- function taskCo(array $tasks, float $timeout = 0.5): false|array
- {
- $execute = Kiri::getDi()->get(TaskExecute::class);
- return $execute->taskCo($tasks, $timeout);
- }
+ /**
+ * @param array $tasks
+ * @param float $timeout
+ * @return false|array
+ */
+ function taskCo(array $tasks, float $timeout = 0.5): false|array
+ {
+ $execute = Kiri::getDi()->get(TaskExecute::class);
+ return $execute->taskCo($tasks, $timeout);
+ }
}
if (!function_exists('taskWaitMulti')) {
- /**
- * @param array $tasks
- * @param float $timeout
- * @return false|array
- */
- function taskWaitMulti(array $tasks, float $timeout = 0.5): false|array
- {
- $execute = Kiri::getDi()->get(TaskExecute::class);
- return $execute->taskWaitMulti($tasks, $timeout);
- }
+ /**
+ * @param array $tasks
+ * @param float $timeout
+ * @return false|array
+ */
+ function taskWaitMulti(array $tasks, float $timeout = 0.5): false|array
+ {
+ $execute = Kiri::getDi()->get(TaskExecute::class);
+ return $execute->taskWaitMulti($tasks, $timeout);
+ }
}
if (!function_exists('make')) {
- /**
- * @param $name
- * @param $default
- * @return mixed
- * @throws
- */
- function make($name, $default = NULL): mixed
- {
- if (!class_exists($name) && !interface_exists($name)) {
- return Kiri::getDi()->get($default);
- }
- return Kiri::getDi()->get($name);
- }
+ /**
+ * @param $name
+ * @param $default
+ * @return mixed
+ * @throws
+ */
+ function make($name, $default = NULL): mixed
+ {
+ if (!class_exists($name) && !interface_exists($name)) {
+ return Kiri::getDi()->get($default);
+ }
+ return Kiri::getDi()->get($name);
+ }
}
@@ -145,30 +145,30 @@ if (!function_exists('make')) {
if (!function_exists('isJson')) {
- function isJson(?string $string): bool
- {
- if (is_null($string))
- return false;
- return (str_starts_with($string, '{') && str_ends_with($string, '}'))
- || (str_ends_with($string, '[') && str_starts_with($string, ']'));
- }
+ function isJson(?string $string): bool
+ {
+ if (is_null($string))
+ return false;
+ return (str_starts_with($string, '{') && str_ends_with($string, '}'))
+ || (str_ends_with($string, '[') && str_starts_with($string, ']'));
+ }
}
if (!function_exists('instance')) {
- /**
- * @param $class
- * @param array $constrict
- * @param array $config
- * @return null|object
- * @throws
- */
- function instance($class, array $constrict = [], array $config = []): ?object
- {
- return Kiri::getDi()->make($class, $constrict, $config);
- }
+ /**
+ * @param $class
+ * @param array $constrict
+ * @param array $config
+ * @return null|object
+ * @throws
+ */
+ function instance($class, array $constrict = [], array $config = []): ?object
+ {
+ return Kiri::getDi()->make($class, $constrict, $config);
+ }
}
@@ -177,54 +177,54 @@ if (!function_exists('instance')) {
if (!function_exists('call')) {
- /**
- * @param $handler
- * @param mixed ...$params
- * @return mixed
- * @throws
- */
- function call($handler, ...$params): mixed
- {
- if (is_array($handler) && is_string($handler[0])) {
- $handler[0] = di($handler[0]);
- }
- if (!is_callable($handler, true)) {
- throw new Exception('Call function not exists.');
- }
- return call_user_func($handler, ...$params);
- }
+ /**
+ * @param $handler
+ * @param mixed ...$params
+ * @return mixed
+ * @throws
+ */
+ function call($handler, ...$params): mixed
+ {
+ if (is_array($handler) && is_string($handler[0])) {
+ $handler[0] = di($handler[0]);
+ }
+ if (!is_callable($handler, true)) {
+ throw new Exception('Call function not exists.');
+ }
+ return call_user_func($handler, ...$params);
+ }
}
if (!function_exists('checkPortIsAlready')) {
- /**
- * @param $port
- * @return bool|string
- * @throws
- */
- function checkPortIsAlready($port): bool|string
- {
- if (!Kiri::getPlatform()->isLinux()) {
- exec("lsof -i :" . $port . " | grep -i 'LISTEN' | awk '{print $2}'", $output);
- if (empty($output))
- return FALSE;
- $output = explode(PHP_EOL, $output[0]);
- return $output[0];
- }
+ /**
+ * @param $port
+ * @return bool|string
+ * @throws
+ */
+ function checkPortIsAlready($port): bool|string
+ {
+ if (!Kiri::getPlatform()->isLinux()) {
+ exec("lsof -i :" . $port . " | grep -i 'LISTEN' | awk '{print $2}'", $output);
+ if (empty($output))
+ return FALSE;
+ $output = explode(PHP_EOL, $output[0]);
+ return $output[0];
+ }
- $serverPid = file_get_contents(storage('.swoole.pid'));
- if (!empty($serverPid) && shell_exec('ps -ef | grep ' . $serverPid . ' | grep -v grep')) {
- Process::kill($serverPid, 0) && Process::kill($serverPid, SIGTERM);
- }
+ $serverPid = file_get_contents(storage('.swoole.pid'));
+ if (!empty($serverPid) && shell_exec('ps -ef | grep ' . $serverPid . ' | grep -v grep')) {
+ Process::kill($serverPid, 0) && Process::kill($serverPid, SIGTERM);
+ }
- exec('netstat -lnp | grep ' . $port . ' | grep "LISTEN" | awk \'{print $7}\'', $output);
- if (empty($output)) {
- return FALSE;
- }
- return explode('/', $output[0])[0];
- }
+ exec('netstat -lnp | grep ' . $port . ' | grep "LISTEN" | awk \'{print $7}\'', $output);
+ if (empty($output)) {
+ return FALSE;
+ }
+ return explode('/', $output[0])[0];
+ }
}
@@ -232,24 +232,24 @@ if (!function_exists('checkPortIsAlready')) {
if (!function_exists('set_env')) {
- /**
- * @param $key
- * @param $value
- */
- function set_env($key, $value): void
- {
- putenv(sprintf('%s=%s', $key, $value));
- }
+ /**
+ * @param $key
+ * @param $value
+ */
+ function set_env($key, $value): void
+ {
+ putenv(sprintf('%s=%s', $key, $value));
+ }
}
if (!function_exists('enable_file_modification_listening')) {
- function enable_file_modification_listening(): void
- {
- putenv('enable_file_modification_listening=on');
- }
+ function enable_file_modification_listening(): void
+ {
+ putenv('enable_file_modification_listening=on');
+ }
}
@@ -258,13 +258,14 @@ if (!function_exists('enable_file_modification_listening')) {
if (!function_exists('is_enable_file_modification_listening')) {
- /**
- * @return bool
- */
- #[Pure] function is_enable_file_modification_listening(): bool
- {
- return env('enable_file_modification_listening', 'off') == 'on';
- }
+ /**
+ * @return bool
+ */
+ #[Pure]
+ function is_enable_file_modification_listening(): bool
+ {
+ return env('enable_file_modification_listening', 'off') == 'on';
+ }
}
@@ -272,10 +273,10 @@ if (!function_exists('is_enable_file_modification_listening')) {
if (!function_exists('disable_file_modification_listening')) {
- function disable_file_modification_listening(): void
- {
- putenv('enable_file_modification_listening=off');
- }
+ function disable_file_modification_listening(): void
+ {
+ putenv('enable_file_modification_listening=off');
+ }
}
@@ -283,26 +284,26 @@ if (!function_exists('disable_file_modification_listening')) {
if (!function_exists('now')) {
- /**
- * @return string
- */
- function now(): string
- {
- return date('Y-m-d H:i:s') . '.' . str_replace(time() . '.', '', (string)microtime(TRUE));
- }
+ /**
+ * @return string
+ */
+ function now(): string
+ {
+ return date('Y-m-d H:i:s') . '.' . str_replace(time() . '.', '', (string)microtime(TRUE));
+ }
}
if (!function_exists('directory')) {
- /**
- * @param $name
- * @return string
- */
- function directory($name): string
- {
- return realpath(APP_PATH . $name);
- }
+ /**
+ * @param $name
+ * @return string
+ */
+ function directory($name): string
+ {
+ return realpath(APP_PATH . $name);
+ }
}
@@ -311,77 +312,77 @@ if (!function_exists('directory')) {
if (!function_exists('msgpack_pack')) {
- /**
- * @param $content
- * @return string
- */
- function msgpack_pack($content): string
- {
- return serialize($content);
- }
+ /**
+ * @param $content
+ * @return string
+ */
+ function msgpack_pack($content): string
+ {
+ return serialize($content);
+ }
}
if (!function_exists('msgpack_unpack')) {
- /**
- * @param $content
- * @return mixed
- */
- function msgpack_unpack($content): mixed
- {
- return unserialize($content);
- }
+ /**
+ * @param $content
+ * @return mixed
+ */
+ function msgpack_unpack($content): mixed
+ {
+ return unserialize($content);
+ }
}
if (!function_exists('request')) {
- /**
- * @return Request
- * @throws
- */
- function request(): RequestInterface
- {
- $request = Kiri::getDi()->get(RequestInterface::class);
+ /**
+ * @return Request
+ * @throws
+ */
+ function request(): RequestInterface
+ {
+ $request = Kiri::getDi()->get(RequestInterface::class);
- return Context::get(RequestInterface::class, $request);
- }
+ return Context::get(RequestInterface::class, $request);
+ }
}
if (!function_exists('inject')) {
- /**
- * @param object $object
- * @return object
- * @throws
- */
- function inject(object $object): object
- {
- $container = Kiri::getDi();
- $reflect = $container->getReflectionClass($object::class);
- $container->resolveProperties($reflect, $object);
- return $object;
- }
+ /**
+ * @param object $object
+ * @return object
+ * @throws
+ */
+ function inject(object $object): object
+ {
+ $container = Kiri::getDi();
+ $reflect = $container->getReflectionClass($object::class);
+ $container->resolveProperties($reflect, $object);
+ return $object;
+ }
}
if (!function_exists('response')) {
- /**
- * @return Response
- * @throws
- */
- function response(): ResponseInterface
- {
- $data = Kiri::getDi()->get(ResponseInterface::class);
+ /**
+ * @return Response
+ * @throws
+ */
+ function response(): ResponseInterface
+ {
+ $data = Kiri::getDi()->get(ResponseInterface::class);
- return Context::get(ResponseInterface::class, $data);
- }
+ return Context::get(ResponseInterface::class, $data);
+ }
}
@@ -389,352 +390,352 @@ if (!function_exists('response')) {
if (!function_exists('redis')) {
- /**
- * @return \Kiri\Redis\Redis|Redis
- * @throws
- */
- function redis(): \Kiri\Redis\Redis|Redis
- {
- return Kiri::getDi()->get(\Kiri\Redis\Redis::class);
- }
+ /**
+ * @return \Kiri\Redis\Redis|Redis
+ * @throws
+ */
+ function redis(): \Kiri\Redis\Redis|Redis
+ {
+ return Kiri::getDi()->get(\Kiri\Redis\Redis::class);
+ }
}
if (!function_exists('fire')) {
- /**
- * @param object $event
- * @throws
- */
- function fire(object $event): void
- {
- di(EventDispatch::class)->dispatch($event);
- }
+ /**
+ * @param object $event
+ * @throws
+ */
+ function fire(object $event): void
+ {
+ di(EventDispatch::class)->dispatch($event);
+ }
}
if (!function_exists('exif_imagetype')) {
- /**
- * @param $name
- * @return string
- */
- function exif_imagetype($name): string
- {
- return get_file_extension($name);
- }
+ /**
+ * @param $name
+ * @return string
+ */
+ function exif_imagetype($name): string
+ {
+ return get_file_extension($name);
+ }
}
if (!function_exists('trim_blank')) {
- /**
- * 空白字符替换
- * @param string $content 内容
- * @param int $len 截取长度
- * @param string $encode 编码
- * @param bool $htmlTags
- * @return array|string|null
- */
- function trim_blank(string $content, int $len = 0, string $encode = 'utf-8', bool $htmlTags = TRUE): array|string|null
- {
- $str = trim($content);
- if ($htmlTags) {
- $str = strip_tags($str);
- }
- $str = preg_replace('/[\n|\r|\t]+/', '', $str);
- $str = preg_replace("/(\s|\ \;| |\xc2\xa0)/", '', $str);
- if ($len > 0) {
- return mb_substr($str, 0, $len, $encode);
- } else {
- return $str;
- }
- }
+ /**
+ * 空白字符替换
+ * @param string $content 内容
+ * @param int $len 截取长度
+ * @param string $encode 编码
+ * @param bool $htmlTags
+ * @return array|string|null
+ */
+ function trim_blank(string $content, int $len = 0, string $encode = 'utf-8', bool $htmlTags = TRUE): array|string|null
+ {
+ $str = trim($content);
+ if ($htmlTags) {
+ $str = strip_tags($str);
+ }
+ $str = preg_replace('/[\n|\r|\t]+/', '', $str);
+ $str = preg_replace("/(\s|\ \;| |\xc2\xa0)/", '', $str);
+ if ($len > 0) {
+ return mb_substr($str, 0, $len, $encode);
+ } else {
+ return $str;
+ }
+ }
}
if (!function_exists('get_file_extension')) {
- function get_file_extension($filename): bool|int|string
- {
- $mime_types = [
- 'txt' => 'text/plain',
- 'htm' => 'text/html',
- 'html' => 'text/html',
- 'php' => 'text/html',
- 'css' => 'text/css',
- 'js' => 'application/javascript',
- 'json' => 'application/json',
- 'xml' => 'application/xml',
- 'swf' => 'application/x-shockwave-flash',
- 'flv' => 'video/x-flv',
+ function get_file_extension($filename): bool|int|string
+ {
+ $mime_types = [
+ 'txt' => 'text/plain',
+ 'htm' => 'text/html',
+ 'html' => 'text/html',
+ 'php' => 'text/html',
+ 'css' => 'text/css',
+ 'js' => 'application/javascript',
+ 'json' => 'application/json',
+ 'xml' => 'application/xml',
+ 'swf' => 'application/x-shockwave-flash',
+ 'flv' => 'video/x-flv',
- // images
- 'png' => 'image/png',
- 'jpeg' => 'image/jpeg',
- 'gif' => 'image/gif',
- 'bmp' => 'image/bmp',
- 'ico' => 'image/vnd.microsoft.icon',
- 'tiff' => 'image/tiff',
- 'svg' => 'image/svg+xml',
+ // images
+ 'png' => 'image/png',
+ 'jpeg' => 'image/jpeg',
+ 'gif' => 'image/gif',
+ 'bmp' => 'image/bmp',
+ 'ico' => 'image/vnd.microsoft.icon',
+ 'tiff' => 'image/tiff',
+ 'svg' => 'image/svg+xml',
- // archives
- 'zip' => 'application/zip',
- 'rar' => 'application/x-rar-compressed',
- 'exe' => 'application/x-msdownload',
- 'msi' => 'application/x-msdownload',
- 'cab' => 'application/vnd.ms-cab-compressed',
+ // archives
+ 'zip' => 'application/zip',
+ 'rar' => 'application/x-rar-compressed',
+ 'exe' => 'application/x-msdownload',
+ 'msi' => 'application/x-msdownload',
+ 'cab' => 'application/vnd.ms-cab-compressed',
- // audio/video
- 'mp3' => 'audio/mpeg',
- 'qt' => 'video/quicktime',
- 'mov' => 'video/quicktime',
+ // audio/video
+ 'mp3' => 'audio/mpeg',
+ 'qt' => 'video/quicktime',
+ 'mov' => 'video/quicktime',
- // adobe
- 'pdf' => 'application/pdf',
- 'psd' => 'image/vnd.adobe.photoshop',
- 'ai' => 'application/postscript',
- 'eps' => 'application/postscript',
- 'ps' => 'application/postscript',
+ // adobe
+ 'pdf' => 'application/pdf',
+ 'psd' => 'image/vnd.adobe.photoshop',
+ 'ai' => 'application/postscript',
+ 'eps' => 'application/postscript',
+ 'ps' => 'application/postscript',
- // ms office
- 'doc' => 'application/msword',
- 'rtf' => 'application/rtf',
- 'xls' => 'application/vnd.ms-excel',
- 'ppt' => 'application/vnd.ms-powerpoint',
+ // ms office
+ 'doc' => 'application/msword',
+ 'rtf' => 'application/rtf',
+ 'xls' => 'application/vnd.ms-excel',
+ 'ppt' => 'application/vnd.ms-powerpoint',
- // open office
- 'odt' => 'application/vnd.oasis.opendocument.text',
- 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+ // open office
+ 'odt' => 'application/vnd.oasis.opendocument.text',
+ 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
- '323' => 'text / h323',
- 'acx' => 'application/internet-property-stream',
- 'aif' => 'audio/x-aiff',
- 'aifc' => 'audio/x-aiff',
- 'aiff' => 'audio/x-aiff',
- 'asf' => 'video/x-ms-asf',
- 'asr' => 'video/x-ms-asf',
- 'asx' => 'video/x-ms-asf',
- 'au' => 'audio/basic',
- 'avi' => 'video/x-msvideo',
- 'axs' => 'application/olescript',
- 'bas' => 'text/plain',
- 'bcpio' => 'application/x-bcpio',
- 'bin' => 'application/octet-stream',
- 'c' => 'text/plain',
- 'cat' => 'application/vnd.ms-pkiseccat',
- 'cdf' => 'application/x-cdf',
- 'cer' => 'application/x-x509-ca-cert',
- 'class' => 'application/octet-stream',
- 'clp' => 'application/x-msclip',
- 'cmx' => 'image/x-cmx',
- 'cod' => 'image/cis-cod',
- 'cpio' => 'application/x-cpio',
- 'crd' => 'application/x-mscardfile',
- 'crl' => 'application/pkix-crl',
- 'crt' => 'application/x-x509-ca-cert',
- 'csh' => 'application/x-csh',
- 'dcr' => 'application/x-director',
- 'der' => 'application/x-x509-ca-cert',
- 'dir' => 'application/x-director',
- 'dll' => 'application/x-msdownload',
- 'dms' => 'application/octet-stream',
- 'dot' => 'application/msword',
- 'dvi' => 'application/x-dvi',
- 'dxr' => 'application/x-director',
- 'etx' => 'text/x-setext',
- 'evy' => 'application/envoy',
- 'fif' => 'application/fractals',
- 'flr' => 'x-world/x-vrml',
- 'gtar' => 'application/x-gtar',
- 'gz' => 'application/x-gzip',
- 'h' => 'text/plain',
- 'hdf' => 'application/x-hdf',
- 'hlp' => 'application/winhlp',
- 'hqx' => 'application/mac-binhex40',
- 'hta' => 'application/hta',
- 'htc' => 'text/x-component',
- 'htt' => 'text/webviewhtml',
- 'ief' => 'image/ief',
- 'iii' => 'application/x-iphone',
- 'ins' => 'application/x-internet-signup',
- 'isp' => 'application/x-internet-signup',
- 'jfif' => 'image/pipeg',
- 'jpe' => 'image/jpeg',
- 'jpg' => 'image/jpeg',
- 'latex' => 'application/x-latex',
- 'lha' => 'application/octet-stream',
- 'lsf' => 'video/x-la-asf',
- 'lsx' => 'video/x-la-asf',
- 'lzh' => 'application/octet-stream',
- 'm13' => 'application/x-msmediaview',
- 'm14' => 'application/x-msmediaview',
- 'm3u' => 'audio/x-mpegurl',
- 'man' => 'application/x-troff-man',
- 'mdb' => 'application/x-msaccess',
- 'me' => 'application/x-troff-me',
- 'mht' => 'message/rfc822',
- 'mhtml' => 'message/rfc822',
- 'mid' => 'audio/mid',
- 'mny' => 'application/x-msmoney',
- 'movie' => 'video/x-sgi-movie',
- 'mp2' => 'video/mpeg',
- 'mpa' => 'video/mpeg',
- 'mpe' => 'video/mpeg',
- 'mpeg' => 'video/mpeg',
- 'mpg' => 'video/mpeg',
- 'mpp' => 'application/vnd.ms-project',
- 'mpv2' => 'video/mpeg',
- 'ms' => 'application/x-troff-ms',
- 'mvb' => 'application/x-msmediaview',
- 'nws' => 'message/rfc822',
- 'oda' => 'application/oda',
- 'p10' => 'application/pkcs10',
- 'p12' => 'application/x-pkcs12',
- 'p7b' => 'application/x-pkcs7-certificates',
- 'p7c' => 'application/x-pkcs7-mime',
- 'p7m' => 'application/x-pkcs7-mime',
- 'p7r' => 'application/x-pkcs7-certreqresp',
- 'p7s' => 'application/x-pkcs7-signature',
- 'pbm' => 'image/x-portable-bitmap',
- 'pfx' => 'application/x-pkcs12',
- 'pgm' => 'image/x-portable-graymap',
- 'pko' => 'application/ynd.ms-pkipko',
- 'pma' => 'application/x-perfmon',
- 'pmc' => 'application/x-perfmon',
- 'pml' => 'application/x-perfmon',
- 'pmr' => 'application/x-perfmon',
- 'pmw' => 'application/x-perfmon',
- 'pnm' => 'image/x-portable-anymap',
- 'pot' => 'application/vnd.ms-powerpoint',
- 'ppm' => 'image/x-portable-pixmap',
- 'pps' => 'application/vnd.ms-powerpoint',
- 'prf' => 'application/pics-rules',
- 'pub' => 'application/x-mspublisher',
- 'ra' => 'audio/x-pn-realaudio',
- 'ram' => 'audio/x-pn-realaudio',
- 'ras' => 'image/x-cmu-raster',
- 'rgb' => 'image/x-rgb',
- 'rmi' => 'audio/mid',
- 'roff' => 'application/x-troff',
- 'rtx' => 'text/richtext',
- 'scd' => 'application/x-msschedule',
- 'sct' => 'text/scriptlet',
- 'setpay' => 'application/set-payment-initiation',
- 'setreg' => 'application/set-registration-initiation',
- 'sh' => 'application/x-sh',
- 'shar' => 'application/x-shar',
- 'sit' => 'application/x-stuffit',
- 'snd' => 'audio/basic',
- 'spc' => 'application/x-pkcs7-certificates',
- 'spl' => 'application/futuresplash',
- 'src' => 'application/x-wais-source',
- 'sst' => 'application/vnd.ms-pkicertstore',
- 'stl' => 'application/vnd.ms-pkistl',
- 'stm' => 'text/html',
- 'sv4cpio' => 'application/x-sv4cpio',
- 'sv4crc' => 'application/x-sv4crc',
- 't' => 'application/x-troff',
- 'tar' => 'application/x-tar',
- 'tcl' => 'application/x-tcl',
- 'tex' => 'application/x-tex',
- 'texi' => 'application/x-texinfo',
- 'texinfo' => 'application/x-texinfo',
- 'tgz' => 'application/x-compressed',
- 'tif' => 'image/tiff',
- 'tr' => 'application/x-troff',
- 'trm' => 'application/x-msterminal',
- 'tsv' => 'text/tab-separated-values',
- 'uls' => 'text/iuls',
- 'ustar' => 'application/x-ustar',
- 'vcf' => 'text/x-vcard',
- 'vrml' => 'x-world/x-vrml',
- 'wav' => 'audio/x-wav',
- 'wcm' => 'application/vnd.ms-works',
- 'wdb' => 'application/vnd.ms-works',
- 'wks' => 'application/vnd.ms-works',
- 'wmf' => 'application/x-msmetafile',
- 'wps' => 'application/vnd.ms-works',
- 'wri' => 'application/x-mswrite',
- 'wrl' => 'x-world/x-vrml',
- 'wrz' => 'x-world/x-vrml',
- 'xaf' => 'x-world/x-vrml',
- 'xbm' => 'image/x-xbitmap',
- 'xla' => 'application/vnd.ms-excel',
- 'xlc' => 'application/vnd.ms-excel',
- 'xlm' => 'application/vnd.ms-excel',
- 'xlt' => 'application/vnd.ms-excel',
- 'xlw' => 'application/vnd.ms-excel',
- 'xof' => 'x-world/x-vrml',
- 'xpm' => 'image/x-xpixmap',
- 'xwd' => 'image/x-xwindowdump',
- 'z' => 'application/x-compress',
- ];
+ '323' => 'text / h323',
+ 'acx' => 'application/internet-property-stream',
+ 'aif' => 'audio/x-aiff',
+ 'aifc' => 'audio/x-aiff',
+ 'aiff' => 'audio/x-aiff',
+ 'asf' => 'video/x-ms-asf',
+ 'asr' => 'video/x-ms-asf',
+ 'asx' => 'video/x-ms-asf',
+ 'au' => 'audio/basic',
+ 'avi' => 'video/x-msvideo',
+ 'axs' => 'application/olescript',
+ 'bas' => 'text/plain',
+ 'bcpio' => 'application/x-bcpio',
+ 'bin' => 'application/octet-stream',
+ 'c' => 'text/plain',
+ 'cat' => 'application/vnd.ms-pkiseccat',
+ 'cdf' => 'application/x-cdf',
+ 'cer' => 'application/x-x509-ca-cert',
+ 'class' => 'application/octet-stream',
+ 'clp' => 'application/x-msclip',
+ 'cmx' => 'image/x-cmx',
+ 'cod' => 'image/cis-cod',
+ 'cpio' => 'application/x-cpio',
+ 'crd' => 'application/x-mscardfile',
+ 'crl' => 'application/pkix-crl',
+ 'crt' => 'application/x-x509-ca-cert',
+ 'csh' => 'application/x-csh',
+ 'dcr' => 'application/x-director',
+ 'der' => 'application/x-x509-ca-cert',
+ 'dir' => 'application/x-director',
+ 'dll' => 'application/x-msdownload',
+ 'dms' => 'application/octet-stream',
+ 'dot' => 'application/msword',
+ 'dvi' => 'application/x-dvi',
+ 'dxr' => 'application/x-director',
+ 'etx' => 'text/x-setext',
+ 'evy' => 'application/envoy',
+ 'fif' => 'application/fractals',
+ 'flr' => 'x-world/x-vrml',
+ 'gtar' => 'application/x-gtar',
+ 'gz' => 'application/x-gzip',
+ 'h' => 'text/plain',
+ 'hdf' => 'application/x-hdf',
+ 'hlp' => 'application/winhlp',
+ 'hqx' => 'application/mac-binhex40',
+ 'hta' => 'application/hta',
+ 'htc' => 'text/x-component',
+ 'htt' => 'text/webviewhtml',
+ 'ief' => 'image/ief',
+ 'iii' => 'application/x-iphone',
+ 'ins' => 'application/x-internet-signup',
+ 'isp' => 'application/x-internet-signup',
+ 'jfif' => 'image/pipeg',
+ 'jpe' => 'image/jpeg',
+ 'jpg' => 'image/jpeg',
+ 'latex' => 'application/x-latex',
+ 'lha' => 'application/octet-stream',
+ 'lsf' => 'video/x-la-asf',
+ 'lsx' => 'video/x-la-asf',
+ 'lzh' => 'application/octet-stream',
+ 'm13' => 'application/x-msmediaview',
+ 'm14' => 'application/x-msmediaview',
+ 'm3u' => 'audio/x-mpegurl',
+ 'man' => 'application/x-troff-man',
+ 'mdb' => 'application/x-msaccess',
+ 'me' => 'application/x-troff-me',
+ 'mht' => 'message/rfc822',
+ 'mhtml' => 'message/rfc822',
+ 'mid' => 'audio/mid',
+ 'mny' => 'application/x-msmoney',
+ 'movie' => 'video/x-sgi-movie',
+ 'mp2' => 'video/mpeg',
+ 'mpa' => 'video/mpeg',
+ 'mpe' => 'video/mpeg',
+ 'mpeg' => 'video/mpeg',
+ 'mpg' => 'video/mpeg',
+ 'mpp' => 'application/vnd.ms-project',
+ 'mpv2' => 'video/mpeg',
+ 'ms' => 'application/x-troff-ms',
+ 'mvb' => 'application/x-msmediaview',
+ 'nws' => 'message/rfc822',
+ 'oda' => 'application/oda',
+ 'p10' => 'application/pkcs10',
+ 'p12' => 'application/x-pkcs12',
+ 'p7b' => 'application/x-pkcs7-certificates',
+ 'p7c' => 'application/x-pkcs7-mime',
+ 'p7m' => 'application/x-pkcs7-mime',
+ 'p7r' => 'application/x-pkcs7-certreqresp',
+ 'p7s' => 'application/x-pkcs7-signature',
+ 'pbm' => 'image/x-portable-bitmap',
+ 'pfx' => 'application/x-pkcs12',
+ 'pgm' => 'image/x-portable-graymap',
+ 'pko' => 'application/ynd.ms-pkipko',
+ 'pma' => 'application/x-perfmon',
+ 'pmc' => 'application/x-perfmon',
+ 'pml' => 'application/x-perfmon',
+ 'pmr' => 'application/x-perfmon',
+ 'pmw' => 'application/x-perfmon',
+ 'pnm' => 'image/x-portable-anymap',
+ 'pot' => 'application/vnd.ms-powerpoint',
+ 'ppm' => 'image/x-portable-pixmap',
+ 'pps' => 'application/vnd.ms-powerpoint',
+ 'prf' => 'application/pics-rules',
+ 'pub' => 'application/x-mspublisher',
+ 'ra' => 'audio/x-pn-realaudio',
+ 'ram' => 'audio/x-pn-realaudio',
+ 'ras' => 'image/x-cmu-raster',
+ 'rgb' => 'image/x-rgb',
+ 'rmi' => 'audio/mid',
+ 'roff' => 'application/x-troff',
+ 'rtx' => 'text/richtext',
+ 'scd' => 'application/x-msschedule',
+ 'sct' => 'text/scriptlet',
+ 'setpay' => 'application/set-payment-initiation',
+ 'setreg' => 'application/set-registration-initiation',
+ 'sh' => 'application/x-sh',
+ 'shar' => 'application/x-shar',
+ 'sit' => 'application/x-stuffit',
+ 'snd' => 'audio/basic',
+ 'spc' => 'application/x-pkcs7-certificates',
+ 'spl' => 'application/futuresplash',
+ 'src' => 'application/x-wais-source',
+ 'sst' => 'application/vnd.ms-pkicertstore',
+ 'stl' => 'application/vnd.ms-pkistl',
+ 'stm' => 'text/html',
+ 'sv4cpio' => 'application/x-sv4cpio',
+ 'sv4crc' => 'application/x-sv4crc',
+ 't' => 'application/x-troff',
+ 'tar' => 'application/x-tar',
+ 'tcl' => 'application/x-tcl',
+ 'tex' => 'application/x-tex',
+ 'texi' => 'application/x-texinfo',
+ 'texinfo' => 'application/x-texinfo',
+ 'tgz' => 'application/x-compressed',
+ 'tif' => 'image/tiff',
+ 'tr' => 'application/x-troff',
+ 'trm' => 'application/x-msterminal',
+ 'tsv' => 'text/tab-separated-values',
+ 'uls' => 'text/iuls',
+ 'ustar' => 'application/x-ustar',
+ 'vcf' => 'text/x-vcard',
+ 'vrml' => 'x-world/x-vrml',
+ 'wav' => 'audio/x-wav',
+ 'wcm' => 'application/vnd.ms-works',
+ 'wdb' => 'application/vnd.ms-works',
+ 'wks' => 'application/vnd.ms-works',
+ 'wmf' => 'application/x-msmetafile',
+ 'wps' => 'application/vnd.ms-works',
+ 'wri' => 'application/x-mswrite',
+ 'wrl' => 'x-world/x-vrml',
+ 'wrz' => 'x-world/x-vrml',
+ 'xaf' => 'x-world/x-vrml',
+ 'xbm' => 'image/x-xbitmap',
+ 'xla' => 'application/vnd.ms-excel',
+ 'xlc' => 'application/vnd.ms-excel',
+ 'xlm' => 'application/vnd.ms-excel',
+ 'xlt' => 'application/vnd.ms-excel',
+ 'xlw' => 'application/vnd.ms-excel',
+ 'xof' => 'x-world/x-vrml',
+ 'xpm' => 'image/x-xpixmap',
+ 'xwd' => 'image/x-xwindowdump',
+ 'z' => 'application/x-compress',
+ ];
- $explode = explode('.', $filename);
- $ext = strtolower(array_pop($explode));
- if (array_key_exists($ext, $mime_types)) {
- return $ext;
- } else if (function_exists('finfo_open')) {
- $fInfo = finfo_open(FILEINFO_MIME);
- $mimeType = finfo_file($fInfo, $filename);
- finfo_close($fInfo);
- $mimeType = current(explode('; ', $mimeType));
- if (!($search = array_search($mimeType, $mime_types))) {
- return $mimeType;
- }
- return $search;
- } else {
- return 'application/octet-stream';
- }
- }
+ $explode = explode('.', $filename);
+ $ext = strtolower(array_pop($explode));
+ if (array_key_exists($ext, $mime_types)) {
+ return $ext;
+ } else if (function_exists('finfo_open')) {
+ $fInfo = finfo_open(FILEINFO_MIME);
+ $mimeType = finfo_file($fInfo, $filename);
+ finfo_close($fInfo);
+ $mimeType = current(explode('; ', $mimeType));
+ if (!($search = array_search($mimeType, $mime_types))) {
+ return $mimeType;
+ }
+ return $search;
+ } else {
+ return 'application/octet-stream';
+ }
+ }
}
if (!function_exists('storage')) {
- /**
- * @param string|null $fileName
- * @param string|null $path
- * @return string
- * @throws
- */
- function storage(?string $fileName = '', ?string $path = ''): string
- {
+ /**
+ * @param string|null $fileName
+ * @param string|null $path
+ * @return string
+ * @throws
+ */
+ function storage(?string $fileName = '', ?string $path = ''): string
+ {
- $basePath = rtrim(Kiri::getStoragePath(), '/');
- if (!empty($path)) {
- $path = ltrim($path, '/');
- if (!is_dir($basePath . '/' . $path)) {
- mkdir($basePath . '/' . $path, 0777, TRUE);
- }
- }
- if (empty($fileName)) {
- return $basePath . '/' . $path;
- }
- $fileName = $basePath . '/' . $path . $fileName;
- if (!file_exists($fileName)) {
- touch($fileName);
- }
- return $fileName;
- }
+ $basePath = rtrim(Kiri::getStoragePath(), '/');
+ if (!empty($path)) {
+ $path = ltrim($path, '/');
+ if (!is_dir($basePath . '/' . $path)) {
+ mkdir($basePath . '/' . $path, 0777, TRUE);
+ }
+ }
+ if (empty($fileName)) {
+ return $basePath . '/' . $path;
+ }
+ $fileName = $basePath . '/' . $path . $fileName;
+ if (!file_exists($fileName)) {
+ touch($fileName);
+ }
+ return $fileName;
+ }
}
if (!function_exists('on')) {
- /**
- * @param $name
- * @param $callback
- * @param int $index
- * @throws
- */
- function on($name, $callback, int $index = 0): void
- {
- $pro = di(EventProvider::class);
- $pro->on($name, $callback, $index);
- }
+ /**
+ * @param $name
+ * @param $callback
+ * @param int $index
+ * @throws
+ */
+ function on($name, $callback, int $index = 0): void
+ {
+ $pro = di(EventProvider::class);
+ $pro->on($name, $callback, $index);
+ }
}
@@ -742,104 +743,104 @@ if (!function_exists('on')) {
if (!function_exists('off')) {
- /**
- * @param $name
- * @param $callback
- * @throws
- */
- function off($name, $callback): void
- {
- $pro = di(EventProvider::class);
- $pro->off($name, $callback);
- }
+ /**
+ * @param $name
+ * @param $callback
+ * @throws
+ */
+ function off($name, $callback): void
+ {
+ $pro = di(EventProvider::class);
+ $pro->off($name, $callback);
+ }
}
if (!function_exists('process_name_set')) {
- /**
- * @param int $pid
- * @param string|null $prefix
- * @throws
- */
- function process_name_set(int $pid, ?string $prefix = NULL): void
- {
- if (Kiri::getPlatform()->isMac()) {
- return;
- }
+ /**
+ * @param int $pid
+ * @param string|null $prefix
+ * @throws
+ */
+ function process_name_set(int $pid, ?string $prefix = NULL): void
+ {
+ if (Kiri::getPlatform()->isMac()) {
+ return;
+ }
- $name = \config('site.id', 'system') . '[' . $pid . ']';
- if (!empty($prefix)) {
- $name .= '.' . $prefix;
- }
- swoole_set_process_name($name);
- }
+ $name = \config('site.id', 'system') . '[' . $pid . ']';
+ if (!empty($prefix)) {
+ $name .= '.' . $prefix;
+ }
+ swoole_set_process_name($name);
+ }
}
if (!function_exists('zero_full')) {
- /**
- * @param int $data
- * @param int $length
- * @return string
- */
- function zero_full(int $data = 1, int $length = 10): string
- {
- return sprintf('%0' . $length . 'd', $data);
- }
+ /**
+ * @param int $data
+ * @param int $length
+ * @return string
+ */
+ function zero_full(int $data = 1, int $length = 10): string
+ {
+ return sprintf('%0' . $length . 'd', $data);
+ }
}
if (!function_exists('env')) {
- /**
- * @param $key
- * @param null $default
- * @return array|string|null
- */
- function env($key, $default = NULL): null|array|string
- {
- $env = getenv($key);
- if ($env === FALSE) {
- return $default;
- }
- return $env;
- }
+ /**
+ * @param $key
+ * @param null $default
+ * @return array|string|null
+ */
+ function env($key, $default = NULL): null|array|string
+ {
+ $env = getenv($key);
+ if ($env === FALSE) {
+ return $default;
+ }
+ return $env;
+ }
}
if (!function_exists('config')) {
- /**
- * @param $key
- * @param null $default
- * @return mixed
- */
- function config($key, mixed $default = NULL): mixed
- {
- return make(ConfigProvider::class)->get($key, $default);
- }
+ /**
+ * @param $key
+ * @param null $default
+ * @return mixed
+ */
+ function config($key, mixed $default = NULL): mixed
+ {
+ return make(ConfigProvider::class)->get($key, $default);
+ }
}
if (!function_exists('created')) {
- /**
- * @param $key
- * @param array $construct
- * @param array $config
- * @return null|object
- * @throws
- */
- function created($key, array $construct = [], array $config = []): ?object
- {
- return Kiri::getDi()->make($key, $construct, $config);
- }
+ /**
+ * @param $key
+ * @param array $construct
+ * @param array $config
+ * @return null|object
+ * @throws
+ */
+ function created($key, array $construct = [], array $config = []): ?object
+ {
+ return Kiri::getDi()->make($key, $construct, $config);
+ }
}
@@ -847,24 +848,24 @@ if (!function_exists('created')) {
if (!function_exists('di')) {
- /**
- * @param string|object $className
- * @return mixed
- * @throws
- */
- function di(string|object $className): mixed
- {
- if (is_object($className)) {
- return $className;
- }
- return Kiri::getDi()->get($className);
- }
+ /**
+ * @param string|object $className
+ * @return mixed
+ * @throws
+ */
+ function di(string|object $className): mixed
+ {
+ if (is_object($className)) {
+ return $className;
+ }
+ return Kiri::getDi()->get($className);
+ }
}
if (!function_exists('sweep')) {
-
+
/**
* @param string $configPath
* @return array
@@ -872,161 +873,69 @@ if (!function_exists('sweep')) {
function sweep(string $configPath = APP_PATH . 'config'): array
{
$array = [];
-
+
// 检查目录是否存在
if (!is_dir($configPath)) {
throw new InvalidArgumentException("Config directory does not exist: {$configPath}");
}
-
+
// 获取所有PHP配置文件
$configFiles = glob($configPath . '/*.php');
foreach ($configFiles as $config) {
// 使用 pathinfo 更安全地获取文件名
$filename = pathinfo($config, PATHINFO_FILENAME);
- $key = strtolower($filename);
-
+ $key = strtolower($filename);
+
// 验证文件是否可读
if (!is_readable($config)) {
throw new RuntimeException("Cannot read config file: {$config}");
}
-
+
// 使用 include 而不是 require_once，这样不会跳过已加载的文件
// 在配置加载场景中，通常希望每次都重新加载
$configData = require_once $config;
-
+
if (!is_array($configData)) {
continue;
}
-
+
$array[$key] = $configData;
}
-
+
return $array;
}
-
-
+
+
}
if (!function_exists('merge')) {
- /**
- * @param $param
- * @param $param1
- * @return array
- */
- function merge($param, $param1): array
- {
- return ArrayAccess::merge($param, $param1);
- }
+ /**
+ * @param $param
+ * @param $param1
+ * @return array
+ */
+ function merge($param, $param1): array
+ {
+ return ArrayAccess::merge($param, $param1);
+ }
}
-
-if (!function_exists('jTraceEx')) {
-
- /**
- * @param $e
- * @param null $seen
- * @param bool $toHtml
- * @return string
- */
- function jTraceEx($e, $seen = NULL, bool $toHtml = FALSE): string
- {
- $starter = $seen ? 'Caused by: ' : '';
- $result = [];
- if (!$seen)
- $seen = [];
- $trace = $e->getTrace();
- $prev = $e->getPrevious();
- $result[] = sprintf('%s%s: %s', $starter, $e::class, $e->getMessage());
- $file = $e->getFile();
- $line = $e->getLine();
-
- foreach ($trace as $value) {
- $result[] = sprintf(' at %s%s%s(%s%s%s)',
- count($value) && array_key_exists('class', $value) ? str_replace('\\', '.', $value['class']) : '',
- count($value) && array_key_exists('class', $value) && array_key_exists('function', $value) ? '.' : '',
- count($value) && array_key_exists('function', $value) ? str_replace('\\', '.', $value['function']) : '(main)',
- $line === NULL ? $file : basename($file),
- $line === NULL ? '' : ':',
- $line === NULL ? '' : $line);
-
- $file = array_key_exists('file', $value) ? $value['file'] : 'Unknown Source';
- $line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : NULL;
- }
- $result = join($toHtml ? "
" : "\n", $result);
- if ($prev) {
- $result .= ($toHtml ? "
" : "\n") . jTraceEx($prev, $seen, $toHtml);
- }
-
- return $result;
- }
-
-
-}
-
-if (!function_exists('error')) {
-
- /**
- * @param mixed $message
- * @param array $method
- * @return void
- * @throws
- */
- function error(mixed $message, array $method = []): void
- {
- if (is_string($message) && str_contains($message, 'inotify_rm_watch')) {
- return;
- }
- Kiri::getLogger()->failure($message);
- }
-}
-
-
-if (!function_exists('trigger_print_error')) {
-
- /**
- * @param mixed $message
- * @param string $method
- * @return bool
- * @throws
- */
- function trigger_print_error(mixed $message, string $method = 'app'): bool
- {
- return Kiri::getLogger()->failure($message, $method);
- }
-}
-
-
-if (!function_exists('println')) {
-
- /**
- * @param mixed $message
- * @param string $method
- * @return bool
- * @throws
- */
- function println(mixed $message, string $method = 'app'): bool
- {
- return Kiri::getLogger()->failure($message, $method);
- }
-}
-
-
if (!function_exists('event')) {
- /**
- * @param object $object
- * @return void
- * @throws
- */
- function event(object $object): void
- {
- Kiri::getDi()->get(EventDispatch::class)->dispatch($object);
- }
+ /**
+ * @param object $object
+ * @return void
+ * @throws
+ */
+ function event(object $object): void
+ {
+ Kiri::getDi()->get(EventDispatch::class)->dispatch($object);
+ }
}
@@ -1034,64 +943,91 @@ if (!function_exists('event')) {
if (!function_exists('throwable')) {
- /**
- * 错误格式化
- * @param Throwable|Error|string $throwable
- * @return string
- */
- function throwable(\Throwable|\Error|string $throwable): string
- {
- if (is_string($throwable)) {
- return $throwable;
- }
- $message = "\033[31m" . $throwable::class . ' ' . $throwable->getMessage() . "\033[0m" . PHP_EOL;
- $message .= ' File: ' . $throwable->getFile() . PHP_EOL;
- $message .= ' Line: ' . $throwable->getLine() . PHP_EOL;
+ /**
+ * 错误格式化
+ * @param Throwable|Error|string $throwable
+ * @return string
+ */
+ function throwable(\Throwable|\Error|string $throwable): string
+ {
+ if (is_string($throwable)) {
+ return $throwable;
+ }
+ $message = $throwable::class . ' ' . $throwable->getMessage() . PHP_EOL;
+ $message .= ' File: ' . $throwable->getFile() . PHP_EOL;
+ $message .= ' Line: ' . $throwable->getLine() . PHP_EOL;
- $file = $throwable->getFile();
- $line = $throwable->getLine();
+ $file = $throwable->getFile();
+ $line = $throwable->getLine();
- $trance = $throwable->getTrace();
- $current = array_shift($trance);
+ $trance = $throwable->getTrace();
+ $current = array_shift($trance);
- if (!isset($current['file'])) {
- $current['file'] = $file;
- }
- if (!isset($current['line'])) {
- $current['line'] = $line;
- }
- $message .= ' Trance: ' . $current['file'] . ' -> ' . (isset($current['class']) ? $current['class'] . '::' : '') . ($current['function'] ?? 'Closure') . ' line ' . $current['line'] . PHP_EOL;
+ if (!isset($current['file'])) {
+ $current['file'] = $file;
+ }
+ if (!isset($current['line'])) {
+ $current['line'] = $line;
+ }
+ $message .= ' Trance: ' . $current['file'] . ' -> ' . (isset($current['class']) ? $current['class'] . '::' : '') . ($current['function'] ?? 'Closure') . ' line ' . $current['line'] . PHP_EOL;
- foreach ($trance as $value) {
- if (!isset($value['file'])) {
- $value['file'] = $file;
- }
- if (!isset($value['line'])) {
- $value['line'] = $line;
- }
- $file = $value['file'];
- $line = $value['line'];
+ foreach ($trance as $value) {
+ if (!isset($value['file'])) {
+ $value['file'] = $file;
+ }
+ if (!isset($value['line'])) {
+ $value['line'] = $line;
+ }
+ $file = $value['file'];
+ $line = $value['line'];
- $message .= ' ' . $value['file'] . ' -> ' . (isset($value['class']) ? $value['class'] . '::' : '') . ($value['function'] ?? 'Closure') . ' line ' . $line . PHP_EOL;
- }
- return $message;
- }
+ $message .= ' ' . $value['file'] . ' -> ' . (isset($value['class']) ? $value['class'] . '::' : '') . ($value['function'] ?? 'Closure') . ' line ' . $line . PHP_EOL;
+ }
+ return $message;
+ }
}
+if (!function_exists('json_log')) {
+
+ function json_log(Throwable $throwable, array $data = []): void
+ {
+ $param = [];
+ $param['time'] = date('Y-m-d H:i:s');
+ $param['request'] = [
+ 'path' => \request()->getUri()->getPath(),
+ 'headers' => \request()->getHeaders(),
+ 'method' => \request()->getMethod(),
+ 'params' => \request()->getBody()->getContents(),
+ ];
+ $param['exception'] = [
+ 'message' => $throwable->getMessage(),
+ 'code' => $throwable->getCode(),
+ 'file' => $throwable->getFile(),
+ 'line' => $throwable->getLine(),
+ 'trace' => $throwable->getTrace(),
+ ];
+ $param['data'] = $data;
+
+ file_put_contents(storage('exception-' . date('Y-m-d') . '.log','exception'),
+ json_encode($param, JSON_UNESCAPED_UNICODE),
+ FILE_APPEND);
+ }
+}
+
if (!function_exists('map')) {
- /**
- * @param array $map
- * @param Closure $closure
- * @return void
- */
- function map(array $map, Closure $closure): void
- {
- foreach ($map as $key => $value) {
- $closure($key, $value);
- }
- }
+ /**
+ * @param array $map
+ * @param Closure $closure
+ * @return void
+ */
+ function map(array $map, Closure $closure): void
+ {
+ foreach ($map as $key => $value) {
+ $closure($key, $value);
+ }
+ }
}
diff --git a/kiri-engine/Application.php b/kiri-engine/Application.php
index ce6c4817..a43ba87d 100644
--- a/kiri-engine/Application.php
+++ b/kiri-engine/Application.php
@@ -72,10 +72,10 @@ class Application extends BaseApplication
{
if (!($beforeCommandExecute->command instanceof ServerCommand)) {
$scanner = $this->container->get(Scanner::class);
- $scanner->load_directory(APP_PATH . 'app/');
+ $scanner->scan(APP_PATH . 'app/');
} else if (config('site.reload.hot', false) === false) {
$scanner = $this->container->get(Scanner::class);
- $scanner->load_directory(APP_PATH . 'app/');
+ $scanner->scan(APP_PATH . 'app/');
}
}
diff --git a/kiri-engine/Error/ErrorHandler.php b/kiri-engine/Error/ErrorHandler.php
index 7b92edeb..3be66a74 100644
--- a/kiri-engine/Error/ErrorHandler.php
+++ b/kiri-engine/Error/ErrorHandler.php
@@ -89,7 +89,7 @@ class ErrorHandler extends Component implements ErrorInterface
return;
}
- $this->getLogger()->failure($lastError['message'] . PHP_EOL);
+ $this->getLogger()->logCategory($lastError['message'] . PHP_EOL);
event(new OnSystemError());
}
@@ -104,7 +104,7 @@ class ErrorHandler extends Component implements ErrorInterface
{
$this->category = 'exception';
- $this->getLogger()->failure($exception);
+ $this->getLogger()->logCategory($exception);
event(new OnSystemError());
}
diff --git a/kiri-engine/Error/StdoutLogger.php b/kiri-engine/Error/StdoutLogger.php
index 0ff51a62..9ed3b3e7 100644
--- a/kiri-engine/Error/StdoutLogger.php
+++ b/kiri-engine/Error/StdoutLogger.php
@@ -9,6 +9,7 @@ use Monolog\Formatter\LineFormatter;
use Monolog\Handler\RotatingFileHandler;
use Monolog\Logger;
use Psr\Log\LoggerInterface;
+use Throwable;
/**
@@ -67,31 +68,32 @@ class StdoutLogger extends Component
* @param string $model
* @return bool
*/
- public function failure($message, string $model = 'app'): bool
+ public function logCategory($message, string $model = 'app'): bool
{
if ($message instanceof \Exception) {
$this->errors[$model] = $message->getMessage();
} else {
$this->errors[$model] = $message;
}
- return $this->dump($message);
+ $this->println($message);
+ return false;
}
- /**
- * @param $message
- * @return bool
- */
- protected function dump($message): bool
- {
- $message = throwable($message);
- if (str_contains($message, 'inotify_rm_watch')) {
- return false;
- }
- file_put_contents('php://output', '[' . date('Y-m-d H:i:s') . '] ' . $message, FILE_APPEND);
- $this->error($message, []);
- return false;
- }
+ /**
+ * @param Throwable $exception
+ * @param array $data
+ * @param mixed|null $result
+ * @return bool
+ */
+ public function json_log(Throwable $exception, array $data = [], mixed $result = null): mixed
+ {
+ json_log($exception, $data);
+
+ $this->println($exception->getMessage());
+
+ return $result;
+ }
/**
@@ -118,9 +120,10 @@ class StdoutLogger extends Component
} else if (method_exists($this, $name)) {
$this->{$name}(...$arguments);
}
- } catch (\Throwable $exception) {
- file_put_contents('php://output', '[' . date('Y-m-d H:i:s') . '] ' . $exception->getMessage(), FILE_APPEND);
- }
+ } catch (Throwable $exception) {
+ $this->println($exception->getMessage());
+ $this->json_log($exception);
+ }
}
diff --git a/kiri-engine/NoSql/MongoDB.php b/kiri-engine/NoSql/MongoDB.php
index 63e6f541..00454605 100644
--- a/kiri-engine/NoSql/MongoDB.php
+++ b/kiri-engine/NoSql/MongoDB.php
@@ -129,7 +129,9 @@ class MongoDB
throw new \BadMethodCallException("Method {$name} does not exist on MongoDB Client or Database.");
} catch (\Throwable $throwable) {
- return trigger_print_error(throwable($throwable));
+ \Kiri::getLogger()->json_log($throwable);
+
+ return false;
} finally {
// MongoDB 连接是持久的，不需要释放
$this->pool()->push($this->getName(), $client);
@@ -324,7 +326,9 @@ class MongoDB
return $client;
} catch (\Throwable $e) {
- throw new RedisConnectException(sprintf('MongoDB Connect %s Fail: %s', $uri, $e->getMessage()));
+ \Kiri::getLogger()->json_log($e);
+
+ throw new RedisConnectException(sprintf('MongoDB Connect %s Fail: %s', $uri, $e->getMessage()));
}
}
diff --git a/kiri-engine/NoSql/Redis.php b/kiri-engine/NoSql/Redis.php
index b4532840..bec859c3 100644
--- a/kiri-engine/NoSql/Redis.php
+++ b/kiri-engine/NoSql/Redis.php
@@ -103,13 +103,13 @@ class Redis
public function lock($key, int $timeout = 5): bool|int
{
$script = <<