改进 模块 http 请求部分

app/Exceptions/ModuleRequestException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ModuleRequestException extends Exception
+{
+    //
+}

app/Jobs/Module/FetchModule.php

@@ -3,6 +3,7 @@
 namespace App\Jobs\Module;
 
 use App\Events\ServerEvent;
+use App\Exceptions\ModuleRequestException;
 use App\Models\Module;
 use GuzzleHttp\Exception\ConnectException;
 use Illuminate\Bus\Queueable;
@@ -50,7 +51,7 @@ public function handle()
             foreach ($modules as $module) {
                 try {
                     $response = $module->http()->get('remote');
-                } catch (ConnectException $e) {
+                } catch (ModuleRequestException $e) {
                     Log::error('无法连接到模块:' . $module->name, ['error', $e->getMessage()]);
                     continue;
                 }

app/Models/Module.php

@@ -2,8 +2,10 @@
 
 namespace App\Models;
 
+use App\Exceptions\ModuleRequestException;
 use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\RequestException;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Response;
@@ -175,9 +177,16 @@ public function check($module_id = null): bool
         return $success;
     }
 
+    /**
+     * @throws ModuleRequestException
+     */
     public function http(): PendingRequest
     {
-        return Http::module($this->api_token, $this->url)->acceptJson()->timeout(5);
+        try {
+            return Http::module($this->api_token, $this->url)->acceptJson()->timeout(5);
+        } catch (ConnectException|RequestException $e) {
+            throw new ModuleRequestException($e->getMessage());
+        }
     }
 
     #[ArrayShape(['transactions' => "array"])]