ivampiresp/Lae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改进 模块异常返回

Browse Source
This commit is contained in:
iVampireSP.com 2023-02-05 20:36:41 +08:00
parent 2754c37354
commit 9fa859211e
No known key found for this signature in database
GPG Key ID: 2F7B001CA27A8132
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/ApiResponse.php
View File

@ -14,7 +14,7 @@ public function moduleResponse($response, int $status = 200): JsonResponse
201 => $this->created($response), 201 => $this->created($response),
204 => $this->noContent(), 204 => $this->noContent(),
400 => $this->badRequest($response), 400 => $this->badRequest($response),
401 => $this->serviceUnavailable(), 401, 502 => $this->serviceUnavailable(),
403 => $this->forbidden($response), 403 => $this->forbidden($response),
404 => $this->notFound($response), 404 => $this->notFound($response),
405 => $this->methodNotAllowed(), 405 => $this->methodNotAllowed(),

9
app/Http/Controllers/Module/ModuleController.php
View File

@ -4,9 +4,11 @@
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Module; use App\Models\Module;
use GuzzleHttp\Exception\ConnectException;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str; use Illuminate\Support\Str;
class ModuleController extends Controller class ModuleController extends Controller
@ -24,7 +26,12 @@ public function call(Request $request, Module $module): Response|JsonResponse
$method = Str::lower($request->method()); $method = Str::lower($request->method());
$response = $module->request($method, $path, $request->all()); try {
$response = $module->request($method, $path, $request->all());
} catch (ConnectException $e) {
Log::error('在执行 call ' . $method . ' ' . $path . ' 时发生错误: ' . $e->getMessage());
return $this->serviceUnavailable();
}
if ($response['json'] === null && $response['body'] !== null) { if ($response['json'] === null && $response['body'] !== null) {
return response($response['body'], $response['status']); return response($response['body'], $response['status']);