1
0
Эх сурвалжийг харах

修复 V2RayN 订阅 headerType 未定义的问题以及两处增强判断

GeekQu 5 жил өмнө
parent
commit
105337a9ce

+ 1 - 0
src/Controllers/LinkController.php

@@ -603,6 +603,7 @@ class LinkController extends BaseController
             'id'              => $user->getUuid(),
             'aid'             => 0,
             'net'             => 'tcp',
+            'headerType'      => 'none',
             'protocol'        => 'origin',
             'protocol_param'  => '',
             'obfs'            => 'plain',

+ 10 - 9
src/Controllers/Mod_Mu/UserController.php

@@ -15,18 +15,19 @@ use App\Utils\Tools;
 
 class UserController extends BaseController
 {
-    // User List
+    /**
+     * User List
+     * 
+     * @param \Slim\Http\Request    $request
+     * @param \Slim\Http\Response   $response
+     * @param array                 $args
+     *
+     * @return \Slim\Http\Response
+     */
     public function index($request, $response, $args)
     {
-        $params = $request->getQueryParams();
-
-        if (isset($params['node_id'])) {
-            $node_id = $params['node_id'];
-        }else {
-            $node_id = '0';
-        }
+        $node_id = $request->getQueryParam('node_id', '0');
 
-        $node = new Node();
         if ($node_id == '0') {
             $node = Node::where('node_ip', $_SERVER['REMOTE_ADDR'])->first();
             $node_id = $node->id;

+ 12 - 11
src/Utils/Tools.php

@@ -639,7 +639,6 @@ class Tools
             }
         }
 
-
         return [
             'name' => ($_ENV['disable_sub_mu_port'] ? $node_name : $node_name . ' - ' . $node_port . ' 单端口'),
             'address' => $node_server[0],
@@ -652,19 +651,21 @@ class Tools
         $type = 0; //偏移
         $port = []; //指定
         $node_server = explode(';', $server);
-        if (strpos($node_server[1], 'port') !== false) {
-            $item = URL::parse_args($node_server[1]);
-            if (strpos($item['port'], '#') !== false) {
-                if (strpos($item['port'], '+') !== false) {
-                    $args_explode = explode('+', $item['port']);
-                    foreach ($args_explode as $arg) {
-                        $port[substr($arg, 0, strpos($arg, '#'))] = (int) substr($arg, strpos($arg, '#') + 1);
+        if (isset($node_server[1])) {
+            if (strpos($node_server[1], 'port') !== false) {
+                $item = URL::parse_args($node_server[1]);
+                if (strpos($item['port'], '#') !== false) {
+                    if (strpos($item['port'], '+') !== false) {
+                        $args_explode = explode('+', $item['port']);
+                        foreach ($args_explode as $arg) {
+                            $port[substr($arg, 0, strpos($arg, '#'))] = (int) substr($arg, strpos($arg, '#') + 1);
+                        }
+                    } else {
+                        $port[substr($item['port'], 0, strpos($item['port'], '#'))] = (int) substr($item['port'], strpos($item['port'], '#') + 1);
                     }
                 } else {
-                    $port[substr($item['port'], 0, strpos($item['port'], '#'))] = (int) substr($item['port'], strpos($item['port'], '#') + 1);
+                    $type = (int) $item['port'];
                 }
-            } else {
-                $type = (int) $item['port'];
             }
         }