diff --git a/pom.xml b/pom.xml
index fcf7f14..8494181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
${jackson.version}
-
+
org.kordamp.ikonli
ikonli-javafx
@@ -133,11 +133,6 @@
ikonli-fontawesome-pack
${ikonli.version}
-
- org.kordamp.ikonli
- ikonli-coreui-pack
- ${ikonli.version}
-
com.gluonhq
emoji
@@ -173,6 +168,7 @@
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -192,6 +188,15 @@
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.3.1
+
+ --enable-preview
+
+
+
org.apache.maven.plugins
maven-resources-plugin
@@ -247,8 +252,11 @@
default-cli
- cn.octopusyan.alistgui/cn.octopusyan.alistgui.AppLauncher
launcher
+ cn.octopusyan.alistgui/cn.octopusyan.alistgui.AppLauncher
+
+
+
app
app
true
diff --git a/src/main/java/cn/octopusyan/alistgui/Application.java b/src/main/java/cn/octopusyan/alistgui/Application.java
index 53a0394..042aae8 100644
--- a/src/main/java/cn/octopusyan/alistgui/Application.java
+++ b/src/main/java/cn/octopusyan/alistgui/Application.java
@@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.ProxySelector;
+import java.net.http.HttpClient;
import java.util.Objects;
public class Application extends javafx.application.Application {
@@ -36,18 +37,17 @@ public class Application extends javafx.application.Application {
// http请求工具初始化
HttpConfig httpConfig = new HttpConfig();
// 加载代理设置
- if (!ProxySetup.NO_PROXY.equals(ConfigManager.proxySetup())) {
- // 系统代理
- if (ProxySetup.SYSTEM.equals(ConfigManager.proxySetup())) {
- httpConfig.setProxySelector(ProxySelector.getDefault());
- }
- // 自定义代理
- if (ProxySetup.MANUAL.equals(ConfigManager.proxySetup()) && ConfigManager.hasProxy()) {
- InetSocketAddress unresolved = InetSocketAddress.createUnresolved(
- Objects.requireNonNull(ConfigManager.proxyHost()),
- ConfigManager.getProxyPort()
- );
- httpConfig.setProxySelector(ProxySelector.of(unresolved));
+ switch (ConfigManager.proxySetup()) {
+ case NO_PROXY -> httpConfig.setProxySelector(HttpClient.Builder.NO_PROXY);
+ case SYSTEM -> httpConfig.setProxySelector(ProxySelector.getDefault());
+ case MANUAL -> {
+ if(ConfigManager.hasProxy()) {
+ InetSocketAddress unresolved = InetSocketAddress.createUnresolved(
+ Objects.requireNonNull(ConfigManager.proxyHost()),
+ ConfigManager.getProxyPort()
+ );
+ httpConfig.setProxySelector(ProxySelector.of(unresolved));
+ }
}
}
httpConfig.setConnectTimeout(10);