diff --git a/src/Services/Subscribe/SS.php b/src/Services/Subscribe/SS.php index 7229da545..6aadc5e6d 100755 --- a/src/Services/Subscribe/SS.php +++ b/src/Services/Subscribe/SS.php @@ -26,7 +26,10 @@ final class SS extends Base $node_custom_config = json_decode($node_raw->custom_config, true); if ((int) $node_raw->sort === 0) { - $links .= base64_encode($user->method . ':' . $user->passwd . '@' . $node_raw->server . ':' . (int) $node_custom_config['offset_port_user']) . '#' . + + $port = (int) ($node_custom_config['offset_port_user'] ?? 0); + + $links .= base64_encode($user->method . ':' . $user->passwd . '@' . $node_raw->server . ':' . $port . '#' . $node_raw->name . PHP_EOL; } } diff --git a/src/Services/Subscribe/V2Ray.php b/src/Services/Subscribe/V2Ray.php index 673f1f391..11211eb4f 100755 --- a/src/Services/Subscribe/V2Ray.php +++ b/src/Services/Subscribe/V2Ray.php @@ -51,38 +51,11 @@ final class V2Ray extends Base $links .= 'vmess://' . base64_encode(json_encode($v2rayn_array)) . PHP_EOL; } else if ((int) $node_raw->sort === 0) { - // case 0: - // $node = [ - // 'protocol' => 'shadowsocks', - // 'settings' => [ - // 'address' => $node_raw->server, - // 'port' => (int) $user->port, - // 'method' => $user->method, - // 'password' => $user->passwd, - // ], - // 'tag' => $node_raw->name, - // ]; - // - // break; - - $ss_array = [ - // 'v' => '2', - 'ps' => $node_raw->name, - 'add' => $node_raw->server, - 'port' => (int) $node_custom_config['offset_port_user'], - 'encryption' => $user->method, - 'password' => $user->passwd, - - // 'id' => $user->uuid, - // 'aid' => 0, - // 'net' => $network, - // 'type' => $header_type, - // 'host' => $host, - // 'path' => $path, - // 'tls' => $security, - ]; - - $links .= 'shadowsocks://' . base64_encode(json_encode($ss_array)) . PHP_EOL; + + $port = (int) ($node_custom_config['offset_port_user'] ?? 0); + + $links .= 'ss://' . base64_encode($user->method . ':' . $user->passwd . '@' . $node_raw->server . ':' . $port) . '#' . + $node_raw->name . PHP_EOL; } }