From 6f6f5669e4dac9c0355a081a0ceb1019ce931054 Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Fri, 20 Jan 2023 15:57:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=20API=20=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/IndexController.php | 13 +++++++ app/Http/Controllers/Api/ServerController.php | 38 ------------------- routes/api.php | 5 +-- 3 files changed, 15 insertions(+), 41 deletions(-) delete mode 100644 app/Http/Controllers/Api/ServerController.php diff --git a/app/Http/Controllers/Api/IndexController.php b/app/Http/Controllers/Api/IndexController.php index c352a61..3fc78d1 100644 --- a/app/Http/Controllers/Api/IndexController.php +++ b/app/Http/Controllers/Api/IndexController.php @@ -4,6 +4,7 @@ use App\Http\Controllers\Controller; use App\Models\User; +use App\Support\ClusterSupport; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -24,4 +25,16 @@ public function birthdays(): JsonResponse return $this->success($users); } + + public function nodes(): JsonResponse + { + $nodes = ClusterSupport::nodes(true); + + $current_node_id = ClusterSupport::currentNode()['id']; + + return $this->success([ + 'nodes' => $nodes, + 'current_node_id' => $current_node_id, + ]); + } } diff --git a/app/Http/Controllers/Api/ServerController.php b/app/Http/Controllers/Api/ServerController.php deleted file mode 100644 index fa2ec8a..0000000 --- a/app/Http/Controllers/Api/ServerController.php +++ /dev/null @@ -1,38 +0,0 @@ -has('module_id')) { - // 查找指定 module_id - $servers = array_filter($servers, function ($server) use ($request) { - return $server['module_id'] === $request->query('module_id'); - }); - } - - return $this->success($servers); - } - - public function nodes(): JsonResponse - { - $nodes = ClusterSupport::nodes(true); - - $current_node_id = ClusterSupport::currentNode()['id']; - - return $this->success([ - 'nodes' => $nodes, - 'current_node_id' => $current_node_id, - ]); - } -} diff --git a/routes/api.php b/routes/api.php index 1710a73..e48ed28 100644 --- a/routes/api.php +++ b/routes/api.php @@ -6,7 +6,6 @@ use App\Http\Controllers\Api\IndexController; use App\Http\Controllers\Api\ModuleController; use App\Http\Controllers\Api\ReplyController; -use App\Http\Controllers\Api\ServerController; use App\Http\Controllers\Api\TaskController; use App\Http\Controllers\Api\UserController; use App\Http\Controllers\Api\WorkOrderController; @@ -21,9 +20,9 @@ Route::resource('balances', BalanceController::class); -Route::get('servers', [ServerController::class, 'module_reports']); -Route::get('nodes', [ServerController::class, 'nodes']); +Route::get('nodes', [IndexController::class, 'nodes']); Route::get('modules', [ModuleController::class, 'index']); +Route::get('modules/{module}/servers', [ModuleController::class, 'servers']); Route::resource('tasks', TaskController::class)->only(['index', 'show']);