diff --git a/app/Http/Controllers/V1/Client/AppController.php b/app/Http/Controllers/V1/Client/AppController.php index b72e04cc..27f74cd2 100644 --- a/app/Http/Controllers/V1/Client/AppController.php +++ b/app/Http/Controllers/V1/Client/AppController.php @@ -39,11 +39,11 @@ class AppController extends Controller 'chacha20-ietf-poly1305' ]) ) { - array_push($proxy, \App\Http\Controllers\V1\Client\Protocols\Clash::buildShadowsocks($user['uuid'], $item)); + array_push($proxy, \App\Protocols\Clash::buildShadowsocks($user['uuid'], $item)); array_push($proxies, $item['name']); } if ($item['type'] === 'vmess') { - array_push($proxy, \App\Http\Controllers\V1\Client\Protocols\Clash::buildVmess($user['uuid'], $item)); + array_push($proxy, \App\Protocols\Clash::buildVmess($user['uuid'], $item)); array_push($proxies, $item['name']); } if ($item['type'] === 'trojan') { diff --git a/app/Http/Controllers/V1/Client/ClientController.php b/app/Http/Controllers/V1/Client/ClientController.php index 1d468d57..419f94a3 100644 --- a/app/Http/Controllers/V1/Client/ClientController.php +++ b/app/Http/Controllers/V1/Client/ClientController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\V1\Client; use App\Http\Controllers\Controller; -use App\Http\Controllers\V1\Client\Protocols\General; +use App\Protocols\General; use App\Services\ServerService; use App\Services\UserService; use App\Utils\Helper; @@ -24,8 +24,8 @@ class ClientController extends Controller $servers = $serverService->getAvailableServers($user); $this->setSubscribeInfoToServers($servers, $user); if ($flag) { - foreach (array_reverse(glob(app_path('Http//Controllers//Client//Protocols') . '/*.php')) as $file) { - $file = 'App\\Http\\Controllers\\Client\\Protocols\\' . basename($file, '.php'); + foreach (array_reverse(glob(app_path('Protocols') . '/*.php')) as $file) { + $file = 'App\\Protocols\\' . basename($file, '.php'); $class = new $file($user, $servers); if (strpos($flag, $class->flag) !== false) { die($class->handle()); diff --git a/app/Http/Controllers/V1/Client/Protocols/Clash.php b/app/Protocols/Clash.php similarity index 99% rename from app/Http/Controllers/V1/Client/Protocols/Clash.php rename to app/Protocols/Clash.php index 7d1802de..4d6c4631 100644 --- a/app/Http/Controllers/V1/Client/Protocols/Clash.php +++ b/app/Protocols/Clash.php @@ -1,6 +1,6 @@