From a3caaafd697bfda69a2d7cab67ab3bb68f7f93ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 23 Jul 2021 10:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 System/Abstracts/BaseObject.php | 32 ++++++++++++++++-------------
 System/Error/Logger.php         | 36 +++++++++++++++++++++------------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/System/Abstracts/BaseObject.php b/System/Abstracts/BaseObject.php
index 256dea57..dd665892 100644
--- a/System/Abstracts/BaseObject.php
+++ b/System/Abstracts/BaseObject.php
@@ -11,6 +11,7 @@ namespace Snowflake\Abstracts;
 
 use Exception;
 use JetBrains\PhpStorm\Pure;
+use Snowflake\Error\Logger;
 use Snowflake\Snowflake;
 use Swoole\Coroutine;
 
@@ -28,7 +29,7 @@ class BaseObject implements Configure
 	 * @param array $config
 	 * @throws Exception
 	 */
-	public function __construct($config = [])
+	public function __construct(array $config = [])
 	{
 		if (!empty($config) && is_array($config)) {
 			Snowflake::configure($this, $config);
@@ -118,12 +119,21 @@ class BaseObject implements Configure
 			}
 			$this->error($message);
 		}
-		$logger = Snowflake::app()->getLogger();
-		$logger->error($message, $model);
+		$this->logger()->error($message, $model);
 		return FALSE;
 	}
 
 
+	/**
+	 * @return Logger
+	 * @throws Exception
+	 */
+	private function logger(): Logger
+	{
+		return Snowflake::app()->getLogger();
+	}
+
+
 	/**
 	 * @param mixed $message
 	 * @param string $method
@@ -138,8 +148,7 @@ class BaseObject implements Configure
 		$message = "\033[35m[" . date('Y-m-d H:i:s') . '][DEBUG]: ' . $message . "\033[0m";
 		$message .= PHP_EOL;
 
-		$socket = Snowflake::app()->getLogger();
-		$socket->output($message);
+		$this->logger()->output($message);
 	}
 
 
@@ -157,8 +166,7 @@ class BaseObject implements Configure
 		$message = "\033[34m[" . date('Y-m-d H:i:s') . '][INFO]: ' . $message . "\033[0m";
 		$message .= PHP_EOL;
 
-		$socket = Snowflake::app()->getLogger();
-		$socket->output($message);
+		$this->logger()->output($message);
 	}
 
 
@@ -177,8 +185,7 @@ class BaseObject implements Configure
 		$message = "\033[36m[" . date('Y-m-d H:i:s') . '][SUCCESS]: ' . $message . "\033[0m";
 		$message .= PHP_EOL;
 
-		$socket = Snowflake::app()->getLogger();
-		$socket->output($message);
+		$this->logger()->output($message);
 	}
 
 
@@ -197,9 +204,7 @@ class BaseObject implements Configure
 		$message = "\033[33m[" . date('Y-m-d H:i:s') . '][WARNING]: ' . $message . "\033[0m";
 		$message .= PHP_EOL;
 
-
-		$socket = Snowflake::app()->getLogger();
-		$socket->output($message);
+		$this->logger()->output($message);
 	}
 
 
@@ -211,7 +216,6 @@ class BaseObject implements Configure
 	 */
 	public function error(mixed $message, $method = null, $file = null)
 	{
-		$socket = Snowflake::app()->getLogger();
 		if ($message instanceof \Throwable) {
 			$message = $message->getMessage() . " on line " . $message->getLine() . " at file " . $message->getFile();
 		}
@@ -222,7 +226,7 @@ class BaseObject implements Configure
 		if (!empty($file)) {
 			$message .= PHP_EOL . "\033[41;37m[" . date('Y-m-d H:i:s') . '][ERROR]: ' . $file . "\033[0m";
 		}
-		$socket->output($message . PHP_EOL);
+		$this->logger()->output($message . PHP_EOL);
 	}
 
 }
diff --git a/System/Error/Logger.php b/System/Error/Logger.php
index 7ac17b41..6a89155e 100644
--- a/System/Error/Logger.php
+++ b/System/Error/Logger.php
@@ -48,6 +48,9 @@ class Logger extends Component
 	 */
 	public function debug(mixed $message, string $method = 'app', $file = null)
 	{
+		if (Config::get('environment') == 'pro') {
+			return;
+		}
 		$this->output($message);
 	}
 
@@ -59,6 +62,9 @@ class Logger extends Component
 	 */
 	public function trance(mixed $message, string $method = 'app')
 	{
+		if (Config::get('environment') == 'pro') {
+			return;
+		}
 		$this->output($message);
 	}
 
@@ -82,6 +88,9 @@ class Logger extends Component
 	 */
 	public function success(mixed $message, string $method = 'app', $file = null)
 	{
+		if (Config::get('environment') == 'pro') {
+			return;
+		}
 		$this->output($message);
 	}
 
@@ -93,14 +102,15 @@ class Logger extends Component
 	 */
 	private function writer($message, string $method = 'app'): void
 	{
-		$this->print_r($message, $method);
-		$message = $this->arrayFormat($message);
-		if (!empty($message)) {
-			if (!is_array($this->logs)) {
-				$this->logs = [];
-			}
-			$this->logs[] = [$method, $message];
+		if (empty($message)) {
+			return;
 		}
+		$message = print_r($message, true);
+		$this->print_r($message, $method);
+		if (!is_array($this->logs)) {
+			$this->logs = [];
+		}
+		$this->logs[] = [$method, $message];
 	}
 
 
@@ -301,12 +311,12 @@ class Logger extends Component
 
 		$logger = Snowflake::app()->getLogger();
 
-		$string = 'Exception: ' . PHP_EOL;
-		$string .= '#.  message: ' . $errorInfo['message'] . PHP_EOL;
-		$string .= '#.  file: ' . $errorInfo['file'] . PHP_EOL;
-		$string .= '#.  line: ' . $errorInfo['line'] . PHP_EOL;
-
-		$logger->write($string . $exception->getTraceAsString(), 'trace');
+//		$string = 'Exception: ' . PHP_EOL;
+//		$string .= '#.  message: ' . $errorInfo['message'] . PHP_EOL;
+//		$string .= '#.  file: ' . $errorInfo['file'] . PHP_EOL;
+//		$string .= '#.  line: ' . $errorInfo['line'] . PHP_EOL;
+//
+//		$logger->write($string . $exception->getTraceAsString(), 'trace');
 		$logger->write(jTraceEx($exception), 'exception');
 
 		return Json::to($code, $errorInfo['message'], [