yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-11-15 00:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: fix ss server key

Browse Source
This commit is contained in:
v2board 2023-01-25 23:04:55 +08:00
parent 9f574a6208
commit 4034fd4d97
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/Services/ServerService.php
View File

@ -25,8 +25,7 @@ class ServerService
$v2ray = $model->get(); $v2ray = $model->get();
for ($i = 0; $i < count($v2ray); $i++) { for ($i = 0; $i < count($v2ray); $i++) {
$v2ray[$i]['type'] = 'v2ray'; $v2ray[$i]['type'] = 'v2ray';
$groupId = $v2ray[$i]['group_id']; if (!in_array($user->group_id, $v2ray[$i]['group_id'])) continue;
if (!in_array($user->group_id, $groupId)) continue;
if (strpos($v2ray[$i]['port'], '-') !== false) { if (strpos($v2ray[$i]['port'], '-') !== false) {
$v2ray[$i]['port'] = Helper::randomPort($v2ray[$i]['port']); $v2ray[$i]['port'] = Helper::randomPort($v2ray[$i]['port']);
} }
@ -35,7 +34,7 @@ class ServerService
} else { } else {
$v2ray[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $v2ray[$i]['id'])); $v2ray[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $v2ray[$i]['id']));
} }
array_push($servers, $v2ray[$i]->toArray()); $servers[] = $v2ray[$i]->toArray();
} }
@ -52,8 +51,7 @@ class ServerService
$trojan = $model->get(); $trojan = $model->get();
for ($i = 0; $i < count($trojan); $i++) { for ($i = 0; $i < count($trojan); $i++) {
$trojan[$i]['type'] = 'trojan'; $trojan[$i]['type'] = 'trojan';
$groupId = $trojan[$i]['group_id']; if (!in_array($user->group_id, $trojan[$i]['group_id'])) continue;
if (!in_array($user->group_id, $groupId)) continue;
if (strpos($trojan[$i]['port'], '-') !== false) { if (strpos($trojan[$i]['port'], '-') !== false) {
$trojan[$i]['port'] = Helper::randomPort($trojan[$i]['port']); $trojan[$i]['port'] = Helper::randomPort($trojan[$i]['port']);
} }
@ -62,7 +60,7 @@ class ServerService
} else { } else {
$trojan[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$i]['id'])); $trojan[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$i]['id']));
} }
array_push($servers, $trojan[$i]->toArray()); $servers[] = $trojan[$i]->toArray();
} }
return $servers; return $servers;
} }
@ -74,20 +72,20 @@ class ServerService
if (!$all) { if (!$all) {
$model->where('show', 1); $model->where('show', 1);
} }
$shadowsocks = $model->get(); $shadowsocks = $model->get()->keyBy('id');
for ($i = 0; $i < count($shadowsocks); $i++) { foreach ($shadowsocks as $key => $v) {
$shadowsocks[$i]['type'] = 'shadowsocks'; $shadowsocks[$key]['type'] = 'shadowsocks';
$groupId = $shadowsocks[$i]['group_id']; if (!in_array($user->group_id, $v['group_id'])) continue;
if (!in_array($user->group_id, $groupId)) continue; if (strpos($v['port'], '-') !== false) {
if (strpos($shadowsocks[$i]['port'], '-') !== false) { $shadowsocks[$key]['port'] = Helper::randomPort($v['port']);
$shadowsocks[$i]['port'] = Helper::randomPort($shadowsocks[$i]['port']);
} }
if ($shadowsocks[$i]['parent_id']) { if ($v['parent_id']) {
$shadowsocks[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $shadowsocks[$i]['parent_id'])); $shadowsocks[$key]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $v['parent_id']));
$shadowsocks[$key]['created_at'] = $shadowsocks[$v['parent_id']]['created_at'];
} else { } else {
$shadowsocks[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $shadowsocks[$i]['id'])); $shadowsocks[$key]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $v['id']));
} }
array_push($servers, $shadowsocks[$i]->toArray()); $servers[] = $shadowsocks[$key]->toArray();
} }
return $servers; return $servers;
} }
@ -101,13 +99,12 @@ class ServerService
); );
$tmp = array_column($servers, 'sort'); $tmp = array_column($servers, 'sort');
array_multisort($tmp, SORT_ASC, $servers); array_multisort($tmp, SORT_ASC, $servers);
$servers = array_map(function ($server) { return array_map(function ($server) {
$server['port'] = (int)$server['port']; $server['port'] = (int)$server['port'];
$server['is_online'] = (time() - 300 > $server['last_check_at']) ? 0 : 1; $server['is_online'] = (time() - 300 > $server['last_check_at']) ? 0 : 1;
$server['cache_key'] = "{$server['type']}-{$server['id']}-{$server['updated_at']}-{$server['is_online']}"; $server['cache_key'] = "{$server['type']}-{$server['id']}-{$server['updated_at']}-{$server['is_online']}";
return $server; return $server;
}, $servers); }, $servers);
return $servers;
} }
public function getAvailableUsers($groupId) public function getAvailableUsers($groupId)