diff --git a/app/Http/Controllers/Admin/SubscribeController.php b/app/Http/Controllers/Admin/SubscribeController.php index 122b6d08..ace86f5c 100644 --- a/app/Http/Controllers/Admin/SubscribeController.php +++ b/app/Http/Controllers/Admin/SubscribeController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Admin; +use App\Components\IP; use App\Http\Controllers\Controller; use App\Models\UserSubscribe; use App\Models\UserSubscribeLog; @@ -50,7 +51,15 @@ class SubscribeController extends Controller $query->whereUserSubscribeId($id); } - return view('admin.subscribe.log', ['subscribeLog' => $query->latest()->paginate(20)->appends(\request('page'))]); + $subscribeLogs = $query->latest()->paginate(20)->appends(\request('page')); + foreach ($subscribeLogs as $log) { + // 跳过上报多IP的 + if ($log->request_ip) { + $log->ipInfo = implode(' ', IP::getIPInfo($log->request_ip)); + } + } + + return view('admin.subscribe.log', ['subscribeLog' => $subscribeLogs]); } // 设置用户的订阅的状态 diff --git a/app/Observers/NodeObserver.php b/app/Observers/NodeObserver.php index 887cd2f8..6838d045 100644 --- a/app/Observers/NodeObserver.php +++ b/app/Observers/NodeObserver.php @@ -5,7 +5,6 @@ namespace App\Observers; use App\Components\DDNS; use App\Jobs\VNet\reloadNode; use App\Models\Node; -use App\Models\NodeAuth; use App\Services\NodeService; use Arr; use Log; @@ -20,11 +19,7 @@ class NodeObserver public function created(Node $node): void { - $auth = new NodeAuth(); - $auth->node_id = $node->id; - $auth->key = Str::random(); - $auth->secret = Str::random(8); - if (! $auth->save()) { + if (! $node->auth()->create(['key' => Str::random(), 'secret' => Str::random(8)])) { Log::warning('节点生成-自动生成授权时出现错误,请稍后自行生成授权!'); } diff --git a/config/version.php b/config/version.php index b14d8ab4..630bb53c 100644 --- a/config/version.php +++ b/config/version.php @@ -2,5 +2,5 @@ return [ 'name' => 'ProxyPanel', - 'number' => '2.6.b', + 'number' => '2.6.c', ]; diff --git a/resources/views/admin/logs/onlineIPMonitor.blade.php b/resources/views/admin/logs/onlineIPMonitor.blade.php index a1333fbf..29a6f838 100644 --- a/resources/views/admin/logs/onlineIPMonitor.blade.php +++ b/resources/views/admin/logs/onlineIPMonitor.blade.php @@ -59,8 +59,8 @@ {{$log->id}} {{$log->type}} - {{$log->node ? $log->node->name : '【节点已删除】'}} - {{$log->user ? $log->user->email : '【用户已删除】'}} + {{$log->node->name ?? '【节点已删除】'}} + {{$log->user->email ?? '【用户已删除】'}} @if (strpos($log->ip, ',') !== false) @foreach (explode(',', $log->ip) as $ip) diff --git a/resources/views/admin/subscribe/log.blade.php b/resources/views/admin/subscribe/log.blade.php index 57375d37..2af8974c 100644 --- a/resources/views/admin/subscribe/log.blade.php +++ b/resources/views/admin/subscribe/log.blade.php @@ -15,6 +15,7 @@ # 用户 请求IP + 归属地 请求时间 访问 @@ -23,8 +24,15 @@ @foreach($subscribeLog as $subscribe) {{$subscribe->id}} - {{empty($subscribe->user) ? '用户已删除' : $subscribe->user->email}} - {{$subscribe->request_ip}} + {{$subscribe->user->email ?? '用户已删除'}} + + @if ($subscribe->request_ip) + {{$subscribe->request_ip}} + @endif + + + {{$subscribe->ipInfo}} + {{$subscribe->request_time}} {{$subscribe->request_header}}