diff --git a/pom.xml b/pom.xml
index 01ca524..ebbacba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,15 +57,6 @@
2.0.1
-
-
-
-
- org.bidib.com.github.markusbernhardt
- proxy-vole
- 1.1.5
-
-
diff --git a/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java b/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java
index 90a3269..94cf291 100644
--- a/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java
+++ b/src/main/java/cn/octopusyan/alistgui/manager/ConfigManager.java
@@ -132,10 +132,13 @@ public class ConfigManager {
public static void proxySetup(ProxySetup setup) {
guiConfig.setProxySetup(setup.getName());
- if (ProxySetup.NO_PROXY.equals(setup)) {
- HttpUtil.getInstance().clearProxy();
- } else if (hasProxy()) {
- HttpUtil.getInstance().proxy(setup, ConfigManager.getProxyInfo());
+ switch (setup) {
+ case NO_PROXY -> HttpUtil.getInstance().clearProxy();
+ case SYSTEM, MANUAL -> {
+ if (ProxySetup.MANUAL.equals(setup) && !hasProxy())
+ return;
+ HttpUtil.getInstance().proxy(setup, ConfigManager.getProxyInfo());
+ }
}
}
diff --git a/src/main/java/cn/octopusyan/alistgui/manager/http/HttpConfig.java b/src/main/java/cn/octopusyan/alistgui/manager/http/HttpConfig.java
index 31bc4e4..f460239 100644
--- a/src/main/java/cn/octopusyan/alistgui/manager/http/HttpConfig.java
+++ b/src/main/java/cn/octopusyan/alistgui/manager/http/HttpConfig.java
@@ -27,6 +27,10 @@ import java.util.concurrent.Executor;
@Data
public class HttpConfig {
private static final Logger logger = LoggerFactory.getLogger(HttpConfig.class);
+ static {
+ // 使用系统默认代理
+ System.setProperty("java.net.useSystemProxies", "true");
+ }
/**
* http版本
*/
@@ -86,12 +90,12 @@ public class HttpConfig {
}
@Override
- public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+ public void checkClientTrusted(X509Certificate[] arg0, String arg1) {
// TODO Auto-generated method stub
}
@Override
- public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+ public void checkServerTrusted(X509Certificate[] arg0, String arg1) {
// TODO Auto-generated method stub
}
}};
diff --git a/src/main/java/cn/octopusyan/alistgui/manager/http/HttpUtil.java b/src/main/java/cn/octopusyan/alistgui/manager/http/HttpUtil.java
index 215c067..d98c28a 100644
--- a/src/main/java/cn/octopusyan/alistgui/manager/http/HttpUtil.java
+++ b/src/main/java/cn/octopusyan/alistgui/manager/http/HttpUtil.java
@@ -4,8 +4,8 @@ import cn.octopusyan.alistgui.enums.ProxySetup;
import cn.octopusyan.alistgui.model.ProxyInfo;
import cn.octopusyan.alistgui.util.JsonUtil;
import com.fasterxml.jackson.databind.JsonNode;
-import com.github.markusbernhardt.proxy.ProxySearch;
-import com.github.markusbernhardt.proxy.selector.misc.BufferedProxySelector;
+//import com.github.markusbernhardt.proxy.ProxySearch;
+//import com.github.markusbernhardt.proxy.selector.misc.BufferedProxySelector;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -29,19 +29,6 @@ public class HttpUtil {
private volatile static HttpUtil util;
private volatile HttpClient httpClient;
private final HttpConfig httpConfig;
- public static final ProxySearch proxySearch = ProxySearch.getDefaultProxySearch();
-
- static {
- proxySearch.addStrategy(ProxySearch.Strategy.WIN);
- proxySearch.addStrategy(ProxySearch.Strategy.OS_DEFAULT);
- proxySearch.addStrategy(ProxySearch.Strategy.IE);
- proxySearch.addStrategy(ProxySearch.Strategy.FIREFOX);
- proxySearch.addStrategy(ProxySearch.Strategy.JAVA);
- // PAC 代理查询
- proxySearch.setPacCacheSettings(20, 1000 * 60 * 10, BufferedProxySelector.CacheScope.CACHE_SCOPE_HOST);
- // 设置系统默认代理
- ProxySelector.setDefault(proxySearch.getProxySelector());
- }
private HttpUtil(HttpConfig httpConfig) {
this.httpConfig = httpConfig;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 29e5401..d37406d 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -15,7 +15,6 @@ module cn.octopusyan.alistgui {
requires com.fasterxml.jackson.databind;
requires com.fasterxml.jackson.dataformat.yaml;
requires atlantafx.base;
- requires proxy.vole;
exports cn.octopusyan.alistgui;
opens cn.octopusyan.alistgui to javafx.fxml;