diff --git a/core/scripts/hysteria2/show_user_uri.py b/core/scripts/hysteria2/show_user_uri.py index 5981369..f361bf6 100644 --- a/core/scripts/hysteria2/show_user_uri.py +++ b/core/scripts/hysteria2/show_user_uri.py @@ -160,13 +160,13 @@ def show_uri(args: argparse.Namespace) -> None: if args.all or args.ip_version == 4: if ip4 and ip4 != "None": uri = generate_uri(args.username, auth_password, ip4, local_port, - local_obfs_password, local_sha256, local_sni, 4, local_insecure, f"{args.username}-IPv4") + local_obfs_password, local_sha256, local_sni, 4, local_insecure, "IPv4") display_uri_and_qr(uri, "IPv4", args, terminal_width) if args.all or args.ip_version == 6: if ip6 and ip6 != "None": uri = generate_uri(args.username, auth_password, ip6, local_port, - local_obfs_password, local_sha256, local_sni, 6, local_insecure, f"{args.username}-IPv6") + local_obfs_password, local_sha256, local_sni, 6, local_insecure, "IPv6") display_uri_and_qr(uri, "IPv6", args, terminal_width) for node in nodes: @@ -194,14 +194,14 @@ def show_uri(args: argparse.Namespace) -> None: sni=node_sni, ip_version=ip_v, insecure=node_insecure, - fragment_tag=f"{args.username}-{node_name}" + fragment_tag=node_name ) display_uri_and_qr(uri, f"Node: {node_name} (IPv{ip_v})", args, terminal_width) if args.singbox and is_service_active("hysteria-singbox.service"): domain, port = get_singbox_domain_and_port() if domain and port: - print(f"\nSingbox Sublink:\nhttps://{domain}:{port}/sub/singbox/{args.username}/{args.ip_version}#{args.username}\n") + print(f"\nSingbox Sublink:\nhttps://{domain}:{port}/sub/singbox/{args.username}/{args.ip_version}#Hysteria2\n") if args.normalsub and is_service_active("hysteria-normal-sub.service"): domain, port, subpath = get_normalsub_domain_and_port() diff --git a/core/scripts/hysteria2/wrapper_uri.py b/core/scripts/hysteria2/wrapper_uri.py index d0246d3..0c5c65a 100644 --- a/core/scripts/hysteria2/wrapper_uri.py +++ b/core/scripts/hysteria2/wrapper_uri.py @@ -87,9 +87,9 @@ def process_users(target_usernames: List[str]) -> List[Dict[str, Any]]: user_output = {"username": username, "ipv4": None, "ipv6": None, "nodes": [], "normal_sub": None} if ip4 and ip4 != "None": - user_output["ipv4"] = generate_uri(username, auth_password, ip4, default_port, base_uri_params, 4, f"{username}-IPv4") + user_output["ipv4"] = generate_uri(username, auth_password, ip4, default_port, base_uri_params, 4, "IPv4") if ip6 and ip6 != "None": - user_output["ipv6"] = generate_uri(username, auth_password, ip6, default_port, base_uri_params, 6, f"{username}-IPv6") + user_output["ipv6"] = generate_uri(username, auth_password, ip6, default_port, base_uri_params, 6, "IPv6") for node in nodes: node_name = node.get("name") @@ -98,7 +98,7 @@ def process_users(target_usernames: List[str]) -> List[Dict[str, Any]]: continue ip_v = 6 if ':' in node_ip else 4 - tag = f"{username}-{node_name}" + tag = node_name node_port = str(node.get("port", default_port)) node_sni = node.get("sni", default_sni) @@ -117,7 +117,7 @@ def process_users(target_usernames: List[str]) -> List[Dict[str, Any]]: user_output["nodes"].append({"name": node_name, "uri": uri}) if ns_domain and ns_port and ns_subpath: - user_output["normal_sub"] = f"https://{ns_domain}:{ns_port}/{ns_subpath}/{auth_password}#{username}" + user_output["normal_sub"] = f"https://{ns_domain}:{ns_port}/{ns_subpath}/{auth_password}#Hysteria2" results.append(user_output)