From 3ba1e87222e278f845d8bd52948dac67739f666b Mon Sep 17 00:00:00 2001 From: tokumeikoi Date: Thu, 15 Dec 2022 23:30:47 +0800 Subject: [PATCH] update: uniproxy --- app/Http/Controllers/Guest/CommController.php | 13 ------------- app/Http/Controllers/Server/UniProxyController.php | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Guest/CommController.php b/app/Http/Controllers/Guest/CommController.php index 181134bd..165a486f 100644 --- a/app/Http/Controllers/Guest/CommController.php +++ b/app/Http/Controllers/Guest/CommController.php @@ -23,19 +23,6 @@ class CommController extends Controller 'app_description' => config('v2board.app_description'), 'app_url' => config('v2board.app_url'), 'logo' => config('v2board.logo'), - - // TODO:REMOVE:1.7.0 - - 'tosUrl' => config('v2board.tos_url'), - 'isEmailVerify' => (int)config('v2board.email_verify', 0) ? 1 : 0, - 'isInviteForce' => (int)config('v2board.invite_force', 0) ? 1 : 0, - 'emailWhitelistSuffix' => (int)config('v2board.email_whitelist_enable', 0) - ? $this->getEmailSuffix() - : 0, - 'isRecaptcha' => (int)config('v2board.recaptcha_enable', 0) ? 1 : 0, - 'recaptchaSiteKey' => config('v2board.recaptcha_site_key'), - 'appDescription' => config('v2board.app_description'), - 'appUrl' => config('v2board.app_url'), ] ]); } diff --git a/app/Http/Controllers/Server/UniProxyController.php b/app/Http/Controllers/Server/UniProxyController.php index 2a14b6fa..edc5c50a 100644 --- a/app/Http/Controllers/Server/UniProxyController.php +++ b/app/Http/Controllers/Server/UniProxyController.php @@ -109,8 +109,8 @@ class UniProxyController extends Controller break; } $response['base_config'] = [ - 'push_interval' => config('v2board.server_push_interval', 60), - 'pull_interval' => config('v2board.server_pull_interval', 60) + 'push_interval' => (int)config('v2board.server_push_interval', 60), + 'pull_interval' => (int)config('v2board.server_pull_interval', 60) ]; if ($this->nodeInfo['route_id']) { $response['routes'] = $this->serverService->getRoutes($this->nodeInfo['route_id']);