From 8588ad8c470cd06582054963a0283be9e56db0e4 Mon Sep 17 00:00:00 2001
From: octopus_yan <octopus_yan@foxmail.com>
Date: Sun, 8 Sep 2024 12:10:12 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BB=A3=E7=90=86=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 22 +++++++++++------
 .../cn/octopusyan/alistgui/Application.java   | 24 +++++++++----------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index fcf7f14..8494181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
             <version>${jackson.version}</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.kordamp.ikonli/ikonli-javafx -->
+        <!-- https://kordamp.org/ikonli/ -->
         <dependency>
             <groupId>org.kordamp.ikonli</groupId>
             <artifactId>ikonli-javafx</artifactId>
@@ -133,11 +133,6 @@
             <artifactId>ikonli-fontawesome-pack</artifactId>
             <version>${ikonli.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.kordamp.ikonli</groupId>
-            <artifactId>ikonli-coreui-pack</artifactId>
-            <version>${ikonli.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.gluonhq</groupId>
             <artifactId>emoji</artifactId>
@@ -173,6 +168,7 @@
         </resources>
 
         <plugins>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -192,6 +188,15 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <argLine>--enable-preview</argLine>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -247,8 +252,11 @@
                         <!-- Default configuration for running with: mvn clean javafx:run -->
                         <id>default-cli</id>
                         <configuration>
-                            <mainClass>cn.octopusyan.alistgui/cn.octopusyan.alistgui.AppLauncher</mainClass>
                             <launcher>launcher</launcher>
+                            <mainClass>cn.octopusyan.alistgui/cn.octopusyan.alistgui.AppLauncher</mainClass>
+                            <options>
+                                <option>--enable-preview</option>
+                            </options>
                             <jlinkZipName>app</jlinkZipName>
                             <jlinkImageName>app</jlinkImageName>
                             <noManPages>true</noManPages>
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);