diff --git a/app/Console/Commands/AutoClearLog.php b/app/Console/Commands/AutoClearLog.php index 67f934b4..fc5b4d68 100644 --- a/app/Console/Commands/AutoClearLog.php +++ b/app/Console/Commands/AutoClearLog.php @@ -3,7 +3,7 @@ namespace App\Console\Commands; use App\Models\NodeDailyDataFlow; -use App\Models\NodeHeartBeat; +use App\Models\NodeHeartbeat; use App\Models\NodeHourlyDataFlow; use App\Models\NodeOnlineIp; use App\Models\NodeOnlineLog; @@ -54,7 +54,7 @@ class AutoClearLog extends Command NotificationLog::where('updated_at', '<=', date('Y-m-d H:i:s', strtotime('-1 month')))->delete(); // 清除节点负载信息日志 - NodeHeartBeat::where('log_time', '<=', strtotime('-30 minutes'))->delete(); + NodeHeartbeat::where('log_time', '<=', strtotime('-30 minutes'))->delete(); // 清除节点在线用户数日志 NodeOnlineLog::where('log_time', '<=', strtotime('-1 hour'))->delete(); diff --git a/app/Console/Commands/AutoJob.php b/app/Console/Commands/AutoJob.php index d561432a..5049cb63 100644 --- a/app/Console/Commands/AutoJob.php +++ b/app/Console/Commands/AutoJob.php @@ -8,7 +8,7 @@ use App\Models\Config; use App\Models\Coupon; use App\Models\Invite; use App\Models\Node; -use App\Models\NodeHeartBeat; +use App\Models\NodeHeartbeat; use App\Models\Order; use App\Models\User; use App\Models\VerifyCode; @@ -181,7 +181,7 @@ class AutoJob extends Command { if (sysConfig('is_node_offline')) { $offlineCheckTimes = sysConfig('offline_check_times'); - $onlineNode = NodeHeartBeat::recently()->distinct()->pluck('node_id')->toArray(); + $onlineNode = NodeHeartbeat::recently()->distinct()->pluck('node_id')->toArray(); foreach (Node::whereIsRelay(0)->whereStatus(1)->get() as $node) { // 10分钟内无节点负载信息则认为是后端炸了 $nodeTTL = ! in_array($node->id, $onlineNode, true); diff --git a/app/Http/Controllers/Admin/NodeController.php b/app/Http/Controllers/Admin/NodeController.php index 580e3c7c..a0cf40e7 100644 --- a/app/Http/Controllers/Admin/NodeController.php +++ b/app/Http/Controllers/Admin/NodeController.php @@ -42,7 +42,7 @@ class NodeController extends Controller $node->transfer = flowAutoShow($node->dailyDataFlows()->sum('total')); // 负载(10分钟以内) - $node_info = $node->heartBeats()->recently()->first(); + $node_info = $node->heartbeats()->recently()->first(); $node->isOnline = empty($node_info) || empty($node_info->load) ? 0 : 1; $node->load = $node->isOnline ? $node_info->load : '离线'; $node->uptime = empty($node_info) ? 0 : seconds2time($node_info->uptime); diff --git a/app/Http/Controllers/Api/WebApi/BaseController.php b/app/Http/Controllers/Api/WebApi/BaseController.php index 707ccaa8..cefae8d2 100644 --- a/app/Http/Controllers/Api/WebApi/BaseController.php +++ b/app/Http/Controllers/Api/WebApi/BaseController.php @@ -22,7 +22,7 @@ class BaseController $data = array_map('intval', $validator->validated()); - if ($node->heartBeats()->create([ + if ($node->heartbeats()->create([ 'uptime' => $data['uptime'], 'load' => implode(' ', [$data['cpu'] / 100, $data['mem'] / 100, $data['disk'] / 100]), 'log_time' => time(), diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index eec9b38b..8f9d2065 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -11,7 +11,7 @@ use App\Models\Coupon; use App\Models\Goods; use App\Models\Invite; use App\Models\Node; -use App\Models\NodeHeartBeat; +use App\Models\NodeHeartbeat; use App\Models\Order; use App\Models\Ticket; use Cache; @@ -115,7 +115,7 @@ class UserController extends Controller // 获取当前用户可用节点 $nodeList = $user->nodes()->with(['labels', 'level_table'])->get(); - $onlineNode = NodeHeartBeat::recently()->distinct()->pluck('node_id')->toArray(); + $onlineNode = NodeHeartbeat::recently()->distinct()->pluck('node_id')->toArray(); foreach ($nodeList as $node) { // 节点在线状态 $node->offline = ! in_array($node->id, $onlineNode, true); diff --git a/app/Models/Node.php b/app/Models/Node.php index 114ffe2e..2bc203de 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -22,9 +22,9 @@ class Node extends Model return $this->belongsToMany(Label::class); } - public function heartBeats(): HasMany + public function heartbeats(): HasMany { - return $this->hasMany(NodeHeartBeat::class); + return $this->hasMany(NodeHeartbeat::class); } public function onlineIps(): HasMany diff --git a/app/Models/NodeHeartBeat.php b/app/Models/NodeHeartbeat.php similarity index 100% rename from app/Models/NodeHeartBeat.php rename to app/Models/NodeHeartbeat.php