Browse Source

Name change

兔姬桑 2 years ago
parent
commit
39c3a38590

+ 2 - 2
app/Http/Controllers/Admin/UserController.php

@@ -15,7 +15,7 @@ use App\Models\User;
 use App\Models\UserGroup;
 use App\Models\UserHourlyDataFlow;
 use App\Models\UserOauth;
-use App\Services\ProxyServer;
+use App\Services\ProxyService;
 use Arr;
 use Auth;
 use Exception;
@@ -292,7 +292,7 @@ class UserController extends Controller
 
     public function exportProxyConfig(Request $request, User $user): JsonResponse
     {
-        $proxyServer = ProxyServer::getInstance();
+        $proxyServer = ProxyService::getInstance();
         $proxyServer->setUser($user);
         $server = $proxyServer->getProxyConfig(Node::findOrFail($request->input('id')));
 

+ 4 - 4
app/Http/Controllers/Api/Client/ClientController.php

@@ -10,7 +10,7 @@ use App\Models\GoodsCategory;
 use App\Models\Level;
 use App\Models\ReferralLog;
 use App\Models\Ticket;
-use App\Services\ProxyServer;
+use App\Services\ProxyService;
 use App\Services\UserService;
 use Arr;
 use Artisan;
@@ -186,7 +186,7 @@ class ClientController extends Controller
     {
         $md5 = $request->get('md5', '');
 
-        $proxy = ProxyServer::getInstance()->getProxyCode('clash');
+        $proxy = ProxyService::getInstance()->getProxyCode('clash');
         if (strtolower(md5(json_encode($proxy))) === strtolower($md5)) {
             return $this->succeed(false);
         }
@@ -198,12 +198,12 @@ class ClientController extends Controller
     {
         $flag = strtolower($request->input('flag') ?? ($request->userAgent() ?? ''));
 
-        return ProxyServer::getInstance()->getProxyText($flag === 'v2rayng' ? 'v2rayng' : 'clash', $request->input('type'));
+        return ProxyService::getInstance()->getProxyText($flag === 'v2rayng' ? 'v2rayng' : 'clash', $request->input('type'));
     }
 
     public function getProxyList()
     {
-        $proxyServer = ProxyServer::getInstance();
+        $proxyServer = ProxyService::getInstance();
 
         $servers = [];
         foreach ($proxyServer->getNodeList(null, false) as $node) {

+ 3 - 3
app/Http/Controllers/User/SubscribeController.php

@@ -6,7 +6,7 @@ use App\Components\IP;
 use App\Http\Controllers\Controller;
 use App\Models\UserSubscribe;
 use App\Models\UserSubscribeLog;
-use App\Services\ProxyServer;
+use App\Services\ProxyService;
 use Illuminate\Http\Request;
 use Redirect;
 use Response;
@@ -25,7 +25,7 @@ class SubscribeController extends Controller
             return Redirect::route('login');
         }
         $code = $matches[0];
-        $this->proxyServer = ProxyServer::getInstance();
+        $this->proxyServer = ProxyService::getInstance();
         self::$subType = is_numeric($request->input('type')) ? $request->input('type') : null;
 
         // 检查订阅码是否有效
@@ -68,7 +68,7 @@ class SubscribeController extends Controller
         $subscribe->increment('times'); // 更新访问次数
         $this->subscribeLog($subscribe->id, IP::getClientIp(), json_encode(['Host' => $request->getHost(), 'User-Agent' => $request->userAgent()])); // 记录每次请求
 
-        return ProxyServer::getInstance()->getProxyText(strtolower($request->input('target') ?? ($request->userAgent() ?? '')), self::$subType);
+        return ProxyService::getInstance()->getProxyText(strtolower($request->input('target') ?? ($request->userAgent() ?? '')), self::$subType);
     }
 
     private function failed(string $text)

+ 2 - 2
app/Http/Controllers/UserController.php

@@ -16,7 +16,7 @@ use App\Models\User;
 use App\Notifications\TicketCreated;
 use App\Notifications\TicketReplied;
 use App\Services\CouponService;
-use App\Services\ProxyServer;
+use App\Services\ProxyService;
 use Cache;
 use DB;
 use Exception;
@@ -112,7 +112,7 @@ class UserController extends Controller
     {
         $user = auth()->user();
         if ($request->isMethod('POST')) {
-            $proxyServer = ProxyServer::getInstance();
+            $proxyServer = ProxyService::getInstance();
             $server = $proxyServer->getProxyConfig(Node::findOrFail($request->input('id')));
 
             return Response::json(['status' => 'success', 'data' => $proxyServer->getUserProxyConfig($server, $request->input('type') !== 'text'), 'title' => $server['type']]);

+ 1 - 1
app/Services/ProxyServer.php → app/Services/ProxyService.php

@@ -9,7 +9,7 @@ use App\Models\Node;
 use App\Models\User;
 use Arr;
 
-class ProxyServer extends BaseService
+class ProxyService extends BaseService
 {
     use ClientConfig;