refactor(proxy): 重构代理配置和使用

- 移除 SpringValues 中的冗余代理配置字段，仅保留一个 url 字段
- 将代理选择器的创建逻辑移至 ProxyUtils 类中
- 更新 HttpUtils 和 JgitUtil 类，使用新的代理选择器方法
- 修改测试配置，移除具体的代理主机和端口设置

Author: KingPrimes

src/main/java/com/nyx/bot/core/SpringValues.java

@@ -7,21 +7,8 @@
 @Component
 @Profile("dev")
 public class SpringValues {
-
-    /**
-     * 设置代理地址，如果未设置则用空值填入,默认为空，仅用于测试
-     */
-    @Value("${spring.sendgrid.proxy.host:}")
-    public String proxyHost;
-
-    /**
-     * 设置代理地址端口，如果未设置则用空值填入,默认为空，仅用于测试
-     */
-    @Value("${spring.sendgrid.proxy.port:}")
-    public String proxyPort;
-
-    @Value("${spring.sendgrid.proxy.proxy:}")
-    public String proxy;
+    @Value("${spring.sendgrid.proxy.url:}")
+    public String url;
 
 
 }

src/main/java/com/nyx/bot/utils/gitutils/JgitUtil.java

@@ -19,7 +19,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.*;
+import java.net.ProxySelector;
+import java.net.URISyntaxException;
 import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
@@ -49,34 +50,11 @@ public JgitUtil(String urlPath, String localPath, CredentialsProvider provider)
     }
 
     private static void configureGitProxy() {
-        ProxySelector defaultSelector = getProxySelector();
-
+        ProxySelector defaultSelector = ProxyUtils.getProxySelector();
         ProxySelector.setDefault(defaultSelector);
     }
 
     @NotNull
-    private static ProxySelector getProxySelector() {
-        Proxy effectiveProxy = ProxyUtils.getEffectiveProxyForUrl();
-
-        return new ProxySelector() {
-            @Override
-            public List<Proxy> select(URI uri) {
-                if (uri == null) return List.of(Proxy.NO_PROXY);
-
-                String host = uri.getHost();
-                if (ProxyUtils.shouldBypassProxy(host)) return List.of(Proxy.NO_PROXY);
-
-                return List.of(effectiveProxy != null ? effectiveProxy : Proxy.NO_PROXY);
-            }
-
-            @Override
-            public void connectFailed(URI uri, SocketAddress address, IOException ex) {
-                log.error("Proxy connection failed: {}", uri, ex);
-            }
-        };
-    }
-
-
 
 
     /**

src/main/java/com/nyx/bot/utils/http/HttpUtils.java

@@ -76,7 +76,7 @@ public void checkServerTrusted(X509Certificate[] chain, String authType, SSLEngi
 
             client = new OkHttpClient().newBuilder()
                     .addInterceptor(BrotliInterceptor.INSTANCE)
-                    .proxy(ProxyUtils.getEffectiveProxyForUrl())
+                    .proxySelector(ProxyUtils.getProxySelector())
                     //调用超时
                     .callTimeout(60, TimeUnit.SECONDS)
                     //链接超时

src/main/java/com/nyx/bot/utils/http/ProxyUtils.java

@@ -6,11 +6,11 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.URI;
+import java.net.*;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 @Slf4j
@@ -40,6 +40,26 @@ public static Proxy getEffectiveProxyForUrl() {
         return Proxy.NO_PROXY;
     }
 
+    public static ProxySelector getProxySelector() {
+        return new ProxySelector() {
+            @Override
+            public List<Proxy> select(URI uri) {
+                Proxy effectiveProxy = ProxyUtils.getEffectiveProxyForUrl();
+                if (uri == null) return List.of(Proxy.NO_PROXY);
+
+                String host = uri.getHost();
+                if (ProxyUtils.shouldBypassProxy(host)) return List.of(Proxy.NO_PROXY);
+
+                return List.of(effectiveProxy != null ? effectiveProxy : Proxy.NO_PROXY);
+            }
+
+            @Override
+            public void connectFailed(URI uri, SocketAddress address, IOException ex) {
+                log.error("Proxy connection failed: {}", uri, ex);
+            }
+        };
+    }
+
     private static Proxy parseStandardProxy(String proxyUrl) {
         if (proxyUrl == null || proxyUrl.isEmpty()) return null;
 
@@ -207,7 +227,7 @@ private static Proxy getMacOSSystemProxy() {
     private static Proxy fromSpringConfig() {
         try {
             var utils = SpringUtils.getBean(SpringValues.class);
-            String proxyUrl = utils.proxy;
+            String proxyUrl = utils.url;
             if (proxyUrl != null && !proxyUrl.isEmpty()) {
                 return parseStandardProxy(proxyUrl);
             }

src/test/java/com/nyx/bot/utils/TestGitHubUtils.java

@@ -2,17 +2,15 @@
 
 import com.nyx.bot.NyxBotApplication;
 import com.nyx.bot.utils.gitutils.GitHubUtil;
+import com.nyx.bot.utils.gitutils.JgitUtil;
 import com.nyx.bot.utils.http.HttpUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @Slf4j
-@SpringBootTest(classes = NyxBotApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, useMainMethod = SpringBootTest.UseMainMethod.NEVER,
-        properties = {
-                "spring.sendgrid.proxy.host=127.0.0.1",
-                "spring.sendgrid.proxy.port=7890"
-        })
+@SpringBootTest(classes = NyxBotApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, useMainMethod = SpringBootTest.UseMainMethod.NEVER)
 public class TestGitHubUtils {
 
     //测试下载最新的Jar文件
@@ -33,4 +31,9 @@ void testGitHubGetReleasesLatestVersion() {
         log.info("testGitHubGetReleasesLatestVersion:{}", GitHubUtil.getReleasesLatestVersion("KingPrimes", "NyxBot"));
     }
 
+    @Test
+    void testGitClone() throws GitAPIException {
+        JgitUtil.Build("https://github.com/KingPrimes/DataSource","./data111").gitClone();
+    }
+
 }

src/test/resources/logback-spring.xml

@@ -15,7 +15,7 @@
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${CONSOLE_LOG}</pattern>
-            <charset>${SYSTEM_ENCODING}</charset>
+           <!-- <charset>${SYSTEM_ENCODING}</charset>-->
         </encoder>
     </appender>