update: v2ray char to vmess

2025-11-01 01:41:47 +08:00 · 2023-02-15 14:53:13 +08:00
parent f062e57a81
commit 0cbb44cdea
30 changed files with 100 additions and 88 deletions
--- a/app/Http/Controllers/Admin/Server/GroupController.php
+++ b/app/Http/Controllers/Admin/Server/GroupController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin\Server;
 use App\Models\Plan;
 use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerGroup;
 use App\Models\User;
 use App\Services\ServerService;
@@ -65,7 +65,7 @@ class GroupController extends Controller
            }
        }

-        $servers = ServerV2ray::all();
+        $servers = ServerVmess::all();
        foreach ($servers as $server) {
            if (in_array($request->input('id'), $server->group_id)) {
                abort(500, '该组已被节点所使用，无法删除');
--- a/app/Http/Controllers/Admin/Server/ManageController.php
+++ b/app/Http/Controllers/Admin/Server/ManageController.php
@@ -2,7 +2,7 @@

 namespace App\Http\Controllers\Admin\Server;

-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
 use App\Services\ServerService;
@@ -32,8 +32,8 @@ class ManageController extends Controller
                        abort(500, '保存失败');
                    }
                    break;
-                case 'v2ray':
-                    if (!ServerV2ray::find($v['value'])->update(['sort' => $v['sort']])) {
+                case 'vmess':
+                    if (!ServerVmess::find($v['value'])->update(['sort' => $v['sort']])) {
                        DB::rollBack();
                        abort(500, '保存失败');
                    }
--- a/app/Http/Controllers/Admin/Server/VmessController.php
+++ b/app/Http/Controllers/Admin/Server/VmessController.php
@@ -2,21 +2,21 @@

 namespace App\Http\Controllers\Admin\Server;

-use App\Http\Requests\Admin\ServerV2raySave;
-use App\Http\Requests\Admin\ServerV2rayUpdate;
+use App\Http\Requests\Admin\ServerVmessSave;
+use App\Http\Requests\Admin\ServerVmessUpdate;
 use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;

-class V2rayController extends Controller
+class VmessController extends Controller
 {
-    public function save(ServerV2raySave $request)
+    public function save(ServerVmessSave $request)
    {
        $params = $request->validated();

        if ($request->input('id')) {
-            $server = ServerV2ray::find($request->input('id'));
+            $server = ServerVmess::find($request->input('id'));
            if (!$server) {
                abort(500, '服务器不存在');
            }
@@ -30,7 +30,7 @@ class V2rayController extends Controller
            ]);
        }

-        if (!ServerV2ray::create($params)) {
+        if (!ServerVmess::create($params)) {
            abort(500, '创建失败');
        }

@@ -42,7 +42,7 @@ class V2rayController extends Controller
    public function drop(Request $request)
    {
        if ($request->input('id')) {
-            $server = ServerV2ray::find($request->input('id'));
+            $server = ServerVmess::find($request->input('id'));
            if (!$server) {
                abort(500, '节点ID不存在');
            }
@@ -52,13 +52,13 @@ class V2rayController extends Controller
        ]);
    }

-    public function update(ServerV2rayUpdate $request)
+    public function update(ServerVmessUpdate $request)
    {
        $params = $request->only([
            'show',
        ]);

-        $server = ServerV2ray::find($request->input('id'));
+        $server = ServerVmess::find($request->input('id'));

        if (!$server) {
            abort(500, '该服务器不存在');
@@ -76,12 +76,12 @@ class V2rayController extends Controller

    public function copy(Request $request)
    {
-        $server = ServerV2ray::find($request->input('id'));
+        $server = ServerVmess::find($request->input('id'));
        $server->show = 0;
        if (!$server) {
            abort(500, '服务器不存在');
        }
-        if (!ServerV2ray::create($server->toArray())) {
+        if (!ServerVmess::create($server->toArray())) {
            abort(500, '复制失败');
        }

--- a/app/Http/Controllers/Admin/StatController.php
+++ b/app/Http/Controllers/Admin/StatController.php
@@ -10,7 +10,7 @@ use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerGroup;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\Plan;
 use App\Models\User;
 use App\Models\Ticket;
@@ -99,8 +99,9 @@ class StatController extends Controller
    {
        $servers = [
            'shadowsocks' => ServerShadowsocks::where('parent_id', null)->get()->toArray(),
-            'v2ray' => ServerV2ray::where('parent_id', null)->get()->toArray(),
-            'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray()
+            'v2ray' => ServerVmess::where('parent_id', null)->get()->toArray(),
+            'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray(),
+            'vmess' => ServerVmess::where('parent_id', null)->get()->toArray()
        ];
        $startAt = strtotime('-1 day', strtotime(date('Y-m-d')));
        $endAt = strtotime(date('Y-m-d'));
--- a/app/Http/Controllers/Admin/SystemController.php
+++ b/app/Http/Controllers/Admin/SystemController.php
@@ -9,7 +9,7 @@ use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerGroup;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\Plan;
 use App\Models\User;
 use App\Models\Ticket;
--- a/app/Http/Controllers/Client/AppController.php
+++ b/app/Http/Controllers/Client/AppController.php
@@ -42,7 +42,7 @@ class AppController extends Controller
                array_push($proxy, Protocols\Clash::buildShadowsocks($user['uuid'], $item));
                array_push($proxies, $item['name']);
            }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                array_push($proxy, Protocols\Clash::buildVmess($user['uuid'], $item));
                array_push($proxies, $item['name']);
            }
--- a/app/Http/Controllers/Client/Protocols/Clash.php
+++ b/app/Http/Controllers/Client/Protocols/Clash.php
@@ -49,7 +49,7 @@ class Clash
                array_push($proxy, self::buildShadowsocks($user['uuid'], $item));
                array_push($proxies, $item['name']);
            }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                array_push($proxy, self::buildVmess($user['uuid'], $item));
                array_push($proxies, $item['name']);
            }
--- a/app/Http/Controllers/Client/Protocols/ClashMeta.php
+++ b/app/Http/Controllers/Client/Protocols/ClashMeta.php
@@ -40,7 +40,7 @@ class ClashMeta
                array_push($proxy, self::buildShadowsocks($user['uuid'], $item));
                array_push($proxies, $item['name']);
            }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                array_push($proxy, self::buildVmess($user['uuid'], $item));
                array_push($proxies, $item['name']);
            }
--- a/app/Http/Controllers/Client/Protocols/Passwall.php
+++ b/app/Http/Controllers/Client/Protocols/Passwall.php
@@ -22,7 +22,7 @@ class Passwall
        $uri = '';

        foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                $uri .= self::buildVmess($user['uuid'], $item);
            }
            if ($item['type'] === 'shadowsocks') {
--- a/app/Http/Controllers/Client/Protocols/QuantumultX.php
+++ b/app/Http/Controllers/Client/Protocols/QuantumultX.php
@@ -25,7 +25,7 @@ class QuantumultX
            if ($item['type'] === 'shadowsocks') {
                $uri .= self::buildShadowsocks($user['uuid'], $item);
            }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                $uri .= self::buildVmess($user['uuid'], $item);
            }
            if ($item['type'] === 'trojan') {
--- a/app/Http/Controllers/Client/Protocols/SSRPlus.php
+++ b/app/Http/Controllers/Client/Protocols/SSRPlus.php
@@ -22,7 +22,7 @@ class SSRPlus
        $uri = '';

        foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                $uri .= self::buildVmess($user['uuid'], $item);
            }
            if ($item['type'] === 'shadowsocks') {
--- a/app/Http/Controllers/Client/Protocols/SagerNet.php
+++ b/app/Http/Controllers/Client/Protocols/SagerNet.php
@@ -21,7 +21,7 @@ class SagerNet
        $uri = '';

        foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                $uri .= self::buildVmess($user['uuid'], $item);
            }
            if ($item['type'] === 'shadowsocks') {
--- a/app/Http/Controllers/Client/Protocols/Shadowrocket.php
+++ b/app/Http/Controllers/Client/Protocols/Shadowrocket.php
@@ -32,7 +32,7 @@ class Shadowrocket
            if ($item['type'] === 'shadowsocks') {
                $uri .= self::buildShadowsocks($user['uuid'], $item);
            }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                $uri .= self::buildVmess($user['uuid'], $item);
            }
            if ($item['type'] === 'trojan') {
--- a/app/Http/Controllers/Client/Protocols/Stash.php
+++ b/app/Http/Controllers/Client/Protocols/Stash.php
@@ -47,7 +47,7 @@ class Stash
                array_push($proxy, self::buildShadowsocks($user['uuid'], $item));
                array_push($proxies, $item['name']);
            }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                array_push($proxy, self::buildVmess($user['uuid'], $item));
                array_push($proxies, $item['name']);
            }
--- a/app/Http/Controllers/Client/Protocols/Surfboard.php
+++ b/app/Http/Controllers/Client/Protocols/Surfboard.php
@@ -41,7 +41,7 @@ class Surfboard
                // [Proxy Group]
                $proxyGroup .= $item['name'] . ', ';
            }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                // [Proxy]
                $proxies .= self::buildVmess($user['uuid'], $item);
                // [Proxy Group]
--- a/app/Http/Controllers/Client/Protocols/Surge.php
+++ b/app/Http/Controllers/Client/Protocols/Surge.php
@@ -41,7 +41,7 @@ class Surge
                // [Proxy Group]
                $proxyGroup .= $item['name'] . ', ';
            }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                // [Proxy]
                $proxies .= self::buildVmess($user['uuid'], $item);
                // [Proxy Group]
--- a/app/Http/Controllers/Client/Protocols/V2rayN.php
+++ b/app/Http/Controllers/Client/Protocols/V2rayN.php
@@ -24,7 +24,7 @@ class V2rayN
        $uri = '';

        foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                $uri .= self::buildVmess($user['uuid'], $item);
            }
            if ($item['type'] === 'shadowsocks') {
--- a/app/Http/Controllers/Client/Protocols/V2rayNG.php
+++ b/app/Http/Controllers/Client/Protocols/V2rayNG.php
@@ -22,7 +22,7 @@ class V2rayNG
        $uri = '';

        foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                $uri .= self::buildVmess($user['uuid'], $item);
            }
            if ($item['type'] === 'shadowsocks') {
--- a/app/Http/Controllers/Server/DeepbworkController.php
+++ b/app/Http/Controllers/Server/DeepbworkController.php
@@ -8,7 +8,7 @@ use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerLog;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -37,11 +37,11 @@ class DeepbworkController extends Controller
    {
        ini_set('memory_limit', -1);
        $nodeId = $request->input('node_id');
-        $server = ServerV2ray::find($nodeId);
+        $server = ServerVmess::find($nodeId);
        if (!$server) {
            abort(500, 'fail');
        }
-        Cache::put(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server->id), time(), 3600);
+        Cache::put(CacheKey::get('SERVER_VMESS_LAST_CHECK_AT', $server->id), time(), 3600);
        $serverService = new ServerService();
        $users = $serverService->getAvailableUsers($server->group_id);
        $result = [];
@@ -69,7 +69,7 @@ class DeepbworkController extends Controller
    public function submit(Request $request)
    {
 //         Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
-        $server = ServerV2ray::find($request->input('node_id'));
+        $server = ServerVmess::find($request->input('node_id'));
        if (!$server) {
            return response([
                'ret' => 0,
@@ -78,13 +78,13 @@ class DeepbworkController extends Controller
        }
        $data = file_get_contents('php://input');
        $data = json_decode($data, true);
-        Cache::put(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server->id), count($data), 3600);
-        Cache::put(CacheKey::get('SERVER_V2RAY_LAST_PUSH_AT', $server->id), time(), 3600);
+        Cache::put(CacheKey::get('SERVER_VMESS_ONLINE_USER', $server->id), count($data), 3600);
+        Cache::put(CacheKey::get('SERVER_VMESS_LAST_PUSH_AT', $server->id), time(), 3600);
        $userService = new UserService();
        foreach ($data as $item) {
            $u = $item['u'];
            $d = $item['d'];
-            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'v2ray');
+            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'vmess');
        }

        return response([
@@ -112,7 +112,7 @@ class DeepbworkController extends Controller

    private function getV2RayConfig(int $nodeId, int $localPort)
    {
-        $server = ServerV2ray::find($nodeId);
+        $server = ServerVmess::find($nodeId);
        if (!$server) {
            abort(500, '节点不存在');
        }
@@ -129,7 +129,7 @@ class DeepbworkController extends Controller
        return $json;
    }

-    private function setDns(ServerV2ray $server, object $json)
+    private function setDns(ServerVmess $server, object $json)
    {
        if ($server->dnsSettings) {
            $dns = $server->dnsSettings;
@@ -142,7 +142,7 @@ class DeepbworkController extends Controller
        }
    }

-    private function setNetwork(ServerV2ray $server, object $json)
+    private function setNetwork(ServerVmess $server, object $json)
    {
        if ($server->networkSettings) {
            switch ($server->network) {
@@ -171,7 +171,7 @@ class DeepbworkController extends Controller
        }
    }

-    private function setRule(ServerV2ray $server, object $json)
+    private function setRule(ServerVmess $server, object $json)
    {
        $domainRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_domain')));
        $protocolRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_protocol')));
@@ -211,7 +211,7 @@ class DeepbworkController extends Controller
        }
    }

-    private function setTls(ServerV2ray $server, object $json)
+    private function setTls(ServerVMess $server, object $json)
    {
        if ((int)$server->tls) {
            $tlsSettings = $server->tlsSettings;
--- a/app/Http/Controllers/Server/UniProxyController.php
+++ b/app/Http/Controllers/Server/UniProxyController.php
@@ -9,7 +9,7 @@ use App\Utils\Helper;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerShadowsocks;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerTrojan;
 use Illuminate\Support\Facades\Cache;

@@ -30,6 +30,7 @@ class UniProxyController extends Controller
            abort(500, 'token is error');
        }
        $this->nodeType = $request->input('node_type');
+        if ($this->nodeType === 'v2ray') $this->nodeType = 'vmess';
        $this->nodeId = $request->input('node_id');
        $this->serverService = new ServerService();
        $this->nodeInfo = $this->serverService->getServer($this->nodeId, $this->nodeType);
@@ -92,7 +93,7 @@ class UniProxyController extends Controller
                    $response['server_key'] = Helper::getShadowsocksServerKey($this->nodeInfo->created_at, 32);
                }
                break;
-            case 'v2ray':
+            case 'vmess':
                $response = [
                    'server_port' => $this->nodeInfo->server_port,
                    'network' => $this->nodeInfo->network,
--- a/app/Http/Controllers/User/ServerController.php
+++ b/app/Http/Controllers/User/ServerController.php
@@ -8,7 +8,7 @@ use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerLog;
 use App\Models\User;