From c8838bc9045dab661872efb1652502da34f381cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Thu, 31 Dec 2020 04:40:37 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20=E8=8A=82=E7=82=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=94=99=E8=AF=AF=20&=20Vnet=E9=87=8D?=
 =?UTF-8?q?=E8=BD=BD=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/Client/V1Controller.php | 4 ++--
 app/Jobs/VNet/reloadNode.php                     | 4 ++++
 app/Models/Node.php                              | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/Client/V1Controller.php b/app/Http/Controllers/Api/Client/V1Controller.php
index 2431a2d0..adab40e7 100644
--- a/app/Http/Controllers/Api/Client/V1Controller.php
+++ b/app/Http/Controllers/Api/Client/V1Controller.php
@@ -53,7 +53,7 @@ class V1Controller extends Controller
         ]);
 
         if ($validator->fails()) {
-            return response()->json($validator->errors()->toJson(), 400);
+            return response()->json($validator->errors()->all(), 400);
         }
 
         $user = User::create(array_merge(
@@ -86,7 +86,7 @@ class V1Controller extends Controller
         $user = auth()->user();
         $nodes = $user->nodes()->get();
         if (isset($id)) {
-            $node = $nodes->where('id', $id)->first();
+            $node = $nodes->find($id);
 
             if (empty($node)) {
                 return response()->json([], 204);
diff --git a/app/Jobs/VNet/reloadNode.php b/app/Jobs/VNet/reloadNode.php
index 592cf48a..5e354e49 100644
--- a/app/Jobs/VNet/reloadNode.php
+++ b/app/Jobs/VNet/reloadNode.php
@@ -6,6 +6,7 @@ use Arr;
 use Http;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
@@ -23,6 +24,9 @@ class reloadNode implements ShouldQueue
 
     public function __construct($nodes)
     {
+        if (! $nodes instanceof Collection) {
+            $nodes = collect([$nodes]);
+        }
         $this->nodes = $nodes;
     }
 
diff --git a/app/Models/Node.php b/app/Models/Node.php
index 802843e0..2643511a 100644
--- a/app/Models/Node.php
+++ b/app/Models/Node.php
@@ -83,8 +83,11 @@ class Node extends Model
 
     public function users()
     {
-        return User::activeUser()->whereIn('user_group_id', $this->userGroups->pluck('id')->toArray())->orwhereNull('user_group_id')->where('level', '>=',
-            $this->attributes['level'])->get();
+        return User::activeUser()
+            ->where('level', '>=', $this->attributes['level'])
+            ->whereNull('user_group_id')
+            ->orwhereIn('user_group_id', $this->userGroups->pluck('id')->toArray())
+            ->get();
     }
 
     public function config($user)