From 1f24eabf1c0d7ba8d75a205b250080c76e564531 Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Wed, 30 Nov 2022 15:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20meta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Jobs/Module/FetchModule.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Jobs/Module/FetchModule.php b/app/Jobs/Module/FetchModule.php index 55c0766..44e1971 100644 --- a/app/Jobs/Module/FetchModule.php +++ b/app/Jobs/Module/FetchModule.php @@ -50,9 +50,7 @@ public function handle() foreach ($modules as $module) { try { - $http = Http::module($module->api_token, $module->url); - // dd($module->url); - $response = $http->get('remote'); + $response = $module->http()->get('remote'); } catch (ConnectException $e) { Log::error($e->getMessage()); continue; @@ -68,11 +66,12 @@ public function handle() $json = $response->json(); if (isset($json['data']['servers']) && is_array($json['data']['servers'])) { - // 只保留 name, status + // 只保留 name, status, meta $servers = array_merge($servers, array_map(function ($server) use ($module) { return [ 'name' => $server['name'], 'status' => $server['status'], + 'meta' => $server['meta'] ?? [], 'created_at' => $server['created_at'] ?? now(), 'updated_at' => $server['updated_at'] ?? now(), 'module' => [