From 8547544bf22294b4bcbe3ac92ad95e0c5dc2e42e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= Date: Sat, 24 Oct 2020 10:02:16 +0800 Subject: [PATCH] Apply fixes from StyleCI (#75) --- app/Http/Controllers/Controller.php | 6 +++--- app/Http/Controllers/User/SubscribeController.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 597fd0f6..ac7b1592 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -195,9 +195,9 @@ class Controller extends BaseController public function v2raySubUrl($name, $host, $port, $uuid, $alter_id, $net, $type, $domain, $path, $tls): string { return 'vmess://'.base64url_encode(json_encode([ - 'v' => '2', 'ps' => $name, 'add' => $host, 'port' => $port, 'id' => $uuid, 'aid' => $alter_id, 'net' => $net, - 'type' => $type, 'host' => $domain, 'path' => $path, 'tls' => $tls ? 'tls' : '' - ], JSON_PRETTY_PRINT)); + 'v' => '2', 'ps' => $name, 'add' => $host, 'port' => $port, 'id' => $uuid, 'aid' => $alter_id, 'net' => $net, + 'type' => $type, 'host' => $domain, 'path' => $path, 'tls' => $tls ? 'tls' : '', + ], JSON_PRETTY_PRINT)); } public function trojanSubUrl($password, $domain, $port, $remark): string diff --git a/app/Http/Controllers/User/SubscribeController.php b/app/Http/Controllers/User/SubscribeController.php index df54f22b..74ffcb52 100644 --- a/app/Http/Controllers/User/SubscribeController.php +++ b/app/Http/Controllers/User/SubscribeController.php @@ -123,9 +123,9 @@ class SubscribeController extends Controller switch ($this->subType) { case 2: $result = 'vmess://'.base64url_encode(json_encode([ - 'v' => '2', 'ps' => $text, 'add' => '0.0.0.0', 'port' => 0, 'id' => 0, 'aid' => 0, 'net' => 'tcp', - 'type' => 'none', 'host' => '', 'path' => '/', 'tls' => 'tls' - ], JSON_PRETTY_PRINT)); + 'v' => '2', 'ps' => $text, 'add' => '0.0.0.0', 'port' => 0, 'id' => 0, 'aid' => 0, 'net' => 'tcp', + 'type' => 'none', 'host' => '', 'path' => '/', 'tls' => 'tls', + ], JSON_PRETTY_PRINT)); break; case 3: $result = 'trojan://0@0.0.0.0:0?peer=0.0.0.0#'.rawurlencode($text);