modify
This commit is contained in:
as2252258@163.com
+173
-173
@@ -11,7 +11,6 @@ namespace Kiri\Abstracts;
|
|||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use JetBrains\PhpStorm\Pure;
|
use JetBrains\PhpStorm\Pure;
|
||||||
use Kiri\Error\Logger;
|
|
||||||
use Kiri\Kiri;
|
use Kiri\Kiri;
|
||||||
use Swoole\Coroutine;
|
use Swoole\Coroutine;
|
||||||
|
|
||||||
@@ -22,208 +21,209 @@ use Swoole\Coroutine;
|
|||||||
class BaseObject implements Configure
|
class BaseObject implements Configure
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BaseAbstract constructor.
|
* BaseAbstract constructor.
|
||||||
*
|
*
|
||||||
* @param array $config
|
* @param array $config
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function __construct(array $config = [])
|
public function __construct(array $config = [])
|
||||||
{
|
{
|
||||||
if (!empty($config) && is_array($config)) {
|
if (!empty($config) && is_array($config)) {
|
||||||
Kiri::configure($this, $config);
|
Kiri::configure($this, $config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function init()
|
public function init()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array|callable $callback
|
* @param array|callable $callback
|
||||||
* @param object $scope
|
* @param object $scope
|
||||||
*/
|
*/
|
||||||
public function async_create(array|callable $callback, object $scope)
|
public function async_create(array|callable $callback, object $scope)
|
||||||
{
|
{
|
||||||
Coroutine::create($callback, $scope);
|
Coroutine::create($callback, $scope);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
#[Pure] public static function className(): string
|
#[Pure] public static function className(): string
|
||||||
{
|
{
|
||||||
return static::class;
|
return static::class;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $name
|
* @param $name
|
||||||
* @param $value
|
* @param $value
|
||||||
*
|
*
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function __set($name, $value)
|
public function __set($name, $value)
|
||||||
{
|
{
|
||||||
$method = 'set' . ucfirst($name);
|
$method = 'set' . ucfirst($name);
|
||||||
if (method_exists($this, $method)) {
|
if (method_exists($this, $method)) {
|
||||||
$this->{$method}($value);
|
$this->{$method}($value);
|
||||||
} else {
|
} else {
|
||||||
throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
|
throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $name
|
* @param $name
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return mixed
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function __get($name): mixed
|
public function __get($name): mixed
|
||||||
{
|
{
|
||||||
$method = 'get' . ucfirst($name);
|
$method = 'get' . ucfirst($name);
|
||||||
if (method_exists($this, $method)) {
|
if (method_exists($this, $method)) {
|
||||||
return $this->$method();
|
return $this->$method();
|
||||||
} else {
|
} else {
|
||||||
throw new Exception('The get name ' . $name . ' not find in class ' . static::class);
|
throw new Exception('The get name ' . $name . ' not find in class ' . static::class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $message
|
* @param $message
|
||||||
* @param string $model
|
* @param string $model
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function addError($message, string $model = 'app'): bool
|
public function addError($message, string $model = 'app'): bool
|
||||||
{
|
{
|
||||||
if ($message instanceof \Throwable) {
|
if ($message instanceof \Throwable) {
|
||||||
$Throwable = $message;
|
$Throwable = $message;
|
||||||
$this->error(jTraceEx($message));
|
$this->error(jTraceEx($message));
|
||||||
|
|
||||||
$message = 'Error: ' . $Throwable->getMessage() . PHP_EOL;
|
$message = 'Error: ' . $Throwable->getMessage() . PHP_EOL;
|
||||||
$message .= 'File: ' . $Throwable->getFile() . PHP_EOL;
|
$message .= 'File: ' . $Throwable->getFile() . PHP_EOL;
|
||||||
$message .= 'Line: ' . $Throwable->getLine();
|
$message .= 'Line: ' . $Throwable->getLine();
|
||||||
} else {
|
} else {
|
||||||
if (!is_string($message)) {
|
if (!is_string($message)) {
|
||||||
$message = json_encode($message, JSON_UNESCAPED_UNICODE);
|
$message = json_encode($message, JSON_UNESCAPED_UNICODE);
|
||||||
}
|
}
|
||||||
$this->error($message);
|
$this->error($message);
|
||||||
}
|
}
|
||||||
$this->logger()->error($message, $model);
|
$this->logger()->error($model, [$message]);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Logger
|
* @return Logger
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
private function logger(): Logger
|
private function logger(): Logger
|
||||||
{
|
{
|
||||||
return Kiri::app()->getLogger();
|
return Kiri::getDi()->get(Logger::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $message
|
* @param mixed $message
|
||||||
* @param string $method
|
* @param string $method
|
||||||
* @param string $file
|
* @param string $file
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function debug(mixed $message, string $method = __METHOD__, string $file = __FILE__)
|
public function debug(mixed $message, string $method = __METHOD__, string $file = __FILE__)
|
||||||
{
|
{
|
||||||
if (!is_string($message)) {
|
if (!is_string($message)) {
|
||||||
$message = print_r($message, true);
|
$message = print_r($message, true);
|
||||||
}
|
}
|
||||||
$message = "\033[35m[" . date('Y-m-d H:i:s') . '][DEBUG]: ' . $message . "\033[0m";
|
$message = "\033[35m[" . date('Y-m-d H:i:s') . '][DEBUG]: ' . $message . "\033[0m";
|
||||||
$message .= PHP_EOL;
|
$message .= PHP_EOL;
|
||||||
|
|
||||||
$this->logger()->output($message);
|
$this->logger()->debug(Logger::DEBUG, [$message]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $message
|
* @param mixed $message
|
||||||
* @param string $method
|
* @param string $method
|
||||||
* @param string $file
|
* @param string $file
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function info(mixed $message, string $method = __METHOD__, string $file = __FILE__)
|
public function info(mixed $message, string $method = __METHOD__, string $file = __FILE__)
|
||||||
{
|
{
|
||||||
if (!is_string($message)) {
|
if (!is_string($message)) {
|
||||||
$message = print_r($message, true);
|
$message = print_r($message, true);
|
||||||
}
|
}
|
||||||
$message = "\033[34m[" . date('Y-m-d H:i:s') . '][INFO]: ' . $message . "\033[0m";
|
$message = "\033[34m[" . date('Y-m-d H:i:s') . '][INFO]: ' . $message . "\033[0m";
|
||||||
$message .= PHP_EOL;
|
$message .= PHP_EOL;
|
||||||
|
|
||||||
$this->logger()->output($message);
|
$this->logger()->info(Logger::NOTICE, [$message]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $message
|
* @param mixed $message
|
||||||
* @param string $method
|
* @param string $method
|
||||||
* @param string $file
|
* @param string $file
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function success(mixed $message, string $method = __METHOD__, string $file = __FILE__)
|
public function success(mixed $message, string $method = __METHOD__, string $file = __FILE__)
|
||||||
{
|
{
|
||||||
if (!is_string($message)) {
|
if (!is_string($message)) {
|
||||||
$message = print_r($message, true);
|
$message = print_r($message, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$message = "\033[36m[" . date('Y-m-d H:i:s') . '][SUCCESS]: ' . $message . "\033[0m";
|
$message = "\033[36m[" . date('Y-m-d H:i:s') . '][SUCCESS]: ' . $message . "\033[0m";
|
||||||
$message .= PHP_EOL;
|
$message .= PHP_EOL;
|
||||||
|
|
||||||
$this->logger()->output($message);
|
$this->logger()->notice(Logger::NOTICE, [$message]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $message
|
* @param mixed $message
|
||||||
* @param string $method
|
* @param string $method
|
||||||
* @param string $file
|
* @param string $file
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function warning(mixed $message, string $method = __METHOD__, string $file = __FILE__)
|
public function warning(mixed $message, string $method = __METHOD__, string $file = __FILE__)
|
||||||
{
|
{
|
||||||
if (!is_string($message)) {
|
if (!is_string($message)) {
|
||||||
$message = print_r($message, true);
|
$message = print_r($message, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$message = "\033[33m[" . date('Y-m-d H:i:s') . '][WARNING]: ' . $message . "\033[0m";
|
$message = "\033[33m[" . date('Y-m-d H:i:s') . '][WARNING]: ' . $message . "\033[0m";
|
||||||
$message .= PHP_EOL;
|
$message .= PHP_EOL;
|
||||||
|
|
||||||
$this->logger()->output($message);
|
$this->logger()->critical(Logger::NOTICE, [$message]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed $message
|
* @param mixed $message
|
||||||
* @param null $method
|
* @param null $method
|
||||||
* @param null $file
|
* @param null $file
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function error(mixed $message, $method = null, $file = null)
|
public function error(mixed $message, $method = null, $file = null)
|
||||||
{
|
{
|
||||||
if ($message instanceof \Throwable) {
|
if ($message instanceof \Throwable) {
|
||||||
$message = $message->getMessage() . " on line " . $message->getLine() . " at file " . $message->getFile();
|
$message = $message->getMessage() . " on line " . $message->getLine() . " at file " . $message->getFile();
|
||||||
}
|
}
|
||||||
$content = (empty($method) ? '' : $method . ': ') . $message;
|
$content = (empty($method) ? '' : $method . ': ') . $message;
|
||||||
|
|
||||||
$message = "\033[41;37m[" . date('Y-m-d H:i:s') . '][ERROR]: ' . $content . "\033[0m";
|
$message = "\033[41;37m[" . date('Y-m-d H:i:s') . '][ERROR]: ' . $content . "\033[0m";
|
||||||
|
|
||||||
if (!empty($file)) {
|
if (!empty($file)) {
|
||||||
$message .= PHP_EOL . "\033[41;37m[" . date('Y-m-d H:i:s') . '][ERROR]: ' . $file . "\033[0m";
|
$message .= PHP_EOL . "\033[41;37m[" . date('Y-m-d H:i:s') . '][ERROR]: ' . $file . "\033[0m";
|
||||||
}
|
}
|
||||||
$this->logger()->output($message . PHP_EOL, 'error');
|
|
||||||
}
|
$this->logger()->critical(Logger::ERROR, [$message]);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user