modify

core/Abstracts/BaseObject.php

@@ -11,7 +11,6 @@ namespace Kiri\Abstracts;
 
 use Exception;
 use JetBrains\PhpStorm\Pure;
-use Kiri\Error\Logger;
 use Kiri\Kiri;
 use Swoole\Coroutine;
 
@@ -116,7 +115,7 @@ class BaseObject implements Configure
             }
             $this->error($message);
         }
-		$this->logger()->error($message, $model);
+        $this->logger()->error($model, [$message]);
         return FALSE;
     }
 
@@ -127,7 +126,7 @@ class BaseObject implements Configure
      */
     private function logger(): Logger
     {
-		return Kiri::app()->getLogger();
+        return Kiri::getDi()->get(Logger::class);
     }
 
 
@@ -145,7 +144,7 @@ class BaseObject implements Configure
         $message = "\033[35m[" . date('Y-m-d H:i:s') . '][DEBUG]: ' . $message . "\033[0m";
         $message .= PHP_EOL;
 
-		$this->logger()->output($message);
+        $this->logger()->debug(Logger::DEBUG, [$message]);
     }
 
 
@@ -163,7 +162,7 @@ class BaseObject implements Configure
         $message = "\033[34m[" . date('Y-m-d H:i:s') . '][INFO]: ' . $message . "\033[0m";
         $message .= PHP_EOL;
 
-		$this->logger()->output($message);
+        $this->logger()->info(Logger::NOTICE, [$message]);
     }
 
 
@@ -182,7 +181,7 @@ class BaseObject implements Configure
         $message = "\033[36m[" . date('Y-m-d H:i:s') . '][SUCCESS]: ' . $message . "\033[0m";
         $message .= PHP_EOL;
 
-		$this->logger()->output($message);
+        $this->logger()->notice(Logger::NOTICE, [$message]);
     }
 
 
@@ -201,7 +200,7 @@ class BaseObject implements Configure
         $message = "\033[33m[" . date('Y-m-d H:i:s') . '][WARNING]: ' . $message . "\033[0m";
         $message .= PHP_EOL;
 
-		$this->logger()->output($message);
+        $this->logger()->critical(Logger::NOTICE, [$message]);
     }
 
 
@@ -223,7 +222,8 @@ class BaseObject implements Configure
         if (!empty($file)) {
             $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]);
     }
 
 }