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 2022-12-05 12:47:48 +08:00
parent d7c79a97d1
commit 45e32825cf
No known key found for this signature in database
GPG Key ID: 2F7B001CA27A8132
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Jobs/Module/FetchModule.php
View File

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

11
app/Models/Module.php
View File

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