Fix #114 & Clean code

app/Http/Controllers/Admin/LogsController.php

@@ -288,7 +288,7 @@ class LogsController extends Controller
         foreach ($userList as $user) {
             //Todo node_online_ip表 api可以用user_id
             // 最近5条在线IP记录，如果后端设置为60秒上报一次，则为10分钟内的在线IP
-            $user->onlineIPList = $nodeOnlineIPs->where('port', $user->port)->chunk(5);
+            $user->onlineIPList = $nodeOnlineIPs->where('port', $user->port)->take(5);
         }
 
         return view('admin.logs.userOnlineIP', ['userList' => $userList]);

app/Models/NotificationLog.php

@@ -10,4 +10,5 @@ use Illuminate\Database\Eloquent\Model;
 class NotificationLog extends Model
 {
     protected $table = 'notification_log';
+    protected $guarded = [];
 }

app/Observers/NodeObserver.php

@@ -6,8 +6,6 @@ use App\Components\DDNS;
 use App\Jobs\VNet\reloadNode;
 use App\Models\Node;
 use App\Models\NodeAuth;
-use App\Models\RuleGroup;
-use App\Models\UserGroup;
 use App\Services\NodeService;
 use Arr;
 use Log;
@@ -30,7 +28,7 @@ class NodeObserver
             Log::warning('节点生成-自动生成授权时出现错误，请稍后自行生成授权！');
         }
 
-        if ($node->is_ddns == 0 && $node->server && sysConfig('ddns_mode')) {
+        if ($node->is_ddns === 0 && $node->server && sysConfig('ddns_mode')) {
             if ($node->ip) {
                 DDNS::store($node->server, $node->ip);
             }
@@ -76,32 +74,14 @@ class NodeObserver
             }
         }
 
-        if ($node->type == 4) {
-            reloadNode::dispatch(Node::whereId($node->id)->get());
+        if ($node->type === 4) {
+            reloadNode::dispatch($node);
         }
     }
 
     public function deleted(Node $node): void
     {
-        // 断开审计规则分组节点联系
-        foreach (RuleGroup::all() as $ruleGroup) {
-            $nodes = $ruleGroup->nodes;
-            if ($nodes && in_array($node->id, $nodes)) {
-                $ruleGroup->nodes = array_merge(array_diff($nodes, [$node->id]));
-                $ruleGroup->save();
-            }
-        }
-
-        // 断开用户分组控制节点联系
-        foreach (UserGroup::all() as $userGroup) {
-            $nodes = $userGroup->nodes;
-            if ($nodes && in_array($node->id, $nodes)) {
-                $userGroup->nodes = array_merge(array_diff($nodes, [$node->id]));
-                $userGroup->save();
-            }
-        }
-
-        if ($node->is_ddns == 0 && $node->server && sysConfig('ddns_mode')) {
+        if ($node->is_ddns === 0 && $node->server && sysConfig('ddns_mode')) {
             DDNS::destroy($node->server);
         }
     }

app/Services/NodeService.php

@@ -18,7 +18,7 @@ class NodeService
         $result = 0;
         foreach ($nodes as $node) {
             $data = IP::IPSB($node->is_ddns ? gethostbyname($node->server) : $node->ip);
-            if ($data && Node::whereId($node->id)->update(['geo' => $data['latitude'].','.$data['longitude']])) {
+            if ($data && $node->update(['geo' => $data['latitude'].','.$data['longitude']])) {
                 $result++;
             }
         }

app/Services/OrderService.php

@@ -100,7 +100,7 @@ class OrderService
     // 激活套餐
     private function activatePlan(): bool
     {
-        Order::whereId(self::$order->id)->update(['expired_at' => date('Y-m-d H:i:s', strtotime('+'.self::$goods->days.' days'))]);
+        self::$order->update(['expired_at' => date('Y-m-d H:i:s', strtotime('+'.self::$goods->days.' days'))]);
         $oldData = self::$user->transfer_enable;
         $updateData = [
             'invite_num' => self::$user->invite_num + (self::$goods->invite_num ?: 0),

resources/views/admin/logs/userOnlineIP.blade.php

@@ -71,7 +71,7 @@
                                 @endif
                             </td>
                             <td>
-                                @if(!$user->onlineIPList->isEmpty())
+                                @if($user->onlineIPList->isNotEmpty())
                                     <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
                                         <thead>
                                         <tr>
@@ -82,13 +82,13 @@
                                         </tr>
                                         </thead>
                                         <tbody>
-                                        @foreach($user->onlineIPList as $vo)
+                                        @foreach($user->onlineIPList as $log)
                                             <tr>
-                                                <td>{{$vo->created_at}}</td>
-                                                <td>{{$vo->node->name ?? '【节点已删除】'}}</td>
-                                                <td>{{$vo->type}}</td>
+                                                <td>{{$log->created_at}}</td>
+                                                <td>{{$log->node->name ?? '【节点已删除】'}}</td>
+                                                <td>{{$log->type}}</td>
                                                 <td>
-                                                    <a href="https://www.ipip.net/ip/{{$vo->ip}}.html" target="_blank">{{$vo->ip}}</a>
+                                                    <a href="https://www.ipip.net/ip/{{$log->ip}}.html" target="_blank">{{$log->ip}}</a>
                                                 </td>
                                             </tr>
                                         @endforeach