Browse Source

Fix #82 & 用户列表下滑菜单在特殊情况下显示异常的问题

兔姬桑 4 years ago
parent
commit
72b0908423

+ 1 - 1
app/Jobs/VNet/addUser.php

@@ -49,7 +49,7 @@ class addUser implements ShouldQueue
 
 
     private function send($host, $secret): void
     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);
         $response = $request->post('api/v2/user/add/list', $this->data);
         $message = $response->json();
         $message = $response->json();

+ 2 - 2
app/Jobs/VNet/editUser.php

@@ -53,7 +53,7 @@ class editUser implements ShouldQueue
 
 
     private function list($host, $secret)
     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');
         $response = $request->get('api/user/list');
         $message = $response->json();
         $message = $response->json();
@@ -68,7 +68,7 @@ class editUser implements ShouldQueue
 
 
     private function send($host, $secret): void
     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);
         $response = $request->post('api/user/edit', $this->data);
         $message = $response->json();
         $message = $response->json();

+ 1 - 1
app/Models/UserHourlyDataFlow.php

@@ -31,7 +31,7 @@ class UserHourlyDataFlow extends Model
 
 
     public function scopeUserRecentUsed($query, $uid)
     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小时内流量异常用户
     // 1小时内流量异常用户

+ 1 - 0
resources/views/admin/user/index.blade.php

@@ -4,6 +4,7 @@
     <link href="/assets/custom/range.min.css" type="text/css" rel="stylesheet">
     <link href="/assets/custom/range.min.css" type="text/css" rel="stylesheet">
     <style>
     <style>
         .table a {
         .table a {
+            color: #76838f;
             text-decoration: none;
             text-decoration: none;
         }
         }
     </style>
     </style>