From 61f1d8a6239a7df46797dd0d5db1a3e8950b88d9 Mon Sep 17 00:00:00 2001
From: v2board <org@v2board.com>
Date: Wed, 14 Jun 2023 11:38:21 +0800
Subject: [PATCH] update: reconsitution

---
 app/Http/Controllers/V1/Client/AppController.php            | 4 ++--
 app/Http/Controllers/V1/Client/ClientController.php         | 6 +++---
 app/{Http/Controllers/V1/Client => }/Protocols/Clash.php    | 2 +-
 .../Controllers/V1/Client => }/Protocols/ClashMeta.php      | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/General.php  | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/Loon.php     | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/Passwall.php | 2 +-
 .../Controllers/V1/Client => }/Protocols/QuantumultX.php    | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/SSRPlus.php  | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/SagerNet.php | 2 +-
 .../Controllers/V1/Client => }/Protocols/Shadowrocket.php   | 2 +-
 .../Controllers/V1/Client => }/Protocols/Shadowsocks.php    | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/Stash.php    | 2 +-
 .../Controllers/V1/Client => }/Protocols/Surfboard.php      | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/Surge.php    | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/V2rayN.php   | 2 +-
 app/{Http/Controllers/V1/Client => }/Protocols/V2rayNG.php  | 2 +-
 17 files changed, 20 insertions(+), 20 deletions(-)
 rename app/{Http/Controllers/V1/Client => }/Protocols/Clash.php (99%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/ClashMeta.php (99%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/General.php (98%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/Loon.php (98%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/Passwall.php (98%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/QuantumultX.php (98%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/SSRPlus.php (98%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/SagerNet.php (98%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/Shadowrocket.php (99%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/Shadowsocks.php (96%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/Stash.php (99%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/Surfboard.php (99%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/Surge.php (99%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/V2rayN.php (98%)
 rename app/{Http/Controllers/V1/Client => }/Protocols/V2rayNG.php (98%)

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 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 use phpDocumentor\Reflection\Types\Self_;
 use Symfony\Component\Yaml\Yaml;
diff --git a/app/Http/Controllers/V1/Client/Protocols/ClashMeta.php b/app/Protocols/ClashMeta.php
similarity index 99%
rename from app/Http/Controllers/V1/Client/Protocols/ClashMeta.php
rename to app/Protocols/ClashMeta.php
index 65805ec3..33946664 100644
--- a/app/Http/Controllers/V1/Client/Protocols/ClashMeta.php
+++ b/app/Protocols/ClashMeta.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 use App\Utils\Helper;
 use Symfony\Component\Yaml\Yaml;
diff --git a/app/Http/Controllers/V1/Client/Protocols/General.php b/app/Protocols/General.php
similarity index 98%
rename from app/Http/Controllers/V1/Client/Protocols/General.php
rename to app/Protocols/General.php
index c6666efa..afe7b6d9 100644
--- a/app/Http/Controllers/V1/Client/Protocols/General.php
+++ b/app/Protocols/General.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 
 use App\Utils\Helper;
diff --git a/app/Http/Controllers/V1/Client/Protocols/Loon.php b/app/Protocols/Loon.php
similarity index 98%
rename from app/Http/Controllers/V1/Client/Protocols/Loon.php
rename to app/Protocols/Loon.php
index b6cea9f1..7007cf0e 100644
--- a/app/Http/Controllers/V1/Client/Protocols/Loon.php
+++ b/app/Protocols/Loon.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 class Loon
 {
diff --git a/app/Http/Controllers/V1/Client/Protocols/Passwall.php b/app/Protocols/Passwall.php
similarity index 98%
rename from app/Http/Controllers/V1/Client/Protocols/Passwall.php
rename to app/Protocols/Passwall.php
index f2b8dc7c..0731bda9 100644
--- a/app/Http/Controllers/V1/Client/Protocols/Passwall.php
+++ b/app/Protocols/Passwall.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 
 class Passwall
diff --git a/app/Http/Controllers/V1/Client/Protocols/QuantumultX.php b/app/Protocols/QuantumultX.php
similarity index 98%
rename from app/Http/Controllers/V1/Client/Protocols/QuantumultX.php
rename to app/Protocols/QuantumultX.php
index e2acb603..0169110b 100644
--- a/app/Http/Controllers/V1/Client/Protocols/QuantumultX.php
+++ b/app/Protocols/QuantumultX.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 
 class QuantumultX
diff --git a/app/Http/Controllers/V1/Client/Protocols/SSRPlus.php b/app/Protocols/SSRPlus.php
similarity index 98%
rename from app/Http/Controllers/V1/Client/Protocols/SSRPlus.php
rename to app/Protocols/SSRPlus.php
index 5b8c7f90..8622b8f2 100644
--- a/app/Http/Controllers/V1/Client/Protocols/SSRPlus.php
+++ b/app/Protocols/SSRPlus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 
 class SSRPlus
diff --git a/app/Http/Controllers/V1/Client/Protocols/SagerNet.php b/app/Protocols/SagerNet.php
similarity index 98%
rename from app/Http/Controllers/V1/Client/Protocols/SagerNet.php
rename to app/Protocols/SagerNet.php
index f155058c..781e8114 100644
--- a/app/Http/Controllers/V1/Client/Protocols/SagerNet.php
+++ b/app/Protocols/SagerNet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 class SagerNet
 {
diff --git a/app/Http/Controllers/V1/Client/Protocols/Shadowrocket.php b/app/Protocols/Shadowrocket.php
similarity index 99%
rename from app/Http/Controllers/V1/Client/Protocols/Shadowrocket.php
rename to app/Protocols/Shadowrocket.php
index deca2d08..4d3dc939 100644
--- a/app/Http/Controllers/V1/Client/Protocols/Shadowrocket.php
+++ b/app/Protocols/Shadowrocket.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 use App\Utils\Helper;
 
diff --git a/app/Http/Controllers/V1/Client/Protocols/Shadowsocks.php b/app/Protocols/Shadowsocks.php
similarity index 96%
rename from app/Http/Controllers/V1/Client/Protocols/Shadowsocks.php
rename to app/Protocols/Shadowsocks.php
index 797c1bfc..1cd0022d 100644
--- a/app/Http/Controllers/V1/Client/Protocols/Shadowsocks.php
+++ b/app/Protocols/Shadowsocks.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 class Shadowsocks
 {
diff --git a/app/Http/Controllers/V1/Client/Protocols/Stash.php b/app/Protocols/Stash.php
similarity index 99%
rename from app/Http/Controllers/V1/Client/Protocols/Stash.php
rename to app/Protocols/Stash.php
index 517aa766..8f916e8d 100644
--- a/app/Http/Controllers/V1/Client/Protocols/Stash.php
+++ b/app/Protocols/Stash.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 use Symfony\Component\Yaml\Yaml;
 
diff --git a/app/Http/Controllers/V1/Client/Protocols/Surfboard.php b/app/Protocols/Surfboard.php
similarity index 99%
rename from app/Http/Controllers/V1/Client/Protocols/Surfboard.php
rename to app/Protocols/Surfboard.php
index 13d2d369..c4b36ad1 100644
--- a/app/Http/Controllers/V1/Client/Protocols/Surfboard.php
+++ b/app/Protocols/Surfboard.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 use App\Utils\Helper;
 
diff --git a/app/Http/Controllers/V1/Client/Protocols/Surge.php b/app/Protocols/Surge.php
similarity index 99%
rename from app/Http/Controllers/V1/Client/Protocols/Surge.php
rename to app/Protocols/Surge.php
index 89391a96..ed970852 100644
--- a/app/Http/Controllers/V1/Client/Protocols/Surge.php
+++ b/app/Protocols/Surge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 use App\Utils\Helper;
 
diff --git a/app/Http/Controllers/V1/Client/Protocols/V2rayN.php b/app/Protocols/V2rayN.php
similarity index 98%
rename from app/Http/Controllers/V1/Client/Protocols/V2rayN.php
rename to app/Protocols/V2rayN.php
index 9ef3b4c4..40345ae3 100644
--- a/app/Http/Controllers/V1/Client/Protocols/V2rayN.php
+++ b/app/Protocols/V2rayN.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 
 use App\Utils\Helper;
diff --git a/app/Http/Controllers/V1/Client/Protocols/V2rayNG.php b/app/Protocols/V2rayNG.php
similarity index 98%
rename from app/Http/Controllers/V1/Client/Protocols/V2rayNG.php
rename to app/Protocols/V2rayNG.php
index 5cdb2d8c..318ea44b 100644
--- a/app/Http/Controllers/V1/Client/Protocols/V2rayNG.php
+++ b/app/Protocols/V2rayNG.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Client\Protocols;
+namespace App\Protocols;
 
 
 class V2rayNG