alroyso 9 月之前
父节点
当前提交
dd10546537

+ 0 - 1
.idea/dataSources.local.xml

@@ -5,7 +5,6 @@
       <database-info product="MySQL" version="5.7.43-log" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-j-8.2.0 (Revision: 06a1f724497fd81c6a659131fda822c9e5085b6c)" dbms="MYSQL" exact-version="5.7.43" exact-driver-version="8.2">
         <extra-name-characters>#@</extra-name-characters>
         <identifier-quote-string>`</identifier-quote-string>
-        <jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
       </database-info>
       <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
       <secret-storage>master_key</secret-storage>

+ 5 - 0
app/Components/Client/Text.php

@@ -18,6 +18,11 @@ class Text
     {
         return '服务器:'.$server['host'].PHP_EOL.'端口:'.$server['port'].PHP_EOL.'加密方式:'.$server['method'].PHP_EOL.'用户ID:'.$server['uuid'].PHP_EOL.'额外ID:'.$server['v2_alter_id'].PHP_EOL.'传输协议:'.$server['v2_net'].PHP_EOL.'伪装类型:'.$server['v2_type'].PHP_EOL.'伪装域名:'.$server['v2_host'].PHP_EOL.'路径:'.$server['v2_path'].PHP_EOL.'TLS:'.$server['v2_tls'].PHP_EOL.'sni'.$server['v2_sni'].PHP_EOL.'UDP:'.$server['udp'].PHP_EOL;
     }
+
+    public static function buildVless($server)
+    {
+        return '服务器:'.$server['host'].PHP_EOL.'端口:'.$server['port'].PHP_EOL.'加密方式:'.$server['method'].PHP_EOL.'用户ID:'.$server['uuid'].PHP_EOL.'额外ID:'.$server['v2_alter_id'].PHP_EOL.'传输协议:'.$server['v2_net'].PHP_EOL.'伪装类型:'.$server['v2_type'].PHP_EOL.'伪装域名:'.$server['v2_host'].PHP_EOL.'路径:'.$server['v2_path'].PHP_EOL.'TLS:'.$server['v2_tls'].PHP_EOL.'sni'.$server['v2_sni'].PHP_EOL.'UDP:'.$server['udp'].PHP_EOL;
+    }
     public static function buildTrojan($server)
     {
         return '服务器:'.$server['host'].PHP_EOL.'端口:'.$server['port'].PHP_EOL.'密码:'.$server['passwd'].PHP_EOL.'SNI:'.$server['sni'].PHP_EOL.'UDP:'.$server['udp'].PHP_EOL;

+ 15 - 2
app/Components/Client/URLSchemes.php

@@ -71,14 +71,27 @@ class URLSchemes
             'host' => $server['v2_host'],
             'path' => $server['v2_path'],
             'tls' => $server['v2_tls'],
-            'sni' =>  $server['v2_sni'],
+            'sni' => $server['v2_sni'],
             'flow' => 'xtls-rprx-vision',
             'security' => 'reality',
             'fp' => 'chrome',
             'pbk' => 'qhTzYYIgBzDLNYR79oxftqdo1kzL-1_hGJKfqrOliCY',
             'headerType' => 'none',
         ];
-      return "vless://{$server['uuid']}@{$server['host']}:{$server['port']}?encryption=none&flow=xtls-rprx-vision&security=reality&sni={$server['v2_sni']}&fp=chrome&pbk=qhTzYYIgBzDLNYR79oxftqdo1kzL-1_hGJKfqrOliCY&type=tcp&headerType=none#{$server['name']}".PHP_EOL;
+
+// 使用数组来生成 URL
+        $url = "vless://{$config['id']}@{$config['add']}:{$config['port']}?"
+            . "encryption=none"
+            . "&flow={$config['flow']}"
+            . "&security={$config['security']}"
+            . "&sni={$config['sni']}"
+            . "&fp={$config['fp']}"
+            . "&pbk={$config['pbk']}"
+            . "&type={$config['type']}"
+            . "&headerType={$config['headerType']}"
+            . "#{$config['ps']}".PHP_EOL;
+
+        return $url;
        // return 'vless://'.base64_encode(json_encode($config)).PHP_EOL;
     }
 

+ 6 - 1
app/Http/Controllers/Controller.php

@@ -115,7 +115,12 @@ class Controller extends BaseController
                 $data = $is_url ? URLSchemes::buildShadowsocksr($server) : Text::buildShadowsocksr($server);
                 break;
             case 'v2ray':
-                $data = $is_url ? URLSchemes::buildVmess($server) : Text::buildVmess($server);
+                if ($server['vless'] == 1){
+                    $data = URLSchemes::buildVless($server);
+                } else {
+                    $data = $is_url ? URLSchemes::buildVmess($server) : Text::buildVmess($server);
+                }
+
                 break;
             case 'trojan':
                 $data = $is_url ? URLSchemes::buildTrojan($server) : Text::buildTrojan($server);

+ 1 - 1
app/Models/Node.php

@@ -323,7 +323,7 @@ class Node extends Model
                 $type_label = 'ShadowsocksR';
                 break;
             case 2:
-                $type_label = 'V2Ray';
+                $this->vless === 1 ? 'vless' : 'V2Ray';
                 break;
             case 3:
                 $type_label = 'Trojan';