yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-10-31 01:11:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix trojan user online

Browse Source
This commit is contained in:
Tokumeikoi
2020-07-03 15:24:10 +08:00
parent 365775970c
commit 6e789037d1
6 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/Server/V2rayController.php
View File

@@ -23,11 +23,11 @@ class V2rayController extends Controller
$server[$i]['tags'] = json_decode($server[$i]['tags']); $server[$i]['tags'] = json_decode($server[$i]['tags']);
} }
$server[$i]['group_id'] = json_decode($server[$i]['group_id']); $server[$i]['group_id'] = json_decode($server[$i]['group_id']);
$server[$i]['online'] = Cache::get(CacheKey::get('SERVER_ONLINE_USER', $server[$i]['parent_id'] ? $server[$i]['parent_id'] : $server[$i]['id'])); $server[$i]['online'] = Cache::get(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server[$i]['parent_id'] ? $server[$i]['parent_id'] : $server[$i]['id']));
if ($server[$i]['parent_id']) { if ($server[$i]['parent_id']) {
$server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_LAST_CHECK_AT', $server[$i]['parent_id'])); $server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server[$i]['parent_id']));
} else { } else {
$server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_LAST_CHECK_AT', $server[$i]['id'])); $server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server[$i]['id']));
} }
} }
return response([ return response([

4
app/Http/Controllers/Server/DeepbworkController.php
View File

@@ -39,7 +39,7 @@ class DeepbworkController extends Controller
if (!$server) { if (!$server) {
abort(500, 'fail'); abort(500, 'fail');
} }
Cache::put(CacheKey::get('SERVER_LAST_CHECK_AT', $server->id), time(), 3600); Cache::put(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server->id), time(), 3600);
$serverService = new ServerService(); $serverService = new ServerService();
$users = $serverService->getAvailableUsers(json_decode($server->group_id)); $users = $serverService->getAvailableUsers(json_decode($server->group_id));
$result = []; $result = [];
@@ -74,7 +74,7 @@ class DeepbworkController extends Controller
} }
$data = file_get_contents('php://input'); $data = file_get_contents('php://input');
$data = json_decode($data, true); $data = json_decode($data, true);
Cache::put(CacheKey::get('SERVER_ONLINE_USER', $server->id), count($data), 3600); Cache::put(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server->id), count($data), 3600);
$serverService = new ServerService(); $serverService = new ServerService();
$userService = new UserService(); $userService = new UserService();
foreach ($data as $item) { foreach ($data as $item) {

4
app/Http/Controllers/Server/PoseidonController.php
View File

@@ -37,7 +37,7 @@ class PoseidonController extends Controller
if (!$server) { if (!$server) {
return $this->error("server could not be found", 404); return $this->error("server could not be found", 404);
} }
Cache::put(CacheKey::get('SERVER_LAST_CHECK_AT', $server->id), time(), 3600); Cache::put(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server->id), time(), 3600);
$serverService = new ServerService(); $serverService = new ServerService();
$users = $serverService->getAvailableUsers(json_decode($server->group_id)); $users = $serverService->getAvailableUsers(json_decode($server->group_id));
$result = []; $result = [];
@@ -67,7 +67,7 @@ class PoseidonController extends Controller
} }
$data = file_get_contents('php://input'); $data = file_get_contents('php://input');
$data = json_decode($data, true); $data = json_decode($data, true);
Cache::put(CacheKey::get('SERVER_ONLINE_USER', $server->id), count($data), 3600); Cache::put(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server->id), count($data), 3600);
$serverService = new ServerService(); $serverService = new ServerService();
$userService = new UserService(); $userService = new UserService();
foreach ($data as $item) { foreach ($data as $item) {

8
app/Services/ServerService.php
View File

@@ -28,9 +28,9 @@ class ServerService
if (in_array($user->group_id, $groupId)) { if (in_array($user->group_id, $groupId)) {
$vmesss[$k]['link'] = Helper::buildVmessLink($vmesss[$k], $user); $vmesss[$k]['link'] = Helper::buildVmessLink($vmesss[$k], $user);
if ($vmesss[$k]['parent_id']) { if ($vmesss[$k]['parent_id']) {
$vmesss[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_LAST_CHECK_AT', $vmesss[$k]['parent_id'])); $vmesss[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $vmesss[$k]['parent_id']));
} else { } else {
$vmesss[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_LAST_CHECK_AT', $vmesss[$k]['id'])); $vmesss[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $vmesss[$k]['id']));
} }
array_push($vmess, $vmesss[$k]); array_push($vmess, $vmesss[$k]);
} }
@@ -51,7 +51,11 @@ class ServerService
foreach ($trojans as $k => $v) { foreach ($trojans as $k => $v) {
$groupId = json_decode($trojans[$k]['group_id']); $groupId = json_decode($trojans[$k]['group_id']);
if (in_array($user->group_id, $groupId)) { if (in_array($user->group_id, $groupId)) {
if ($trojans[$k]['parent_id']) {
$trojans[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojans[$k]['parent_id']));
} else {
$trojans[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojans[$k]['id'])); $trojans[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojans[$k]['id']));
}
array_push($trojan, $trojans[$k]); array_push($trojan, $trojans[$k]);
} }

4
app/Utils/CacheKey.php
View File

@@ -7,8 +7,8 @@ class CacheKey
CONST KEYS = [ CONST KEYS = [
'EMAIL_VERIFY_CODE' => '邮箱验证吗', 'EMAIL_VERIFY_CODE' => '邮箱验证吗',
'LAST_SEND_EMAIL_VERIFY_TIMESTAMP' => '最后一次发送邮箱验证码时间', 'LAST_SEND_EMAIL_VERIFY_TIMESTAMP' => '最后一次发送邮箱验证码时间',
'SERVER_ONLINE_USER' => '节点在线用户', 'SERVER_V2RAY_ONLINE_USER' => '节点在线用户',
'SERVER_LAST_CHECK_AT' => '节点最后检查时间', 'SERVER_V2RAY_LAST_CHECK_AT' => '节点最后检查时间',
'SERVER_TROJAN_ONLINE_USER' => 'trojan节点在线用户', 'SERVER_TROJAN_ONLINE_USER' => 'trojan节点在线用户',
'SERVER_TROJAN_LAST_CHECK_AT' => 'trojan节点最后检查时间' 'SERVER_TROJAN_LAST_CHECK_AT' => 'trojan节点最后检查时间'
]; ];

2
public/assets/admin/umi.js vendored
View File

File diff suppressed because one or more lines are too long