From 00426179e40ac662560fb564fe409e054a66940a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A2=E5=8F=AF=E7=9B=9F?= <623279281@qq.com> Date: Thu, 27 Jun 2019 17:47:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/func/FunctionFactory.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/func/FunctionFactory.php b/src/func/FunctionFactory.php index 4dd3841..11a92d6 100644 --- a/src/func/FunctionFactory.php +++ b/src/func/FunctionFactory.php @@ -174,12 +174,13 @@ public function log($msg, $level = 'debug', $tag = null) * * @param string $message 消息 * @param int|string $code 错误码 + * @param array $data 数据 * @param string $logLevel 日志级别 */ - public function returnFail($message = 'FAIL', $code = 400, $logLevel = 'error') + public function returnFail($message = 'FAIL', $code = 400, $data = [], $logLevel = 'error') { $this->rollback(); - $result = BaseResult::instance([$code, $message]); + $result = BaseResult::instance([$code, $message, $data]); $this->log($result, $logLevel); $e = new FunctionException(); $e->setBaseResult($result); @@ -257,7 +258,7 @@ public function getEndResult() public function checkFailReturn($failStatus, $failMsg = 'FAIL', $failCode = 400, $logLevel = 'error') { if ($failStatus == true) { - $this->returnFail($failMsg, $failCode, $logLevel); + $this->returnFail($failMsg, $failCode, [], $logLevel); } }