release
Showing
2 changed files
with
10 additions
and
9 deletions
... | @@ -31,11 +31,12 @@ class Response | ... | @@ -31,11 +31,12 @@ class Response |
31 | * @param int $code | 31 | * @param int $code |
32 | * @return mixed | 32 | * @return mixed |
33 | */ | 33 | */ |
34 | public static function error($code = ErrorCode::SERVER_ERROR, string $msg = '') | 34 | public static function error($code = ErrorCode::SERVER_ERROR, string $msg = '',$data = []) |
35 | { | 35 | { |
36 | return response()->json([ | 36 | return response()->json([ |
37 | 'code' => $code, | 37 | 'code' => $code, |
38 | 'msg' => $msg ?: (ErrorCode::$messages[$code] ?? ErrorCode::$messages[ErrorCode::SERVER_ERROR]) | 38 | 'msg' => $msg ?: (ErrorCode::$messages[$code] ?? ErrorCode::$messages[ErrorCode::SERVER_ERROR]), |
39 | 'data' => $data | ||
39 | ]); | 40 | ]); |
40 | } | 41 | } |
41 | 42 | ... | ... |
... | @@ -19,7 +19,7 @@ class WorkController extends BaseController | ... | @@ -19,7 +19,7 @@ class WorkController extends BaseController |
19 | if ($code === 0) { | 19 | if ($code === 0) { |
20 | return Response::success($data); | 20 | return Response::success($data); |
21 | } else { | 21 | } else { |
22 | return Response::error(-1,$msg); | 22 | return Response::error($code,$msg,$data); |
23 | } | 23 | } |
24 | } | 24 | } |
25 | 25 | ||
... | @@ -32,7 +32,7 @@ class WorkController extends BaseController | ... | @@ -32,7 +32,7 @@ class WorkController extends BaseController |
32 | if ($code === 0) { | 32 | if ($code === 0) { |
33 | return Response::success($data); | 33 | return Response::success($data); |
34 | } else { | 34 | } else { |
35 | return Response::error(-1,$msg); | 35 | return Response::error($code,$msg,$data); |
36 | } | 36 | } |
37 | } | 37 | } |
38 | 38 | ||
... | @@ -45,7 +45,7 @@ class WorkController extends BaseController | ... | @@ -45,7 +45,7 @@ class WorkController extends BaseController |
45 | if ($code === 0) { | 45 | if ($code === 0) { |
46 | return Response::success($data); | 46 | return Response::success($data); |
47 | } else { | 47 | } else { |
48 | return Response::error(-1,$msg); | 48 | return Response::error($code,$msg,$data); |
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
... | @@ -58,7 +58,7 @@ class WorkController extends BaseController | ... | @@ -58,7 +58,7 @@ class WorkController extends BaseController |
58 | if ($code === 0) { | 58 | if ($code === 0) { |
59 | return Response::success($data); | 59 | return Response::success($data); |
60 | } else { | 60 | } else { |
61 | return Response::error(-1,$msg); | 61 | return Response::error($code,$msg,$data); |
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
... | @@ -71,7 +71,7 @@ class WorkController extends BaseController | ... | @@ -71,7 +71,7 @@ class WorkController extends BaseController |
71 | if ($code === 0) { | 71 | if ($code === 0) { |
72 | return Response::success($data); | 72 | return Response::success($data); |
73 | } else { | 73 | } else { |
74 | return Response::error(-1,$msg); | 74 | return Response::error($code,$msg,$data); |
75 | } | 75 | } |
76 | } | 76 | } |
77 | 77 | ||
... | @@ -84,7 +84,7 @@ class WorkController extends BaseController | ... | @@ -84,7 +84,7 @@ class WorkController extends BaseController |
84 | if ($code === 0) { | 84 | if ($code === 0) { |
85 | return Response::success($data); | 85 | return Response::success($data); |
86 | } else { | 86 | } else { |
87 | return Response::error(-1,$msg); | 87 | return Response::error($code,$msg,$data); |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
... | @@ -97,7 +97,7 @@ class WorkController extends BaseController | ... | @@ -97,7 +97,7 @@ class WorkController extends BaseController |
97 | if ($code === 0) { | 97 | if ($code === 0) { |
98 | return Response::success($data); | 98 | return Response::success($data); |
99 | } else { | 99 | } else { |
100 | return Response::error(-1,$msg); | 100 | return Response::error($code,$msg,$data); |
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ... | ... |
-
Please register or sign in to post a comment