diff --git a/app/Jobs/VNet/addUser.php b/app/Jobs/VNet/addUser.php
index d43937f2..ee955a0d 100644
--- a/app/Jobs/VNet/addUser.php
+++ b/app/Jobs/VNet/addUser.php
@@ -49,7 +49,7 @@ class addUser implements ShouldQueue
private function send($host, $secret): void
{
- $request = Http::baseUrl($host)->timeout(15)->withHeaders(['secret' => $secret]);
+ $request = Http::baseUrl($host)->timeout(20)->withHeaders(['secret' => $secret]);
$response = $request->post('api/v2/user/add/list', $this->data);
$message = $response->json();
diff --git a/app/Jobs/VNet/editUser.php b/app/Jobs/VNet/editUser.php
index 4df3e2e3..fed9afab 100644
--- a/app/Jobs/VNet/editUser.php
+++ b/app/Jobs/VNet/editUser.php
@@ -53,7 +53,7 @@ class editUser implements ShouldQueue
private function list($host, $secret)
{
- $request = Http::baseUrl($host)->timeout(15)->withHeaders(['secret' => $secret]);
+ $request = Http::baseUrl($host)->timeout(20)->withHeaders(['secret' => $secret]);
$response = $request->get('api/user/list');
$message = $response->json();
@@ -68,7 +68,7 @@ class editUser implements ShouldQueue
private function send($host, $secret): void
{
- $request = Http::baseUrl($host)->timeout(15)->withHeaders(['secret' => $secret]);
+ $request = Http::baseUrl($host)->timeout(20)->withHeaders(['secret' => $secret]);
$response = $request->post('api/user/edit', $this->data);
$message = $response->json();
diff --git a/app/Models/UserHourlyDataFlow.php b/app/Models/UserHourlyDataFlow.php
index 66b9eb77..c655c1f5 100644
--- a/app/Models/UserHourlyDataFlow.php
+++ b/app/Models/UserHourlyDataFlow.php
@@ -31,7 +31,7 @@ class UserHourlyDataFlow extends Model
public function scopeUserRecentUsed($query, $uid)
{
- return $query->userHourly($uid)->where('created_at', '>=', date('Y-m-d H:55'));
+ return $query->userHourly($uid)->where('created_at', '>=', date('Y-m-d H:i:s', time() - 3900));
}
// 1小时内流量异常用户
diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php
index 39d57699..6c9d39e9 100644
--- a/resources/views/admin/user/index.blade.php
+++ b/resources/views/admin/user/index.blade.php
@@ -4,6 +4,7 @@