Commit f957b20f f957b20fe5ad6ab3b951b9b8c3ff5e35cc35db02 by lemon

*

1 parent eab6d6c0
......@@ -2,7 +2,10 @@
namespace App\Exceptions;
use App\Helper\ErrorCode;
use App\Helper\Response;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Validation\ValidationException;
use Throwable;
class Handler extends ExceptionHandler
......@@ -38,4 +41,6 @@ class Handler extends ExceptionHandler
//
});
}
}
......
......@@ -30,9 +30,12 @@ class Response
* @param int $code
* @return mixed
*/
public static function error($code = ErrorCode::SERVER_ERROR)
public static function error($code = ErrorCode::SERVER_ERROR, string $msg = '')
{
return response()->json(['code' => $code, 'msg' => ErrorCode::$messages[$code] ?? ErrorCode::$messages[ErrorCode::SERVER_ERROR]]);
return response()->json([
'code' => $code,
'msg' => $msg ?? (ErrorCode::$messages[$code] ?? ErrorCode::$messages[ErrorCode::SERVER_ERROR])
]);
}
/**
......
......@@ -35,8 +35,8 @@ class MusicianWithdrawRequest extends FormRequest
public function messages(): array
{
return [
'order_id.required' => '订单号不存在',
'status.required' => '审核状态错误',
'order_id.required' => '缺少订单号',
'status.required' => '缺少审核状态',
'status.in' => '审核状态错误',
];
}
......
......@@ -67,7 +67,7 @@ return [
|
*/
'timezone' => 'UTC',
'timezone' => 'PRC',
/*
|--------------------------------------------------------------------------
......