BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-07 04:59:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
兔姬桑
2020-10-31 00:56:32 +08:00
parent c1aa48b340
commit 72b0908423
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/VNet/addUser.php
View File

@@ -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();

4
app/Jobs/VNet/editUser.php
View File

@@ -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();

2
app/Models/UserHourlyDataFlow.php
View File

@@ -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小时内流量异常用户

1
resources/views/admin/user/index.blade.php
View File

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