From 2b17626ea7da603dbb731c5541c90c45409de1c5 Mon Sep 17 00:00:00 2001 From: sunsow Date: Mon, 27 Oct 2025 15:57:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AD=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=AD=A6=E5=BC=80=E6=BA=90=E8=BD=AF=E4=BB=B6=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/tool_config_system_source.py | 6 ++++++ tools/tool_install_ros.py | 22 +++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/tools/tool_config_system_source.py b/tools/tool_config_system_source.py index 82ed7e1..ac1bc5e 100644 --- a/tools/tool_config_system_source.py +++ b/tools/tool_config_system_source.py @@ -92,12 +92,14 @@ def get_source_by_system(self,system,codename,arch,failed_sources=[], return_all # 实际测试发现，阿里云虽然延时很低，但是带宽也低的离谱，一点都不用心，删掉了 ubuntu_amd64_sources = [ "https://mirrors.tuna.tsinghua.edu.cn/ubuntu", + "https://mirror.sysu.edu.cn/ubuntu/", # "https://mirrors.aliyun.com/ubuntu", # "https://mirrors.163.com/ubuntu", "https://mirrors.ustc.edu.cn/ubuntu", "https://archive.ubuntu.com/ubuntu", "https://mirrors.kernel.org/ubuntu", "http://mirrors.tuna.tsinghua.edu.cn/ubuntu", + "http://mirror.sysu.edu.cn/ubuntu/", # "http://mirrors.aliyun.com/ubuntu", # "http://mirrors.163.com/ubuntu", "http://mirrors.ustc.edu.cn/ubuntu", @@ -108,24 +110,28 @@ def get_source_by_system(self,system,codename,arch,failed_sources=[], return_all "https://ports.ubuntu.com/ubuntu-ports", # "https://mirrors.aliyun.com/ubuntu-ports", "https://mirrors.tuna.tsinghua.edu.cn/ubuntu-ports", + "https://mirror.sysu.edu.cn/ubuntu-ports/", "https://ports.ubuntu.com/ubuntu-ports", # "https://mirrors.aliyun.com/ubuntu-ports", "https://mirrors.tuna.tsinghua.edu.cn/ubuntu-ports", "http://ports.ubuntu.com/ubuntu-ports", # "https://mirrors.aliyun.com/ubuntu-ports", "http://mirrors.tuna.tsinghua.edu.cn/ubuntu-ports", + "http://mirror.sysu.edu.cn/ubuntu-ports/", "http://ports.ubuntu.com/ubuntu-ports", # "https://mirrors.aliyun.com/ubuntu-ports", "http://mirrors.tuna.tsinghua.edu.cn/ubuntu-ports", ] debian_amd64_sources = [ "https://mirrors.tuna.tsinghua.edu.cn/debian", + "https://mirror.sysu.edu.cn/debian/", "https://mirrors.aliyun.com/debian", # "https://mirrors.163.com/debian", "https://mirrors.ustc.edu.cn/debian", "https://deb.debian.org/debian", "https://mirrors.kernel.org/debian", "http://mirrors.tuna.tsinghua.edu.cn/debian", + "http://mirror.sysu.edu.cn/debian/", "http://mirrors.aliyun.com/debian", # "http://mirrors.163.com/debian", "http://mirrors.ustc.edu.cn/debian", diff --git a/tools/tool_install_ros.py b/tools/tool_install_ros.py index d3fefff..ba43c84 100644 --- a/tools/tool_install_ros.py +++ b/tools/tool_install_ros.py @@ -86,6 +86,7 @@ def get_desktop_version(name): ros_mirror_dic = { "tsinghua":{"ROS1":"http://mirrors.tuna.tsinghua.edu.cn/ros/ubuntu/","ROS2":"http://mirrors.tuna.tsinghua.edu.cn/ros2/ubuntu/"}, + "mirrorz":{"ROS1":"http://mirrors.cernet.edu.cn/ros/ubuntu/","ROS2":"http://mirrors.cernet.edu.cn/ros2/ubuntu"}, "ustc":{"ROS1":"https://mirrors.ustc.edu.cn/ros/ubuntu/","ROS2":"https://mirrors.ustc.edu.cn/ros2/ubuntu/"}, "huawei":{"ROS1":"https://repo.huaweicloud.com/ros/ubuntu/","ROS2":"https://repo.huaweicloud.com/ros2/ubuntu/"}, "packages.ros":{"ROS1":"http://packages.ros.org/ros/ubuntu/","ROS2":"http://packages.ros.org/ros2/ubuntu/"}, @@ -96,12 +97,12 @@ def get_desktop_version(name): ros_dist_dic = { 'artful':{"packages.ros"}, - 'bionic':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, + 'bionic':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"}, 'buster':{"packages.ros"}, 'cosmic':{"packages.ros"}, 'disco':{"packages.ros"}, 'eoan':{"packages.ros"}, - 'focal':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, + 'focal':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"}, 'jessie':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, 'lucid':{"packages.ros"}, 'maverick':{"packages.ros"}, @@ -117,7 +118,7 @@ def get_desktop_version(name): 'vivid':{"packages.ros"}, 'wheezy':{"packages.ros"}, 'wily':{"packages.ros"}, - 'xenial':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, + 'xenial':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"}, 'yakkety':{"packages.ros"}, 'zesty':{"packages.ros"}, } @@ -132,8 +133,8 @@ def get_desktop_version(name): 'eoan':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, 'focal':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, 'jessie':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, - 'jammy':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, - 'noble':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, + 'jammy':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"}, + 'noble':{"tsinghua","ustc","huawei","mirrorz","packages.ros","https.packages.ros"}, 'stretch':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, 'trusty':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, 'utopic':{"tsinghua","ustc","huawei","packages.ros","https.packages.ros"}, @@ -198,6 +199,11 @@ def select_mirror(self): if "huawei" in ros_dist_dic.get(codename, []) or "huawei" in ros2_dist_dic.get(codename, []): supported_mirrors.append("huawei") + # 添加 mirrorz 镜像源支持 + if codename in ros_dist_dic.keys() or codename in ros2_dist_dic.keys(): + if "mirrorz" in ros_dist_dic.get(codename, []) or "mirrorz" in ros2_dist_dic.get(codename, []): + supported_mirrors.append("mirrorz") + # 如果系统支持多个镜像源，则让用户选择 if len(supported_mirrors) > 1: mirror_dict = {} @@ -209,6 +215,8 @@ def select_mirror(self): mirror_dict[count] = "清华镜像源 (容易被封禁)" elif mirror == "huawei": mirror_dict[count] = "华为镜像源" + elif mirror == "mirrorz": + mirror_dict[count] = "中山大学开源软件镜像站 (试运行)" count += 1 mirror_dict[count] = "ROS官方源 (国外用户或需要最新版本时使用)" @@ -228,6 +236,10 @@ def select_mirror(self): return "tsinghua" elif "华为" in value: return "huawei" + elif "中山大" in value: + return "mirrorz" + + else: # 系统只支持默认的清华源 PrintUtils.print_info("您的系统默认使用清华镜像源")