关于java 添加腾讯云镜像，mvnd支持，以及测速链接的支持

src/framework/core.c

@@ -80,7 +80,7 @@ bool chsrc_in_no_color_mode(){return ProgMode.NoColorMode;}
 static bool in_measure_mode(){return ProgMode.MeasureMode;}
 static bool in_ipv6_mode(){return ProgMode.Ipv6Mode;}
 static bool in_dry_run_mode(){return ProgMode.DryRunMode;}
-
+static bool in_custom_user_agent_mode(){return false;}
 
 /**
  * Target Group mode (相反则称为 standalone mode)
@@ -603,20 +603,26 @@ measure_speed_for_url (void *url)
       ipv6 = "--ipv6";
     }
 
+  char *user_agent = NULL;
+  if (in_custom_user_agent_mode())
+    {
+      user_agent = strdup("maven/3.9.11");
+    }else{
+      user_agent = xy_2strjoin("chsrc/", Chsrc_Version);
+    }
   char *os_devnull = xy_os_devnull;
 
   /**
    * @note 我们用 —L，因为部分链接会跳转到其他地方，比如: RubyChina, npmmirror
    */
-  char *curl_cmd = xy_strjoin (8, "curl -qsL ", ipv6,
-                                  " -o ", os_devnull,
-                                  " -w \"%{http_code} %{speed_download}\" -m", time_sec,
-                                  " -A chsrc/" Chsrc_Version "  ", url);
+  char *curl_cmd = xy_strjoin (10, "curl -qsL ", ipv6,
+                                    " -o ", os_devnull,
+                                    " -w \"%{http_code} %{speed_download}\" -m", time_sec,
+                                    " -A ", user_agent, " ", url);
 
   // chsrc_info (xy_2strjoin ("测速命令 ", curl_cmd));
-
   char *curl_buf = xy_run (curl_cmd, 0);
-
+  free(user_agent);
   return curl_buf;
 }
 
@@ -1803,4 +1809,4 @@ chsrc_get_cpucore ()
 #endif
 
   return cores;
-}
+}

src/framework/mirror.c

@@ -260,6 +260,13 @@ Huawei =
   {NotSkip, NA, NA, "https://mirrors.huaweicloud.com/ubuntu-releases" Big_File_ubuntu, ROUGH}
 },
 
+HuaweiCdn =
+{
+  IS_GeneralMirrorSite,
+  "huaweiCdn",  "Huawei Cloud", "华为开源镜像站",  "https://repo.huaweicloud.com/",
+  {NotSkip, NA, NA, "https://repo.huaweicloud.com/ubuntu-releases" Big_File_ubuntu, ROUGH}
+},
+
 Volcengine =
 {
   IS_GeneralMirrorSite,
@@ -294,4 +301,4 @@ Sohu =
   IS_GeneralMirrorSite,
   "sohu", "SOHU", "搜狐开源镜像站", "https://mirrors.sohu.com/",
   {NotSkip, NA, NA, "https://mirrors.sohu.com/deepin-cd" Big_File_deepin, ROUGH}
-};
+};

src/recipe/lang/Java.c

@@ -25,35 +25,62 @@ pl_java_prelude ()
   chef_allow_user_define(this);
 
   def_sources_begin()
-  {&UpstreamProvider, "https://repo1.maven.org/maven2/",                   DelegateToUpstream},
-  {&Ali,              "https://maven.aliyun.com/repository/public/",       DelegateToMirror},
-  {&Huawei,           "https://mirrors.huaweicloud.com/repository/maven/", DelegateToMirror},
-
+  {&UpstreamProvider, "https://repo1.maven.org/maven2/",                                  DelegateToUpstream},
+  {&Ali,              "https://maven.aliyun.com/repository/public/",                      DelegateToMirror},
+  {&Huawei,           "https://mirrors.huaweicloud.com/repository/maven/",                "https://mirrors.huaweicloud.com/repository/maven/com/tencentcloudapi/tencentcloud-sdk-java/3.1.1033/tencentcloud-sdk-java-3.1.1033-javadoc.jar"},
+  {&HuaweiCdn,        "https://repo.huaweicloud.com/repository/maven/",                   "https://repo.huaweicloud.com/repository/maven/com/tencentcloudapi/tencentcloud-sdk-java/3.1.1033/tencentcloud-sdk-java-3.1.1033-javadoc.jar"},
+  {&Tencent,          "https://mirrors.cloud.tencent.com/nexus/repository/maven-public/", "https://mirrors.cloud.tencent.com/nexus/repository/maven-public/com/tencentcloudapi/tencentcloud-sdk-java/3.1.1033/tencentcloud-sdk-java-3.1.1033-javadoc.jar"},
   // 网易的24小时更新一次
-  {&Netease,          "http://mirrors.163.com/maven/repository/maven-public/", DelegateToMirror}
+  {&Netease,          "http://mirrors.163.com/maven/repository/maven-public/",            "https://mirrors.163.com/maven/repository/maven-public/com/tencentcloudapi/tencentcloud-sdk-java/3.1.1033/tencentcloud-sdk-java-3.1.1033-javadoc.jar"}
   def_sources_end()
 }
 
 
 void
-pl_java_check_cmd (bool *maven_exist, bool *gradle_exist)
+pl_java_check_cmd (bool *maven_exist, bool *gradle_exist, bool *maven_daemon_exist)
 {
   *maven_exist  = chsrc_check_program ("mvn");
   *gradle_exist = chsrc_check_program ("gradle");
+  *gradle_exist = chsrc_check_program ("mvnd");
 
-  if (! *maven_exist && ! *gradle_exist)
+  if (! *maven_exist && ! *gradle_exist && ! *maven_daemon_exist)
     {
-      chsrc_error ("maven 与 gradle 命令均未找到，请检查是否存在其一");
+      chsrc_error ("maven(maven-daemon) 与 gradle 命令均未找到，请检查是否存在其一");
       exit (Exit_UserCause);
     }
 }
 
+bool
+chef_is_home (const char *str)
+{
+  return (xy_str_start_with (str, "Maven home:"));
+}
+
+char*
+pl_java_find_maven_home (const char *source)
+{
+  if(chef_is_home(source))
+    {
+      char *maven_home = xy_str_delete_prefix (source, "Maven home: ");
+    }
+}
 
 char *
 pl_java_find_maven_config ()
 {
-  char *buf = xy_run ("mvn -v", 2);
-  char *maven_home = xy_str_delete_prefix (buf, "Maven home: ");
+  char *maven_home = xy_run_iter ("mvn -v", 0, pl_java_find_maven_home);
+  maven_home = xy_str_strip (maven_home);
+
+  char *maven_config = xy_normalize_path (xy_2strjoin (maven_home, "/conf/settings.xml"));
+  return maven_config;
+}
+
+
+char *
+pl_java_find_maven_daemon_config ()
+{
+  char *buf = xy_run_iter ("mvnd -v", 0, pl_java_find_maven_home);
+  char *maven_home = xy_str_delete_prefix (buf, "Maven daemon home: ");
   maven_home = xy_str_strip (maven_home);
 
   char *maven_config = xy_normalize_path (xy_2strjoin (maven_home, "/conf/settings.xml"));
@@ -64,10 +91,18 @@ pl_java_find_maven_config ()
 void
 pl_java_getsrc (char *option)
 {
-  bool maven_exist, gradle_exist;
-  pl_java_check_cmd (&maven_exist, &gradle_exist);
-  char *maven_config = pl_java_find_maven_config ();
-  chsrc_note2 (xy_2strjoin ("请查看 ", maven_config));
+  bool maven_exist, gradle_exist, maven_daemon_exist;
+  pl_java_check_cmd (&maven_exist, &gradle_exist, &maven_daemon_exist);
+  if (maven_exist)
+  {
+    char *maven_config = pl_java_find_maven_config ();
+    chsrc_note2 (xy_2strjoin ("请查看 ", maven_config));
+  }
+  if(maven_daemon_exist)
+  {
+    char *maven_config = pl_java_find_maven_daemon_config ();
+    chsrc_note2 (xy_2strjoin ("请查看 ", maven_config));
+  }
 }
 
 
@@ -77,8 +112,8 @@ pl_java_getsrc (char *option)
 void
 pl_java_setsrc (char *option)
 {
-  bool maven_exist, gradle_exist;
-  pl_java_check_cmd (&maven_exist, &gradle_exist);
+  bool maven_exist, gradle_exist, maven_daemon_exist;
+  pl_java_check_cmd (&maven_exist, &gradle_exist, &maven_daemon_exist);
 
   use_this_source(pl_java);
 
@@ -92,6 +127,16 @@ pl_java_setsrc (char *option)
       println (file);
     }
 
+  if (maven_daemon_exist)
+    {
+      char *file = xy_str_gsub (RAWSTR_pl_java_maven_config, "@1@", source.mirror->code);
+              file = xy_str_gsub (file, "@name@", source.mirror->name);
+              file = xy_str_gsub (file, "@url@", source.url);
+      char *maven_config = pl_java_find_maven_daemon_config ();
+      chsrc_note2 (xy_strjoin (3, "请在 maven 配置文件 ", maven_config, " 中添加:"));
+      println (file);
+    }
+
   if (gradle_exist)
     {
       if (maven_exist) br();
@@ -108,4 +153,4 @@ void
 pl_java_resetsrc (char *option)
 {
   pl_java_setsrc (option);
-}
+}

src/recipe/menu.c

@@ -132,4 +132,4 @@ chsrc_available_mirrors[] = {
 
   /* ------------------------ chsrc 内部实现 ------------------------ */
   /* 不要列出 &UpstreamProvider 和 &UserDefinedProvider */
-};
+};