变更

kiri-engine/Core/Json.php

@@ -53,6 +53,31 @@ class Json
 	}
 	
 	
+	/**
+	 * @param string $message
+	 * @param int $code
+	 * @param array|string $data
+	 * @param int $count
+	 * @return string
+	 */
+	public static function jsonFail(string $message, int $code = 500, array|string $data = [], int $count = 0): string
+	{
+		return json_encode(['code' => $code, 'param' => $data, 'message' => $message, 'count' => $count], JSON_UNESCAPED_UNICODE);
+	}
+	
+	
+	/**
+	 * @param string $message
+	 * @param array|string $data
+	 * @param int $count
+	 * @return string
+	 */
+	public static function jsonSuccess(array|string $data = [], string $message = "ok", int $count = 0): string
+	{
+		return json_encode(['code' => 0, 'param' => $data, 'message' => $message, 'count' => $count], JSON_UNESCAPED_UNICODE);
+	}
+	
+	
 	/**
 	 * @param $code
 	 * @param string|array $message
@@ -67,9 +92,7 @@ class Json
 		if (!is_string($message)) {
 			$params['message'] = 'System success.';
 			$params['param'] = $message;
-            if (!empty($data)) {
 			$params['exPageInfo'] = $data;
-            }
 		} else {
 			$params['message'] = $message;
 			$params['param'] = $data;

kiri-engine/Error/ErrorHandler.php

@@ -154,7 +154,7 @@ class ErrorHandler extends Component implements ErrorInterface
 			$error[0] = 500;
 		}
 		
-		$data = Json::to(500, $error[1], $path);
+		$data = Json::jsonFail($error[1], 500, $path);
 		
 		$this->logger->error('On error handler', [$data]);
 		
@@ -175,7 +175,7 @@ class ErrorHandler extends Component implements ErrorInterface
 	{
 		$path = ['file' => $file, 'line' => $line];
 		
-		$data = Json::to($code, $this->category . ': ' . $message, $path);
+		$data = Json::jsonFail($this->category . ': ' . $message, $code, $path);
 		
 		file_put_contents('php://output', $data . PHP_EOL, FILE_APPEND);