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

update: uniproxy

Browse Source
This commit is contained in:
tokumeikoi
2022-11-29 14:33:08 +08:00
parent 40e6400b9b
commit f781f22cde
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,9 @@ class UniProxyController extends Controller
'push_interval' => config('v2board.server_push_interval', 60), 'push_interval' => config('v2board.server_push_interval', 60),
'pull_interval' => config('v2board.server_pull_interval', 60) 'pull_interval' => config('v2board.server_pull_interval', 60)
]; ];
$response['routes'] = $this->serverService->getRoutes($this->nodeInfo['route_id']); if ($this->nodeInfo['route_id']) {
$response['routes'] = $this->serverService->getRoutes($this->nodeInfo['route_id']);
}
$eTag = sha1(json_encode($response)); $eTag = sha1(json_encode($response));
if (strpos($request->header('If-None-Match'), $eTag) !== false ) { if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
abort(304); abort(304);

2
app/Services/ServerService.php
View File

@@ -218,7 +218,7 @@ class ServerService
return $servers; return $servers;
} }
public function getRoutes($routeIds) public function getRoutes(array $routeIds)
{ {
return ServerRoute::select(['id', 'match', 'action', 'action_value'])->whereIn('id', $routeIds)->get(); return ServerRoute::select(['id', 'match', 'action', 'action_value'])->whereIn('id', $routeIds)->get();
} }